chore: update image name refs

warm-metal · Jan 22, 2024 · 523c67d · 523c67d
1 parent beaa4f4
commit 523c67d
Show file tree

Hide file tree

Showing 41 changed files with 87 additions and 89 deletions.
diff --git a/.github/workflows/images-build-and-push.yaml b/.github/workflows/images-build-and-push.yaml
@@ -10,7 +10,7 @@ on:
 env:
   BASE_REPOSITORY: warm-metal/container-image-csi-driver
   BASE_DEFAULT_BRANCH: main
-  BASE_IMAGE_NAME: warmmetal/csi-image
+  BASE_IMAGE_NAME: warmmetal/container-image-csi-driver
   FORK_IMAGE_NAME: ghcr.io/${{ github.repository }}
 
 permissions:

diff --git a/README.md b/README.md
@@ -105,7 +105,7 @@ spec:
     spec:
       containers:
         - name: ephemeral-volume
-          image: docker.io/warmmetal/csi-image-test:check-fs
+          image: docker.io/warmmetal/container-image-csi-driver-test:check-fs
           env:
             - name: TARGET
               value: /target
@@ -120,7 +120,7 @@ spec:
             # nodePublishSecretRef:
             #  name: "ImagePullSecret name in the same namespace"
             volumeAttributes:
-              image: "docker.io/warmmetal/csi-image-test:simple-fs"
+              image: "docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
               # # set pullAlways if you want to ignore local images
               # pullAlways: "true"
   backoffLimit: 0
@@ -143,7 +143,7 @@ spec:
   persistentVolumeReclaimPolicy: Retain
   csi:
     driver: csi-image.warm-metal.tech
-    volumeHandle: "docker.io/warmmetal/csi-image-test:simple-fs"
+    volumeHandle: "docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
     # nodePublishSecretRef:
     #  name: "name of the ImagePullSecret"
     #  namespace: "namespace of the secret"

diff --git a/charts/warm-metal-csi-driver/values-crio.yaml b/charts/warm-metal-csi-driver/values-crio.yaml
@@ -13,7 +13,7 @@ csiPlugin:
   resources: {}
   image:
     tag: ""
-    repository: docker.io/warmmetal/csi-image
+    repository: docker.io/warmmetal/container-image-csi-driver
     pullPolicy: IfNotPresent
   livenessProbe:
     httpGet:

diff --git a/charts/warm-metal-csi-driver/values.yaml b/charts/warm-metal-csi-driver/values.yaml
@@ -13,7 +13,7 @@ csiPlugin:
   resources: {}
   image:
     tag: ""
-    repository: docker.io/warmmetal/csi-image
+    repository: docker.io/warmmetal/container-image-csi-driver
     pullPolicy: IfNotPresent
   livenessProbe:
     httpGet:

diff --git a/hack/ci/build.sh b/hack/ci/build.sh
@@ -3,7 +3,7 @@
 set -e
 set -x
 VERSION=$(git rev-parse --short HEAD)
-IMG=docker.io/warmmetal/csi-image:${VERSION}
+IMG=docker.io/warmmetal/container-image-csi-driver:${VERSION}
 BUILDER=$(docker buildx ls | grep ci-builderx || true)
 [ "${BUILDER}" != "" ] || docker buildx create \
     --name ci-builderx --driver docker-container \
@@ -13,4 +13,4 @@ docker buildx use ci-builderx
 docker buildx build -t ${IMG} -o "type=oci,dest=csi-image.tar" .
 kind load image-archive csi-image.tar -n kind-${GITHUB_RUN_ID}
 docker buildx build --target install-util -o "type=local,dest=_output/" .
-set +e
+set +e
diff --git a/hack/ci/install_driver.sh b/hack/ci/install_driver.sh
@@ -4,7 +4,7 @@ source $(dirname "$0")/../lib/cluster.sh
 
 set -e
 
-IMG=docker.io/warmmetal/csi-image:$(git rev-parse --short HEAD)
+IMG=docker.io/warmmetal/container-image-csi-driver:$(git rev-parse --short HEAD)
 lib::install_driver ${IMG}
 
 set +e
diff --git a/hack/ci/setup_docker_cluster.sh b/hack/ci/setup_docker_cluster.sh
@@ -7,7 +7,7 @@ lib::start_cluster_docker $@
 set -e
 echo "Install a private registry"
 lib::install_private_registry
-minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i pull docker.io/warmmetal/csi-image-test:simple-fs
-minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i tag --force docker.io/warmmetal/csi-image-test:simple-fs localhost:31000/warmmetal/csi-image-test:simple-fs
+minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i pull docker.io/warmmetal/container-image-csi-driver-test:simple-fs
+minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i tag --force docker.io/warmmetal/container-image-csi-driver-test:simple-fs localhost:31000/warmmetal/csi-image-test:simple-fs
 minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i push localhost:31000/warmmetal/csi-image-test:simple-fs --plain-http --user warmmetal:warmmetal
 set +e
diff --git a/hack/ci/setup_private_registry.sh b/hack/ci/setup_private_registry.sh
@@ -5,8 +5,8 @@ source $(dirname "$0")/../lib/cluster.sh
 set -e
 echo "Install a private registry"
 lib::install_private_registry
-docker pull docker.io/warmmetal/csi-image-test:simple-fs
-docker tag docker.io/warmmetal/csi-image-test:simple-fs localhost:5000/warmmetal/csi-image-test:simple-fs
+docker pull docker.io/warmmetal/container-image-csi-driver-test:simple-fs
+docker tag docker.io/warmmetal/container-image-csi-driver-test:simple-fs localhost:5000/warmmetal/csi-image-test:simple-fs
 docker login -u warmmetal -p warmmetal localhost:5000
 docker push localhost:5000/warmmetal/csi-image-test:simple-fs
 set +e
diff --git a/hack/helper/prepare_containerd_cluster.sh b/hack/helper/prepare_containerd_cluster.sh
@@ -11,9 +11,9 @@ lib::install_driver
 
 echo "Install a private registry"
 lib::install_private_registry
-minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i pull docker.io/warmmetal/csi-image-test:simple-fs
-minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i tag --force docker.io/warmmetal/csi-image-test:simple-fs localhost:31000/warmmetal/csi-image-test:simple-fs
+minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i pull docker.io/warmmetal/container-image-csi-driver-test:simple-fs
+minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i tag --force docker.io/warmmetal/container-image-csi-driver-test:simple-fs localhost:31000/warmmetal/csi-image-test:simple-fs
 minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i push localhost:31000/warmmetal/csi-image-test:simple-fs --plain-http --user warmmetal:warmmetal
 
 set +x
-set +e
+set +e
diff --git a/hack/lib/cluster.sh b/hack/lib/cluster.sh
@@ -80,7 +80,7 @@ function lib::install_driver() {
   local manifest=$(lib::gen_manifests $2)
   echo "${manifest}" | kubectl delete --ignore-not-found -f -
   if [ "${image}" != "" ]; then
-    echo "${manifest}" | sed "s|image: docker.io/warmmetal/csi-image.*|image: ${image}|" | kubectl apply -f -
+    echo "${manifest}" | sed "s|image: docker.io/warmmetal/container-image-csi-driver.*|image: ${image}|" | kubectl apply -f -
   else
     echo "${manifest}" | kubectl apply -f -
   fi
@@ -101,7 +101,7 @@ function lib::install_private_registry() {
   if [ "$(docker inspect -f='{{json .NetworkSettings.Networks.kind}}' 'private-registry')" = 'null' ]; then
     docker network connect "kind" "private-registry"
   fi
-  
+
   cat <<EOF | kubectl apply -f -
 apiVersion: v1
 kind: ConfigMap

diff --git a/sample/ephemeral-volume.yaml b/sample/ephemeral-volume.yaml
@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
         - name: ephemeral-volume
-          image: docker.io/warmmetal/csi-image-test:check-fs
+          image: docker.io/warmmetal/container-image-csi-driver-test:check-fs
           env:
             - name: TARGET
               value: /target
@@ -22,7 +22,7 @@ spec:
           csi:
             driver: csi-image.warm-metal.tech
             volumeAttributes:
-              image: "docker.io/warmmetal/csi-image-test:simple-fs"
+              image: "docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
               # # set pullAlways if you want to ignore local images
               # pullAlways: "true"
               # # set secret if the image is private

diff --git a/sample/install/cri-o.yaml b/sample/install/cri-o.yaml
@@ -106,7 +106,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: docker.io/warmmetal/csi-image:v0.5.1
+          image: docker.io/warmmetal/container-image-csi-driver:v0.5.1
           imagePullPolicy: IfNotPresent
           name: plugin
           resources: {}
@@ -158,4 +158,4 @@ status:
   currentNumberScheduled: 0
   desiredNumberScheduled: 0
   numberMisscheduled: 0
-  numberReady: 0
+  numberReady: 0
diff --git a/sample/install/k3s-containerd.yaml b/sample/install/k3s-containerd.yaml
@@ -100,7 +100,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: docker.io/warmmetal/csi-image:v0.5.1
+          image: docker.io/warmmetal/container-image-csi-driver:v0.5.1
           imagePullPolicy: IfNotPresent
           name: plugin
           resources: {}
@@ -145,4 +145,4 @@ status:
   currentNumberScheduled: 0
   desiredNumberScheduled: 0
   numberMisscheduled: 0
-  numberReady: 0
+  numberReady: 0
diff --git a/sample/install/minikube-containerd.yaml b/sample/install/minikube-containerd.yaml
@@ -106,7 +106,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: docker.io/warmmetal/csi-image:v0.5.1
+          image: docker.io/warmmetal/container-image-csi-driver:v0.5.1
           imagePullPolicy: IfNotPresent
           name: plugin
           resources: {}
@@ -151,4 +151,4 @@ status:
   currentNumberScheduled: 0
   desiredNumberScheduled: 0
   numberMisscheduled: 0
-  numberReady: 0
+  numberReady: 0
diff --git a/sample/install/snap-microk8s-containerd.yaml b/sample/install/snap-microk8s-containerd.yaml
@@ -100,7 +100,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: docker.io/warmmetal/csi-image:v0.5.1
+          image: docker.io/warmmetal/container-image-csi-driver:v0.5.1
           imagePullPolicy: IfNotPresent
           name: plugin
           resources: {}
@@ -145,4 +145,4 @@ status:
   currentNumberScheduled: 0
   desiredNumberScheduled: 0
   numberMisscheduled: 0
-  numberReady: 0
+  numberReady: 0
diff --git a/sample/pre-provisioned-pv.yaml b/sample/pre-provisioned-pv.yaml
@@ -17,7 +17,7 @@ spec:
   persistentVolumeReclaimPolicy: Retain
   csi:
     driver: csi-image.warm-metal.tech
-    volumeHandle: "docker.io/warmmetal/csi-image-test:simple-fs"
+    volumeHandle: "docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
     # volumeAttributes:
       # # set pullAlways if you want to ignore local images
       # pullAlways: "true"
@@ -49,7 +49,7 @@ spec:
     spec:
       containers:
         - name: pre-provisioned-pv
-          image: docker.io/warmmetal/csi-image-test:check-fs
+          image: docker.io/warmmetal/container-image-csi-driver-test:check-fs
           env:
             - name: TARGET
               value: /target

diff --git a/test/e2e/driver.go b/test/e2e/driver.go
@@ -9,11 +9,10 @@ import (
 	"k8s.io/kubernetes/test/e2e/storage/testsuites"
 )
 
-type driver struct {
-}
+type driver struct{}
 
 func (d driver) GetVolume(config *testsuites.PerTestConfig, volumeNumber int) (attributes map[string]string, shared bool, readOnly bool) {
-	return map[string]string{"image": "docker.io/warmmetal/csi-image-test:simple-fs"}, true, false
+	return map[string]string{"image": "docker.io/warmmetal/container-image-csi-driver-test:simple-fs"}, true, false
 }
 
 func (d driver) GetCSIDriverName(config *testsuites.PerTestConfig) string {
@@ -28,7 +27,7 @@ func (d driver) GetPersistentVolumeSource(readOnly bool, fsType string, testVolu
 	return &v1.PersistentVolumeSource{
 			CSI: &v1.CSIPersistentVolumeSource{
 				Driver:       "csi-image.warm-metal.tech",
-				VolumeHandle: "docker.io/warmmetal/csi-image-test:simple-fs",
+				VolumeHandle: "docker.io/warmmetal/container-image-csi-driver-test:simple-fs",
 				ReadOnly:     true,
 			},
 		}, &v1.VolumeNodeAffinity{
@@ -55,14 +54,13 @@ func (d driver) GetVolumeSource(readOnly bool, fsType string, testVolume testsui
 			Driver:   "csi-image.warm-metal.tech",
 			ReadOnly: &ro,
 			VolumeAttributes: map[string]string{
-				"image": "docker.io/warmmetal/csi-image-test:simple-fs",
+				"image": "docker.io/warmmetal/container-image-csi-driver-test:simple-fs",
 			},
 		},
 	}
 }
 
-type imageVol struct {
-}
+type imageVol struct{}
 
 func (i imageVol) DeleteVolume() {
 }

diff --git a/test/integration/compatible-manifests/ephemeral-volume.yaml b/test/integration/compatible-manifests/ephemeral-volume.yaml
@@ -19,12 +19,12 @@ spec:
       csi:
         driver: csi-image.warm-metal.tech
         volumeAttributes:
-          image: "docker.io/warmmetal/csi-image-test:simple-fs"
+          image: "docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
           pullAlways: "true"
     - name: ro
       csi:
         driver: csi-image.warm-metal.tech
         readOnly: true
         volumeAttributes:
-          image: "docker.io/warmmetal/csi-image-test:simple-fs"
-          pullAlways: "true"
+          image: "docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
+          pullAlways: "true"
diff --git a/test/integration/compatible-manifests/pre-provisioned-pv.yaml b/test/integration/compatible-manifests/pre-provisioned-pv.yaml
@@ -17,7 +17,7 @@ spec:
   persistentVolumeReclaimPolicy: Retain
   csi:
     driver: csi-image.warm-metal.tech
-    volumeHandle: "docker.io/warmmetal/csi-image-test:simple-fs"
+    volumeHandle: "docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim

diff --git a/test/integration/containerd-helm-values.yaml b/test/integration/containerd-helm-values.yaml
@@ -11,7 +11,7 @@ csiPlugin:
   resources: {}
   image:
     tag: ""
-    repository: docker.io/warmmetal/csi-image
+    repository: docker.io/warmmetal/container-image-csi-driver
     pullPolicy: IfNotPresent
   livenessProbe:
     httpGet:

diff --git a/test/integration/crio-helm-values.yaml b/test/integration/crio-helm-values.yaml
@@ -13,7 +13,7 @@ csiPlugin:
   resources: {}
   image:
     tag: ""
-    repository: docker.io/warmmetal/csi-image
+    repository: docker.io/warmmetal/container-image-csi-driver
     pullPolicy: IfNotPresent
   livenessProbe:
     httpGet:

diff --git a/test/integration/daemon-dependent-manifests/ephemeral-volume-private-with-daemon-secret.yaml b/test/integration/daemon-dependent-manifests/ephemeral-volume-private-with-daemon-secret.yaml
@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
         - name: ephemeral-volume-private-with-daemon-secret
-          image: docker.io/warmmetal/csi-image-test:check-fs
+          image: docker.io/warmmetal/container-image-csi-driver-test:check-fs
           env:
             - name: TARGET
               value: /target

diff --git a/...integration/daemon-dependent-manifests/pre-provisioned-pv-private-with-daemon-secret.yaml b/...integration/daemon-dependent-manifests/pre-provisioned-pv-private-with-daemon-secret.yaml
@@ -43,7 +43,7 @@ spec:
     spec:
       containers:
         - name: pre-provisioned-pv-private-with-daemon-secret
-          image: docker.io/warmmetal/csi-image-test:check-fs
+          image: docker.io/warmmetal/container-image-csi-driver-test:check-fs
           env:
             - name: TARGET
               value: /target

diff --git a/test/integration/failed-manifests/rwo-pv.yaml b/test/integration/failed-manifests/rwo-pv.yaml
@@ -17,7 +17,7 @@ spec:
   persistentVolumeReclaimPolicy: Retain
   csi:
     driver: csi-image.warm-metal.tech
-    volumeHandle: "docker.io/warmmetal/csi-image-test:simple-fs"
+    volumeHandle: "docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -43,7 +43,7 @@ spec:
     spec:
       containers:
         - name: failed-rwo-pv
-          image: docker.io/warmmetal/csi-image-test:check-fs
+          image: docker.io/warmmetal/container-image-csi-driver-test:check-fs
           env:
             - name: TARGET
               value: /target
@@ -55,4 +55,4 @@ spec:
         - name: target
           persistentVolumeClaim:
             claimName: pvc-test-csi-image-rwo
-  backoffLimit: 0
+  backoffLimit: 0
diff --git a/test/integration/failed-manifests/rwx-pv.yaml b/test/integration/failed-manifests/rwx-pv.yaml
@@ -17,7 +17,7 @@ spec:
   persistentVolumeReclaimPolicy: Retain
   csi:
     driver: csi-image.warm-metal.tech
-    volumeHandle: "docker.io/warmmetal/csi-image-test:simple-fs"
+    volumeHandle: "docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -43,7 +43,7 @@ spec:
     spec:
       containers:
         - name: failed-rwx-pv
-          image: docker.io/warmmetal/csi-image-test:check-fs
+          image: docker.io/warmmetal/container-image-csi-driver-test:check-fs
           env:
             - name: TARGET
               value: /target
@@ -55,4 +55,4 @@ spec:
         - name: target
           persistentVolumeClaim:
             claimName: pvc-test-csi-image-rwx
-  backoffLimit: 0
+  backoffLimit: 0
diff --git a/test/integration/manifests/ephemeral-volume-docker-library-image.yaml b/test/integration/manifests/ephemeral-volume-docker-library-image.yaml
@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
         - name: ephemeral-volume-docker-library-image
-          image: docker.io/warmmetal/csi-image-test:check-fs
+          image: docker.io/warmmetal/container-image-csi-driver-test:check-fs
           env:
             - name: TARGET
               value: /target