diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8b29a85d6..8e8eb6631 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -70,11 +70,11 @@ jobs: - name: Checkout uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # 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 42b7f043b..ff11b713c 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 7a62d6f61..8204a2087 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) @@ -76,7 +68,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)" \ @@ -94,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/dev-env.sh b/build/dev-env.sh index ae6860726..09609367a 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 <