Skip to content

Commit

Permalink
Dependency Updates (#99)
Browse files Browse the repository at this point in the history
* Updated docker image versions
Updated controller-gen to 0.11.1

Signed-off-by: Craig Ingram <[email protected]>

* Updated GH actions

Signed-off-by: Craig Ingram <[email protected]>

Signed-off-by: Craig Ingram <[email protected]>
  • Loading branch information
Craig Ingram committed Jan 12, 2023
1 parent f17d822 commit 6ebf3c5
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.controller
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.exporter
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/caching.ibm.com_varnishclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion varnish-operator/crds/varnishcluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 6ebf3c5

Please sign in to comment.