chore!: update helm chart name

* Update docker images for tests * Fix make targets for test-deps
warm-metal · Jan 22, 2024 · 301cb5c · 301cb5c
1 parent 523c67d
commit 301cb5c
Show file tree

Hide file tree

Showing 42 changed files with 99 additions and 98 deletions.
diff --git a/Makefile b/Makefile
@@ -35,17 +35,18 @@ integration:
 
 .PHONY: image
 image:
-	$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build -t $(REGISTRY)/csi-image:$(VERSION) --push .
+	$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build --platform=linux/amd64 -t $(REGISTRY)/container-image-csi-driver:$(VERSION) --push .
 
 .PHONY: local
 local:
 	$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build -t $(REGISTRY)/csi-image:$(VERSION) --load .
 
 .PHONY: test-deps
 test-deps:
-	$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build --push -t $(REGISTRY)/csi-image-test:stat-fs -f csi-image-test:stat-fs.dockerfile hack/integration-test-image
-	$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build --push -t $(REGISTRY)/csi-image-test:check-fs -f csi-image-test:check-fs.dockerfile hack/integration-test-image
-	$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build --push -t $(REGISTRY)/csi-image-test:write-check -f csi-image-test:write-check.dockerfile hack/integration-test-image
+	$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build --platform=linux/amd64 -t $(REGISTRY)/container-image-csi-driver-test:simple-fs -f hack/integration-test-image/container-image-csi-driver-test:simple-fs.dockerfile --push hack/integration-test-image
+	$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build --platform=linux/amd64 -t $(REGISTRY)/container-image-csi-driver-test:stat-fs -f hack/integration-test-image/container-image-csi-driver-test:stat-fs.dockerfile --push hack/integration-test-image
+	$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build --platform=linux/amd64 -t $(REGISTRY)/container-image-csi-driver-test:check-fs -f hack/integration-test-image/container-image-csi-driver-test:check-fs.dockerfile --push hack/integration-test-image
+	$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build --platform=linux/amd64 -t $(REGISTRY)/container-image-csi-driver-test:write-check -f hack/integration-test-image/container-image-csi-driver-test:write-check.dockerfile --push hack/integration-test-image
 
 .PHONY: install-util
 install-util:

diff --git a/README.md b/README.md
@@ -133,7 +133,7 @@ For pre-provisioned PVs, `volumeHandle` instead of the attribute **image**, spec
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: pv-test-csi-image-test-simple-fs
+  name: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
 spec:
   storageClassName: csi-image.warm-metal.tech
   capacity:

diff --git a/charts/warm-metal-csi-driver/Chart.yaml → charts/container-image-csi-driver/Chart.yaml b/charts/warm-metal-csi-driver/Chart.yaml → charts/container-image-csi-driver/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: warm-metal-csi-driver
+name: container-image-csi-driver
 description: A Helm chart for warm meta driver
 
 # A chart can be either an 'application' or a 'library' chart.

diff --git a/...m-metal-csi-driver/templates/_helpers.tpl → ...r-image-csi-driver/templates/_helpers.tpl b/...m-metal-csi-driver/templates/_helpers.tpl → ...r-image-csi-driver/templates/_helpers.tpl
diff --git a/...csi-driver/templates/controller-rbac.yaml → ...csi-driver/templates/controller-rbac.yaml b/...csi-driver/templates/controller-rbac.yaml → ...csi-driver/templates/controller-rbac.yaml
diff --git a/...etal-csi-driver/templates/controller.yaml → ...mage-csi-driver/templates/controller.yaml b/...etal-csi-driver/templates/controller.yaml → ...mage-csi-driver/templates/controller.yaml
diff --git a/...etal-csi-driver/templates/csi-driver.yaml → ...mage-csi-driver/templates/csi-driver.yaml b/...etal-csi-driver/templates/csi-driver.yaml → ...mage-csi-driver/templates/csi-driver.yaml
diff --git a/...csi-driver/templates/nodeplugin-rbac.yaml → ...csi-driver/templates/nodeplugin-rbac.yaml b/...csi-driver/templates/nodeplugin-rbac.yaml → ...csi-driver/templates/nodeplugin-rbac.yaml
diff --git a/...etal-csi-driver/templates/nodeplugin.yaml → ...mage-csi-driver/templates/nodeplugin.yaml b/...etal-csi-driver/templates/nodeplugin.yaml → ...mage-csi-driver/templates/nodeplugin.yaml
diff --git a/...etal-csi-driver/templates/podmonitor.yaml → ...mage-csi-driver/templates/podmonitor.yaml b/...etal-csi-driver/templates/podmonitor.yaml → ...mage-csi-driver/templates/podmonitor.yaml
diff --git a/...ts/warm-metal-csi-driver/values-crio.yaml → ...ntainer-image-csi-driver/values-crio.yaml b/...ts/warm-metal-csi-driver/values-crio.yaml → ...ntainer-image-csi-driver/values-crio.yaml
diff --git a/charts/warm-metal-csi-driver/values.yaml → ...ts/container-image-csi-driver/values.yaml b/charts/warm-metal-csi-driver/values.yaml → ...ts/container-image-csi-driver/values.yaml
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/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
+minikube ssh -p docker.io/warmmetal/container-image-csi-driver-test -- sudo ctr -n k8s.io i pull docker.io/warmmetal/container-image-csi-driver-test:simple-fs
+minikube ssh -p docker.io/warmmetal/container-image-csi-driver-test -- sudo ctr -n k8s.io i tag --force docker.io/warmmetal/container-image-csi-driver-test:simple-fs localhost:31000/warmmetal/container-image-csi-driver-test:simple-fs
+minikube ssh -p docker.io/warmmetal/container-image-csi-driver-test -- sudo ctr -n k8s.io i push localhost:31000/warmmetal/container-image-csi-driver-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
@@ -6,7 +6,7 @@ set -e
 echo "Install a private registry"
 lib::install_private_registry
 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 tag docker.io/warmmetal/container-image-csi-driver-test:simple-fs localhost:5000/warmmetal/docker.io/warmmetal/container-image-csi-driver-test:simple-fs
 docker login -u warmmetal -p warmmetal localhost:5000
-docker push localhost:5000/warmmetal/csi-image-test:simple-fs
+docker push localhost:5000/warmmetal/docker.io/warmmetal/container-image-csi-driver-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/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
+minikube ssh -p docker.io/warmmetal/container-image-csi-driver-test -- sudo ctr -n k8s.io i pull docker.io/warmmetal/container-image-csi-driver-test:simple-fs
+minikube ssh -p docker.io/warmmetal/container-image-csi-driver-test -- sudo ctr -n k8s.io i tag --force docker.io/warmmetal/container-image-csi-driver-test:simple-fs localhost:31000/warmmetal/docker.io/warmmetal/container-image-csi-driver-test:simple-fs
+minikube ssh -p docker.io/warmmetal/container-image-csi-driver-test -- sudo ctr -n k8s.io i push localhost:31000/warmmetal/docker.io/warmmetal/container-image-csi-driver-test:simple-fs --plain-http --user warmmetal:warmmetal
 
 set +x
 set +e
diff --git a/...-image/csi-image-test:check-fs.dockerfile → ...image-csi-driver-test:check-fs.dockerfile b/...-image/csi-image-test:check-fs.dockerfile → ...image-csi-driver-test:check-fs.dockerfile
diff --git a/...image/csi-image-test:simple-fs.dockerfile → ...mage-csi-driver-test:simple-fs.dockerfile b/...image/csi-image-test:simple-fs.dockerfile → ...mage-csi-driver-test:simple-fs.dockerfile
diff --git a/...t-image/csi-image-test:stat-fs.dockerfile → ...-image-csi-driver-test:stat-fs.dockerfile b/...t-image/csi-image-test:stat-fs.dockerfile → ...-image-csi-driver-test:stat-fs.dockerfile
diff --git a/...age/csi-image-test:write-check.dockerfile → ...ge-csi-driver-test:write-check.dockerfile b/...age/csi-image-test:write-check.dockerfile → ...ge-csi-driver-test:write-check.dockerfile
@@ -1,10 +1,10 @@
 FROM docker.io/library/golang:1.16-alpine as builder
-WORKDIR /go/src/csi-image-test
+WORKDIR /go/src/docker.io/warmmetal/container-image-csi-driver-test
 COPY write_check.go .
 RUN GO111MODULE=off go build -o write_check
 
 FROM alpine:3
 ENV TARGET=""
 WORKDIR /
-COPY --from=builder /go/src/csi-image-test/write_check .
+COPY --from=builder /go/src/docker.io/warmmetal/container-image-csi-driver-test/write_check .
 ENTRYPOINT ["/write_check"]
diff --git a/hack/lib/cluster.sh b/hack/lib/cluster.sh
@@ -4,23 +4,23 @@ source $(dirname "${BASH_SOURCE[0]}")/utils.sh
 
 function lib::start_cluster_containerd() {
   local version=${1:-stable}
-  minikube start -p csi-image-test \
+  minikube start -p docker.io/warmmetal/container-image-csi-driver-test \
     --kubernetes-version=${version} \
     --container-runtime=containerd \
     --insecure-registry=localhost:31000
 }
 
 function lib::start_cluster_crio() {
   local version=${1:-stable}
-  minikube start -p csi-image-test \
+  minikube start -p docker.io/warmmetal/container-image-csi-driver-test \
     --kubernetes-version=${version} \
     --container-runtime=cri-o \
     --insecure-registry=localhost:31000
 }
 
 function lib::start_cluster_docker() {
   local version=${1:-stable}
-  minikube start -p csi-image-test \
+  minikube start -p docker.io/warmmetal/container-image-csi-driver-test \
     --kubernetes-version=${version} \
     --container-runtime=docker \
     --insecure-registry=localhost:31000

diff --git a/sample/pre-provisioned-pv.yaml b/sample/pre-provisioned-pv.yaml
@@ -7,7 +7,7 @@ provisioner: csi-image.warm-metal.tech
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: pv-test-csi-image-test-simple-fs
+  name: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
 spec:
   storageClassName: csi-image.warm-metal.tech
   capacity:
@@ -28,15 +28,15 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: pvc-test-csi-image-test-simple-fs
+  name: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
 spec:
   storageClassName: csi-image.warm-metal.tech
   accessModes:
     - ReadOnlyMany
   resources:
     requests:
       storage: 5Gi
-  volumeName: pv-test-csi-image-test-simple-fs
+  volumeName: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
 ---
 apiVersion: batch/v1
 kind: Job
@@ -60,5 +60,5 @@ spec:
       volumes:
         - name: target
           persistentVolumeClaim:
-            claimName: pvc-test-csi-image-test-simple-fs
+            claimName: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
   backoffLimit: 0
diff --git a/test/integration/compatible-manifests/pre-provisioned-pv.yaml b/test/integration/compatible-manifests/pre-provisioned-pv.yaml
@@ -7,7 +7,7 @@ provisioner: csi-image.warm-metal.tech
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: compatible-pv-test-csi-image-test-simple-fs
+  name: compatible-pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
 spec:
   storageClassName: csi-image.warm-metal.tech
   capacity:
@@ -22,15 +22,15 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: compatible-pvc-test-csi-image-test-simple-fs
+  name: compatible-pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
 spec:
   storageClassName: csi-image.warm-metal.tech
   accessModes:
     - ReadOnlyMany
   resources:
     requests:
       storage: 5Gi
-  volumeName: compatible-pv-test-csi-image-test-simple-fs
+  volumeName: compatible-pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
 ---
 apiVersion: v1
 kind: Pod
@@ -50,4 +50,4 @@ spec:
   volumes:
     - name: target
       persistentVolumeClaim:
-        claimName: compatible-pvc-test-csi-image-test-simple-fs
+        claimName: compatible-pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
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
@@ -22,6 +22,6 @@ spec:
           csi:
             driver: csi-image.warm-metal.tech
             volumeAttributes:
-              image: "private-registry:5000/warmmetal/csi-image-test:simple-fs"
+              image: "private-registry:5000/warmmetal/docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
               pullAlways: "true"
   backoffLimit: 0
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
@@ -17,7 +17,7 @@ spec:
   persistentVolumeReclaimPolicy: Retain
   csi:
     driver: csi-image.warm-metal.tech
-    volumeHandle: "private-registry:5000/warmmetal/csi-image-test:simple-fs"
+    volumeHandle: "private-registry:5000/warmmetal/docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim

diff --git a/test/integration/manifests/ephemeral-volume-docker-library-image.yaml b/test/integration/manifests/ephemeral-volume-docker-library-image.yaml
@@ -22,6 +22,6 @@ spec:
           csi:
             driver: csi-image.warm-metal.tech
             volumeAttributes:
-              image: "warmmetal/csi-image-test:simple-fs"
+              image: "warmmetal/docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
               pullAlways: "true"
   backoffLimit: 0
diff --git a/test/integration/manifests/ephemeral-volume-private-with-given-secret.yaml b/test/integration/manifests/ephemeral-volume-private-with-given-secret.yaml
@@ -24,6 +24,6 @@ spec:
             nodePublishSecretRef:
               name: warmmetal
             volumeAttributes:
-              image: "private-registry:5000/warmmetal/csi-image-test:simple-fs"
+              image: "private-registry:5000/warmmetal/docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
               pullAlways: "true"
   backoffLimit: 0
diff --git a/test/integration/manifests/pre-provisioned-pv-private-with-given-secret.yaml b/test/integration/manifests/pre-provisioned-pv-private-with-given-secret.yaml
@@ -20,7 +20,7 @@ spec:
     nodePublishSecretRef:
       name: warmmetal
       namespace: default
-    volumeHandle: "private-registry:5000/warmmetal/csi-image-test:simple-fs"
+    volumeHandle: "private-registry:5000/warmmetal/docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
     volumeAttributes:
       pullAlways: "true"
 ---

diff --git a/test/integration/manifests/pre-provisioned-pv.yaml b/test/integration/manifests/pre-provisioned-pv.yaml
@@ -7,7 +7,7 @@ provisioner: csi-image.warm-metal.tech
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: pv-test-csi-image-test-simple-fs
+  name: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
 spec:
   storageClassName: csi-image.warm-metal.tech
   capacity:
@@ -24,15 +24,15 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: pvc-test-csi-image-test-simple-fs
+  name: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
 spec:
   storageClassName: csi-image.warm-metal.tech
   accessModes:
     - ReadOnlyMany
   resources:
     requests:
       storage: 5Gi
-  volumeName: pv-test-csi-image-test-simple-fs
+  volumeName: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
 ---
 apiVersion: batch/v1
 kind: Job
@@ -56,5 +56,5 @@ spec:
       volumes:
         - name: target
           persistentVolumeClaim:
-            claimName: pvc-test-csi-image-test-simple-fs
+            claimName: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
   backoffLimit: 0
diff --git a/test/integration/manifests/readonly-mount-pre-pv.yaml b/test/integration/manifests/readonly-mount-pre-pv.yaml
@@ -7,7 +7,7 @@ provisioner: csi-image.warm-metal.tech
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: pv-test-csi-image-test-simple-fs
+  name: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
 spec:
   storageClassName: csi-image.warm-metal.tech
   capacity:
@@ -24,15 +24,15 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: pvc-test-csi-image-test-simple-fs
+  name: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
 spec:
   storageClassName: csi-image.warm-metal.tech
   accessModes:
     - ReadOnlyMany
   resources:
     requests:
       storage: 5Gi
-  volumeName: pv-test-csi-image-test-simple-fs
+  volumeName: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
 ---
 apiVersion: batch/v1
 kind: Job
@@ -59,5 +59,5 @@ spec:
       volumes:
         - name: target
           persistentVolumeClaim:
-            claimName: pvc-test-csi-image-test-simple-fs
+            claimName: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
   backoffLimit: 0
diff --git a/test/integration/manifests/two-readonly-pv.yaml b/test/integration/manifests/two-readonly-pv.yaml
@@ -7,7 +7,7 @@ provisioner: csi-image.warm-metal.tech
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: pv-test-csi-image-test-simple-fs-1
+  name: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs-1
 spec:
   storageClassName: csi-image.warm-metal.tech
   capacity:
@@ -24,20 +24,20 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: pvc-test-csi-image-test-simple-fs-1
+  name: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs-1
 spec:
   storageClassName: csi-image.warm-metal.tech
   accessModes:
     - ReadOnlyMany
   resources:
     requests:
       storage: 5Gi
-  volumeName: pv-test-csi-image-test-simple-fs-1
+  volumeName: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs-1
 ---
 # apiVersion: v1
 # kind: PersistentVolume
 # metadata:
-#   name: pv-test-csi-image-test-simple-fs-2
+#   name: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs-2
 # spec:
 #   storageClassName: csi-image.warm-metal.tech
 #   capacity:
@@ -54,15 +54,15 @@ spec:
 # apiVersion: v1
 # kind: PersistentVolumeClaim
 # metadata:
-#   name: pvc-test-csi-image-test-simple-fs-2
+#   name: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs-2
 # spec:
 #   storageClassName: csi-image.warm-metal.tech
 #   accessModes:
 #     - ReadOnlyMany
 #   resources:
 #     requests:
 #       storage: 5Gi
-#   volumeName: pv-test-csi-image-test-simple-fs-2
+#   volumeName: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs-2
 ---
 apiVersion: batch/v1
 kind: Job
@@ -94,8 +94,8 @@ spec:
       volumes:
         - name: target1
           persistentVolumeClaim:
-            claimName: pvc-test-csi-image-test-simple-fs-1
+            claimName: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs-1
         # - name: target2
         #   persistentVolumeClaim:
-        #     claimName: pvc-test-csi-image-test-simple-fs-2
+        #     claimName: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs-2
   backoffLimit: 0
diff --git a/test/integration/manual-manifests/write-check.yaml b/test/integration/manual-manifests/write-check.yaml
@@ -7,7 +7,7 @@ spec:
     metadata:
       name: write-check
     spec:
-      nodeName: csi-image-test-m02
+      nodeName: docker.io/warmmetal/container-image-csi-driver-test-m02
       containers:
         - name: write-check
           image: docker.io/warmmetal/container-image-csi-driver-test:write-check