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.13.4 (#4785)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2019-11-29 15:20:18 -03:00 committed by GitHub
parent 60fc37d0e2
commit 46953ccb4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -77,7 +77,7 @@ export E2E_CHECK_LEAKS
export SLOW_E2E_THRESHOLD export SLOW_E2E_THRESHOLD
# Set default base image dynamically for each arch # Set default base image dynamically for each arch
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):daf8634acf839708722cffc67a62e9316a2771c6 BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):d523b4a96eec80324ee04afed74bf8bddcba09cf
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
QEMUARCH=arm QEMUARCH=arm

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

@ -30,7 +30,7 @@ function cleanup {
} }
trap cleanup EXIT trap cleanup EXIT
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v09052019-38b985663 E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v11272019-7e993dda1
DOCKER_OPTS=${DOCKER_OPTS:-} DOCKER_OPTS=${DOCKER_OPTS:-}

4
images/e2e-prow/Makefile
View file

@ -9,9 +9,9 @@ all: docker-build docker-push
docker-build: docker-build:
$(DOCKER) build \ $(DOCKER) build \
--pull \ --pull \
--build-arg K8S_RELEASE=v1.15.3 \ --build-arg K8S_RELEASE=v1.16.3 \
--build-arg ETCD_VERSION=v3.3.15 \ --build-arg ETCD_VERSION=v3.3.15 \
--build-arg KIND_VERSION=v0.5.1 \ --build-arg KIND_VERSION=v0.6.0 \
-t $(IMAGE):$(TAG) . -t $(IMAGE):$(TAG) .
docker-push: docker-push:

6
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:0.92 FROM quay.io/kubernetes-ingress-controller/nginx-amd64:d523b4a96eec80324ee04afed74bf8bddcba09cf
RUN clean-install \ RUN clean-install \
g++ \ g++ \
@ -25,9 +25,9 @@ RUN clean-install \
parallel \ parallel \
pkg-config pkg-config
ENV GOLANG_VERSION 1.13 ENV GOLANG_VERSION 1.13.4
ENV GO_ARCH linux-amd64 ENV GO_ARCH linux-amd64
ENV GOLANG_SHA 68a2297eb099d1a76097905a2ce334e3155004ec08cdea85f24527be3c48e856 ENV GOLANG_SHA 692d17071736f74be04a72a06dab9cac1cd759377bd85316e52b2227604c004c
RUN set -eux; \ RUN set -eux; \
url="https://golang.org/dl/go${GOLANG_VERSION}.${GO_ARCH}.tar.gz"; \ url="https://golang.org/dl/go${GOLANG_VERSION}.${GO_ARCH}.tar.gz"; \

2
test/e2e-image/Dockerfile
View file

@ -1,4 +1,4 @@
FROM quay.io/kubernetes-ingress-controller/e2e:v09052019-38b985663 AS BASE FROM quay.io/kubernetes-ingress-controller/e2e:v11272019-7e993dda1 AS BASE
FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1 FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1

5
test/e2e/run.sh
View file

@ -48,15 +48,14 @@ KIND_CLUSTER_NAME="ingress-nginx-dev"
kind --version || $(echo "Please install kind before running e2e tests";exit 1) kind --version || $(echo "Please install kind before running e2e tests";exit 1)
echo "[dev-env] creating Kubernetes cluster with kind" echo "[dev-env] creating Kubernetes cluster with kind"
# TODO: replace the custom images after https://github.com/kubernetes-sigs/kind/issues/531
export KUBECONFIG="${HOME}/.kube/kind-config-${KIND_CLUSTER_NAME}"
kind create cluster \ kind create cluster \
--loglevel=${KIND_LOG_LEVEL} \ --loglevel=${KIND_LOG_LEVEL} \
--name ${KIND_CLUSTER_NAME} \ --name ${KIND_CLUSTER_NAME} \
--config ${DIR}/kind.yaml \ --config ${DIR}/kind.yaml \
--image "kindest/node:${K8S_VERSION}" --image "kindest/node:${K8S_VERSION}"
export KUBECONFIG="$(kind get kubeconfig-path --name="${KIND_CLUSTER_NAME}")"
echo "Kubernetes cluster:" echo "Kubernetes cluster:"
kubectl get nodes -o wide kubectl get nodes -o wide