From 6ebf3c5b96598fec3b64d4221dae65d987393fb5 Mon Sep 17 00:00:00 2001 From: Craig Ingram Date: Thu, 12 Jan 2023 15:50:32 -0500 Subject: [PATCH] Dependency Updates (#99) * Updated docker image versions Updated controller-gen to 0.11.1 Signed-off-by: Craig Ingram * Updated GH actions Signed-off-by: Craig Ingram Signed-off-by: Craig Ingram --- .github/workflows/e2e-tests.yml | 6 +++--- Dockerfile | 2 +- Dockerfile.controller | 2 +- Dockerfile.exporter | 2 +- Makefile | 2 +- config/crd/bases/caching.ibm.com_varnishclusters.yaml | 2 +- varnish-operator/crds/varnishcluster.yaml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index d73e4cc..a7b0dcb 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -36,7 +36,7 @@ jobs: docker build --platform linux/amd64 -f Dockerfile.controller -t ibmcom/varnish-controller:local . docker build --platform linux/amd64 -f Dockerfile.exporter -t ibmcom/varnish-metrics-exporter:local . - name: Create k8s Kind Cluster ${{ matrix.kubernetes-version }} - uses: helm/kind-action@v1.3.0 + uses: helm/kind-action@v1.5.0 with: version: v0.14.0 cluster_name: e2e-tests @@ -64,14 +64,14 @@ jobs: tar -cvf kind-e2e-logs-${{ matrix.kubernetes-version }}.tar ./kind-logs - name: upload kind logs artifact if: ${{ always() && (steps.e2e.outcome == 'failure' || steps.helm.outcome == 'failure') }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: kind-e2e-logs-${{ matrix.kubernetes-version }}.tar path: kind-e2e-logs-${{ matrix.kubernetes-version }}.tar retention-days: 7 - name: upload e2e test logs artifact if: ${{ always() && steps.e2e.outcome == 'failure' }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: debug-logs-${{ matrix.kubernetes-version }}.tar path: /tmp/debug-logs/ diff --git a/Dockerfile b/Dockerfile index 80a4f18..2aab9d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ARG BUILDPLATFORM=linux/amd64 -FROM --platform=$BUILDPLATFORM golang:1.19.2-bullseye AS builder +FROM --platform=$BUILDPLATFORM golang:1.19.5-bullseye AS builder ENV DEBIAN_FRONTEND=noninteractive INSTALL_DIRECTORY=/usr/local/bin diff --git a/Dockerfile.controller b/Dockerfile.controller index 825a6a0..0d2b2e3 100644 --- a/Dockerfile.controller +++ b/Dockerfile.controller @@ -1,5 +1,5 @@ ARG BUILDPLATFORM=linux/amd64 -FROM --platform=$BUILDPLATFORM golang:1.19.2-bullseye AS builder +FROM --platform=$BUILDPLATFORM golang:1.19.5-bullseye AS builder ENV DEBIAN_FRONTEND=noninteractive INSTALL_DIRECTORY=/usr/local/bin diff --git a/Dockerfile.exporter b/Dockerfile.exporter index d79e025..46fe9d4 100644 --- a/Dockerfile.exporter +++ b/Dockerfile.exporter @@ -1,5 +1,5 @@ ARG BUILDPLATFORM=linux/amd64 -FROM --platform=$BUILDPLATFORM golang:1.19.2-bullseye AS builder +FROM --platform=$BUILDPLATFORM golang:1.19.5-bullseye AS builder ARG TARGETOS=linux ARG TARGETARCH=amd64 ARG PROMETHEUS_VARNISH_EXPORTER_VERSION=1.6.1 diff --git a/Makefile b/Makefile index a6406f4..054432b 100644 --- a/Makefile +++ b/Makefile @@ -139,7 +139,7 @@ docker-tag-push-pod: docker-tag-push-varnish docker-tag-push-varnish-exporter do # download controller-gen if necessary controller-gen: ifeq (, $(shell which controller-gen)) - go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.10.0 + go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.11.1 CONTROLLER_GEN=$(GOBIN)/controller-gen else CONTROLLER_GEN=$(shell which controller-gen) diff --git a/config/crd/bases/caching.ibm.com_varnishclusters.yaml b/config/crd/bases/caching.ibm.com_varnishclusters.yaml index 716d6e8..51992ad 100644 --- a/config/crd/bases/caching.ibm.com_varnishclusters.yaml +++ b/config/crd/bases/caching.ibm.com_varnishclusters.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 + controller-gen.kubebuilder.io/version: v0.11.1 creationTimestamp: null name: varnishclusters.caching.ibm.com spec: diff --git a/varnish-operator/crds/varnishcluster.yaml b/varnish-operator/crds/varnishcluster.yaml index 1655252..9117bf9 100644 --- a/varnish-operator/crds/varnishcluster.yaml +++ b/varnish-operator/crds/varnishcluster.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 + controller-gen.kubebuilder.io/version: v0.11.1 creationTimestamp: null name: varnishclusters.caching.ibm.com spec: