DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update nginx image and go to 1.14.3

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-05-26 15:14:10 -04:00
parent 209405940c
commit 78935500eb
7 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -62,7 +62,7 @@ endif
REGISTRY ?= quay.io/kubernetes-ingress-controller REGISTRY ?= quay.io/kubernetes-ingress-controller
BASE_IMAGE ?= quay.io/kubernetes-ingress-controller/nginx BASE_IMAGE ?= quay.io/kubernetes-ingress-controller/nginx
BASE_TAG ?= 5d67794f4fbf38ec6575476de46201b068eabf87 BASE_TAG ?= 227f97465158f038b3c0a3bfd8299fe8d8a530e3
GOARCH=$(ARCH) GOARCH=$(ARCH)
GOBUILD_FLAGS := -v GOBUILD_FLAGS := -v

2
build/images/ingress-controller/build-ingress-controller.sh
View file

@ -67,7 +67,7 @@ echo ${docker_password} | docker login -u ${docker_username} --password-stdin qu
curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
chmod +x /usr/local/bin/gimme chmod +x /usr/local/bin/gimme
eval "$(gimme 1.14.2)" eval "$(gimme 1.14.3)"
export GOPATH="/tmp/go" export GOPATH="/tmp/go"

2
build/images/nginx/build-nginx.sh
View file

@ -70,7 +70,7 @@ echo ${docker_password} | docker login -u ${docker_username} --password-stdin qu
curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
chmod +x /usr/local/bin/gimme chmod +x /usr/local/bin/gimme
eval "$(gimme 1.14.2)" eval "$(gimme 1.14.3)"
git clone https://github.com/kubernetes/ingress-nginx git clone https://github.com/kubernetes/ingress-nginx

2
build/run-in-docker.sh
View file

@ -34,7 +34,7 @@ function cleanup {
} }
trap cleanup EXIT trap cleanup EXIT
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v04212020-5d67794f4 E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v05262020-209405940c6
DOCKER_OPTS=${DOCKER_OPTS:-} DOCKER_OPTS=${DOCKER_OPTS:-}

2
images/e2e/Dockerfile
View file

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:5d67794f4fbf38ec6575476de46201b068eabf87 FROM quay.io/kubernetes-ingress-controller/nginx-amd64:227f97465158f038b3c0a3bfd8299fe8d8a530e3
ARG GOLANG_VERSION ARG GOLANG_VERSION
ARG GOLANG_SHA ARG GOLANG_SHA

4
images/e2e/Makefile
View file

@ -26,8 +26,8 @@ docker-build:
--progress plain \ --progress plain \
--build-arg K8S_RELEASE=v1.15.7 \ --build-arg K8S_RELEASE=v1.15.7 \
--build-arg ETCD_VERSION=v3.3.18 \ --build-arg ETCD_VERSION=v3.3.18 \
--build-arg GOLANG_VERSION=1.14.2 \ --build-arg GOLANG_VERSION=1.14.3 \
--build-arg GOLANG_SHA=98de84e69726a66da7b4e58eac41b99cbe274d7e8906eeb8a5b7eb0aadee7f7c \ --build-arg GOLANG_SHA=93023778d4d1797b7bc6a53e86c3a9b150c923953225f8a48a2d5fabc971af56 \
--build-arg RESTY_CLI_VERSION=0.25rc2 \ --build-arg RESTY_CLI_VERSION=0.25rc2 \
--build-arg RESTY_CLI_SHA=a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb \ --build-arg RESTY_CLI_SHA=a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb \
--build-arg CHART_TESTING_VERSION=3.0.0-beta.1 \ --build-arg CHART_TESTING_VERSION=3.0.0-beta.1 \

6
test/e2e-image/Dockerfile
View file

@ -1,4 +1,4 @@
FROM quay.io/kubernetes-ingress-controller/e2e:v04212020-5d67794f4 AS BASE FROM quay.io/kubernetes-ingress-controller/e2e:v05262020-209405940c6 AS BASE
FROM alpine:3.11 FROM alpine:3.11
@ -10,9 +10,7 @@ RUN apk add -U --no-cache \
libc6-compat \ libc6-compat \
openssl openssl
RUN curl -sSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash \ RUN curl -sSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
&& helm repo add stable https://kubernetes-charts.storage.googleapis.com \
&& helm repo update
COPY --from=BASE /go/bin/ginkgo /usr/local/bin/ COPY --from=BASE /go/bin/ginkgo /usr/local/bin/
COPY --from=BASE /usr/local/bin/kubectl /usr/local/bin/ COPY --from=BASE /usr/local/bin/kubectl /usr/local/bin/