From f8044cb50b3176e20a6ab1e945922bcbaef72190 Mon Sep 17 00:00:00 2001 From: James Strong Date: Wed, 5 Oct 2022 09:26:39 -0600 Subject: [PATCH 1/2] upgrade to golang 1.19.2 Signed-off-by: James Strong --- .github/workflows/ci.yaml | 10 ++++---- .github/workflows/plugin.yaml | 2 +- Makefile | 1 - build/dev-env.sh | 25 +++---------------- build/kind.yaml | 18 +++++++++++++ .../rootfs/Dockerfile | 2 +- images/kube-webhook-certgen/rootfs/Dockerfile | 2 +- images/test-runner/Makefile | 2 +- 8 files changed, 30 insertions(+), 32 deletions(-) create mode 100644 build/kind.yaml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 45e1cd9812..3a8aae41ac 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -70,11 +70,11 @@ jobs: - name: Checkout uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2 - - name: Set up Go 1.19.1 + - name: Set up Go 1.19.2 id: go uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f # v3.2.0 with: - go-version: '1.19.1' + go-version: '1.19.2' - name: Set up QEMU uses: docker/setup-qemu-action@8b122486cedac8393e77aa9734c3528886e4a1a8 #v2.0.0 @@ -140,7 +140,7 @@ jobs: - name: Setup Go uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f # v3.2.0 with: - go-version: '1.19.1' + go-version: '1.19.2' - name: cache uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 # v3 @@ -411,12 +411,12 @@ jobs: version: v0.15.0 image: kindest/node:v1.25.2 - - name: Set up Go 1.19.1 + - name: Set up Go 1.19.2 id: go if: ${{ steps.filter-images.outputs.kube-webhook-certgen == 'true' }} uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f # v3.2.0 with: - go-version: '1.19.1' + go-version: '1.19.2' - name: kube-webhook-certgen image build if: ${{ steps.filter-images.outputs.kube-webhook-certgen == 'true' }} diff --git a/.github/workflows/plugin.yaml b/.github/workflows/plugin.yaml index 319055b62b..359d37dc63 100644 --- a/.github/workflows/plugin.yaml +++ b/.github/workflows/plugin.yaml @@ -24,7 +24,7 @@ jobs: - name: Set up Go uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f # v3.2.0 with: - go-version: 1.19.1 + go-version: 1.19.2 - name: Run GoReleaser uses: goreleaser/goreleaser-action@ff11ca24a9b39f2d36796d1fbd7a4e39c182630a # v3.0.0 diff --git a/Makefile b/Makefile index 7a62d6f61b..fa0378520f 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,6 @@ image: clean-image ## Build image for a particular arch. docker build \ ${PLATFORM_FLAG} ${PLATFORM} \ --no-cache \ - $(MAC_DOCKER_FLAGS) \ --pull \ --build-arg BASE_IMAGE="$(BASE_IMAGE)" \ --build-arg VERSION="$(TAG)" \ diff --git a/build/dev-env.sh b/build/dev-env.sh index ae68607269..09609367ac 100755 --- a/build/dev-env.sh +++ b/build/dev-env.sh @@ -62,32 +62,13 @@ echo "[dev-env] building image" make build image docker tag "${REGISTRY}/controller:${TAG}" "${DEV_IMAGE}" -export K8S_VERSION=${K8S_VERSION:-v1.24.2@sha256:1f0cee2282f43150b52dc7933183ed96abdcfc8d293f30ec07082495874876f1} +export K8S_VERSION=${K8S_VERSION:-v1.25.2@sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace} KIND_CLUSTER_NAME="ingress-nginx-dev" if ! kind get clusters -q | grep -q ${KIND_CLUSTER_NAME}; then -echo "[dev-env] creating Kubernetes cluster with kind" -cat < Date: Wed, 5 Oct 2022 10:33:03 -0600 Subject: [PATCH 2/2] update e2e testing to 1.25 kind Signed-off-by: James Strong --- Makefile | 9 --------- build/run-in-docker.sh | 10 ---------- test/e2e/run.sh | 2 +- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/Makefile b/Makefile index fa0378520f..8204a20871 100644 --- a/Makefile +++ b/Makefile @@ -53,14 +53,6 @@ ifneq ($(PLATFORM),) PLATFORM_FLAG="--platform" endif -MAC_OS = $(shell uname -s) - -ifeq ($(MAC_OS), Darwin) - MAC_DOCKER_FLAGS="--load" -else - MAC_DOCKER_FLAGS= -endif - REGISTRY ?= gcr.io/k8s-staging-ingress-nginx BASE_IMAGE ?= $(shell cat NGINX_BASE) @@ -93,7 +85,6 @@ image-chroot: clean-chroot-image ## Build image for a particular arch. echo "Building docker image ($(ARCH))..." docker build \ --no-cache \ - $(MAC_DOCKER_FLAGS) \ --pull \ --build-arg BASE_IMAGE="$(BASE_IMAGE)" \ --build-arg VERSION="$(TAG)" \ diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh index 35ea278198..21d3f25488 100755 --- a/build/run-in-docker.sh +++ b/build/run-in-docker.sh @@ -65,15 +65,6 @@ fi USER=${USER:-nobody} -MAC_OS="`uname -s`" -MAC_OS="${MAC_OS:-}" -if [[ ${MAC_OS} == "Darwin" ]]; then - MAC_DOCKER_FLAGS="" -else - MAC_DOCKER_FLAGS="-u $(id -u ${USER}):$(id -g ${USER})" #idk why mac/git fails on the gobuild if these are presented to dockerrun.sh script -fi -echo "MAC_OS = ${MAC_OS}, MAC_OS_FLAGS = ${MAC_DOCKER_FLAGS}" - echo "..printing env & other vars to stdout" echo "HOSTNAME=`hostname`" uname -a @@ -108,6 +99,5 @@ else -v "/var/run/docker.sock:/var/run/docker.sock" \ -v "${INGRESS_VOLUME}:/etc/ingress-controller/" \ -w "/go/src/${PKG}" \ - ${MAC_DOCKER_FLAGS} \ ${E2E_IMAGE} /bin/bash -c "${FLAGS}" fi diff --git a/test/e2e/run.sh b/test/e2e/run.sh index 6b1cabb4c0..0fc6fdb5e3 100755 --- a/test/e2e/run.sh +++ b/test/e2e/run.sh @@ -64,7 +64,7 @@ export KUBECONFIG="${KUBECONFIG:-$HOME/.kube/kind-config-$KIND_CLUSTER_NAME}" if [ "${SKIP_CLUSTER_CREATION:-false}" = "false" ]; then echo "[dev-env] creating Kubernetes cluster with kind" - export K8S_VERSION=${K8S_VERSION:-v1.21.10@sha256:84709f09756ba4f863769bdcabe5edafc2ada72d3c8c44d6515fc581b66b029c} + export K8S_VERSION=${K8S_VERSION:-v1.25.2@sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace} kind create cluster \ --verbosity=${KIND_LOG_LEVEL} \