From 30f272e8357729f7bfda785a300db8d9da75d13e Mon Sep 17 00:00:00 2001 From: Mesosphere CI Robot Date: Fri, 14 Feb 2025 20:59:05 +0100 Subject: [PATCH] feat(cosi): bump cosi sidecar to v0.2.1 (#3160) (#3168) * feat(cosi): bump cosi sidecar to v0.2.1 * chore: use old image for ceph sidecar Signed-off-by: Tarun Gupta Akirala (cherry picked from commit 649a8f2929e6a853d5316afe27c9c9483a1fbea2) Co-authored-by: Tarun Gupta Akirala --- licenses.d2iq.yaml | 7 ++++++- services/cosi-driver-nutanix/0.2.0/defaults/cm.yaml | 6 +++--- services/rook-ceph-cluster/1.16.2/defaults/cm.yaml | 1 + .../1.16.2/objectbucketclaims/extra-images.txt | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index be6a5a34ca..97dbfd3e44 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -582,7 +582,12 @@ resources: - url: https://github.com/ceph/ceph-cosi ref: ${image_tag} license_path: LICENSE - - container_image: gcr.io/k8s-staging-sig-storage/objectstorage-sidecar:v20250117-a29e5f6 + - container_image: registry.k8s.io/sig-storage/objectstorage-sidecar:v0.2.1 + sources: + - url: https://github.com/kubernetes-sigs/container-object-storage-interface + ref: main + license_path: LICENSE + - container_image: ghcr.io/mesosphere/dkp-container-images/objectstorage-sidecar:v20240513-v0.1.0-35-gefb3255 sources: - url: https://github.com/kubernetes-sigs/container-object-storage-interface ref: main diff --git a/services/cosi-driver-nutanix/0.2.0/defaults/cm.yaml b/services/cosi-driver-nutanix/0.2.0/defaults/cm.yaml index 02c1be2524..d7b2ce12a1 100644 --- a/services/cosi-driver-nutanix/0.2.0/defaults/cm.yaml +++ b/services/cosi-driver-nutanix/0.2.0/defaults/cm.yaml @@ -10,10 +10,10 @@ data: enabled: false # This should be deployed during k8s cluster creation by konvoy. objectstorageProvisionerSidecar: image: - registry: gcr.io + registry: registry.k8s.io # keep this in sync with the sidecar that is deployed in CephCOSIDriver to avoid duplicate images in airgapped bundle. - repository: k8s-staging-sig-storage/objectstorage-sidecar - tag: v20250117-a29e5f6 + repository: sig-storage/objectstorage-sidecar + tag: v0.2.1 pullPolicy: IfNotPresent image: registry: ghcr.io diff --git a/services/rook-ceph-cluster/1.16.2/defaults/cm.yaml b/services/rook-ceph-cluster/1.16.2/defaults/cm.yaml index 0a3a12bcbd..97db1abb89 100644 --- a/services/rook-ceph-cluster/1.16.2/defaults/cm.yaml +++ b/services/rook-ceph-cluster/1.16.2/defaults/cm.yaml @@ -305,6 +305,7 @@ data: namespace: ${releaseNamespace} spec: deploymentStrategy: Auto + objectProvisionerImage: ghcr.io/mesosphere/dkp-container-images/objectstorage-sidecar:v20240513-v0.1.0-35-gefb3255 adminuser: enabled: true name: cosi-admin diff --git a/services/rook-ceph-cluster/1.16.2/objectbucketclaims/extra-images.txt b/services/rook-ceph-cluster/1.16.2/objectbucketclaims/extra-images.txt index 2864f0b630..f810a3f9ef 100644 --- a/services/rook-ceph-cluster/1.16.2/objectbucketclaims/extra-images.txt +++ b/services/rook-ceph-cluster/1.16.2/objectbucketclaims/extra-images.txt @@ -1,2 +1,2 @@ quay.io/ceph/cosi:v0.1.2 -gcr.io/k8s-staging-sig-storage/objectstorage-sidecar:v20250117-a29e5f6 +ghcr.io/mesosphere/dkp-container-images/objectstorage-sidecar:v20240513-v0.1.0-35-gefb3255