From 8b9e9ca47ff9ef47f5cf73355b8c8b92175a6bfa Mon Sep 17 00:00:00 2001 From: Adam Dyess Date: Wed, 28 Aug 2024 05:44:16 -0500 Subject: [PATCH] Multiarch image support for local storage and metrics-server (#628) * Update metrics server to 0.7.0-ck1 * Update rawfile-localpv to 0.8.0-ck4 --- build-scripts/hack/sync-images.yaml | 8 ++++---- docs/src/snap/howto/install/offline.md | 4 ++-- src/k8s/pkg/k8sd/features/localpv/chart.go | 2 +- src/k8s/pkg/k8sd/features/metrics-server/chart.go | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build-scripts/hack/sync-images.yaml b/build-scripts/hack/sync-images.yaml index 95432b5e7..8f8b68ca4 100644 --- a/build-scripts/hack/sync-images.yaml +++ b/build-scripts/hack/sync-images.yaml @@ -23,9 +23,9 @@ sync: - source: ghcr.io/canonical/k8s-snap/sig-storage/csi-snapshotter:v8.0.1 target: '{{ env "MIRROR" }}/canonical/k8s-snap/sig-storage/csi-snapshotter:v8.0.1' type: image - - source: ghcr.io/canonical/metrics-server:0.7.0-ck0 - target: '{{ env "MIRROR" }}/canonical/metrics-server:0.7.0-ck0' + - source: ghcr.io/canonical/metrics-server:0.7.0-ck1 + target: '{{ env "MIRROR" }}/canonical/metrics-server:0.7.0-ck1' type: image - - source: ghcr.io/canonical/rawfile-localpv:0.8.0-ck5 - target: '{{ env "MIRROR" }}/canonical/rawfile-localpv:0.8.0-ck5' + - source: ghcr.io/canonical/rawfile-localpv:0.8.0-ck4 + target: '{{ env "MIRROR" }}/canonical/rawfile-localpv:0.8.0-ck4' type: image diff --git a/docs/src/snap/howto/install/offline.md b/docs/src/snap/howto/install/offline.md index 6cf0327b0..dc251347e 100644 --- a/docs/src/snap/howto/install/offline.md +++ b/docs/src/snap/howto/install/offline.md @@ -120,8 +120,8 @@ ghcr.io/canonical/k8s-snap/sig-storage/csi-node-driver-registrar:v2.10.1 ghcr.io/canonical/k8s-snap/sig-storage/csi-provisioner:v5.0.1 ghcr.io/canonical/k8s-snap/sig-storage/csi-resizer:v1.11.1 ghcr.io/canonical/k8s-snap/sig-storage/csi-snapshotter:v8.0.1 -ghcr.io/canonical/metrics-server:0.7.0-ck0 -ghcr.io/canonical/rawfile-localpv:0.8.0-ck5 +ghcr.io/canonical/metrics-server:0.7.0-ck1 +ghcr.io/canonical/rawfile-localpv:0.8.0-ck4 ``` A list of images can also be found in the `images.txt` file when unsquashing the diff --git a/src/k8s/pkg/k8sd/features/localpv/chart.go b/src/k8s/pkg/k8sd/features/localpv/chart.go index b44412e9e..5a655fc57 100644 --- a/src/k8s/pkg/k8sd/features/localpv/chart.go +++ b/src/k8s/pkg/k8sd/features/localpv/chart.go @@ -17,7 +17,7 @@ var ( // imageRepo is the repository to use for Rawfile LocalPV CSI. imageRepo = "ghcr.io/canonical/rawfile-localpv" // imageTag is the image tag to use for Rawfile LocalPV CSI. - imageTag = "0.8.0-ck5" + imageTag = "0.8.0-ck4" // csiNodeDriverImage is the image to use for the CSI node driver. csiNodeDriverImage = "ghcr.io/canonical/k8s-snap/sig-storage/csi-node-driver-registrar:v2.10.1" diff --git a/src/k8s/pkg/k8sd/features/metrics-server/chart.go b/src/k8s/pkg/k8sd/features/metrics-server/chart.go index a75ec6dbf..8c4e46958 100644 --- a/src/k8s/pkg/k8sd/features/metrics-server/chart.go +++ b/src/k8s/pkg/k8sd/features/metrics-server/chart.go @@ -18,5 +18,5 @@ var ( imageRepo = "ghcr.io/canonical/metrics-server" // imageTag is the image tag to use for metrics-server. - imageTag = "0.7.0-ck0" + imageTag = "0.7.0-ck1" )