fix: restart-ds test

warm-metal · Jan 23, 2024 · 9c31367 · 9c31367
1 parent 7ee8628
commit 9c31367
Show file tree

Hide file tree

Showing 34 changed files with 98 additions and 104 deletions.
diff --git a/README.md b/README.md
@@ -116,7 +116,7 @@ spec:
       volumes:
         - name: target
           csi:
-            driver: container-image.csi.tech
+            driver: container-image.csi.k8s.io
             # nodePublishSecretRef:
             #  name: "ImagePullSecret name in the same namespace"
             volumeAttributes:
@@ -135,14 +135,14 @@ kind: PersistentVolume
 metadata:
   name: pv-test-container-image-csi-driver-test-simple-fs
 spec:
-  storageClassName: container-image.csi.tech
+  storageClassName: container-image.csi.k8s.io
   capacity:
     storage: 5Gi
   accessModes:
     - ReadOnlyMany
   persistentVolumeReclaimPolicy: Retain
   csi:
-    driver: container-image.csi.tech
+    driver: container-image.csi.k8s.io
     volumeHandle: "docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
     # nodePublishSecretRef:
     #  name: "name of the ImagePullSecret"

diff --git a/charts/warm-metal-csi-driver/templates/csi-driver.yaml b/charts/warm-metal-csi-driver/templates/csi-driver.yaml
@@ -1,7 +1,7 @@
 apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
-  name: container-image.csi.tech
+  name: container-image.csi.k8s.io
   labels:
     {{- include "warm-metal-csi-driver.labels" . | nindent 4 }}
 spec:

diff --git a/charts/warm-metal-csi-driver/templates/nodeplugin.yaml b/charts/warm-metal-csi-driver/templates/nodeplugin.yaml
@@ -21,7 +21,7 @@ spec:
         - name: node-driver-registrar
           args:
             - "--csi-address=/csi/csi.sock"
-            - --kubelet-registration-path={{ .Values.kubeletRoot }}/plugins/container-image.csi.tech/csi.sock
+            - --kubelet-registration-path={{ .Values.kubeletRoot }}/plugins/container-image.csi.k8s.io/csi.sock
             - "-v={{ .Values.logLevel }}"
           env:
             - name: KUBE_NODE_NAME
@@ -37,7 +37,7 @@ spec:
                 command:
                   - /bin/sh
                   - -c
-                  - rm -rf /registration/container-image.csi.tech /registration/container-image.csi.tech-reg.sock
+                  - rm -rf /registration/container-image.csi.k8s.io /registration/container-image.csi.k8s.io-reg.sock
           {{- with .Values.csiNodeDriverRegistrar.resources }}
           resources:
           {{- toYaml . | nindent 12 }}
@@ -126,7 +126,7 @@ spec:
       serviceAccountName: {{ include "warm-metal-csi-driver.fullname" . }}-nodeplugin
       volumes:
         - hostPath:
-            path: {{ .Values.kubeletRoot }}/plugins/container-image.csi.tech
+            path: {{ .Values.kubeletRoot }}/plugins/container-image.csi.k8s.io
             type: DirectoryOrCreate
           name: socket-dir
         - hostPath:

diff --git a/cmd/install/main.go b/cmd/install/main.go
@@ -209,7 +209,7 @@ const staticManifests = `---
 apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
-  name: container-image.csi.tech
+  name: container-image.csi.k8s.io
 spec:
   attachRequired: false
   podInfoOnMount: true
@@ -287,10 +287,10 @@ spec:
           lifecycle:
             preStop:
               exec:
-                command: ["/bin/sh", "-c", "rm -rf /registration/container-image.csi.tech /registration/container-image.csi.tech-reg.sock"]
+                command: ["/bin/sh", "-c", "rm -rf /registration/container-image.csi.k8s.io /registration/container-image.csi.k8s.io-reg.sock"]
           args:
             - --csi-address=/csi/csi.sock
-            - --kubelet-registration-path={{.KubeletRoot}}/plugins/container-image.csi.tech/csi.sock
+            - --kubelet-registration-path={{.KubeletRoot}}/plugins/container-image.csi.k8s.io/csi.sock
           env:
             - name: KUBE_NODE_NAME
               valueFrom:
@@ -332,7 +332,7 @@ spec:
               name: runtime-socket
       volumes:
         - hostPath:
-            path: {{.KubeletRoot}}/plugins/container-image.csi.tech
+            path: {{.KubeletRoot}}/plugins/container-image.csi.k8s.io
             type: DirectoryOrCreate
           name: socket-dir
         - hostPath:

diff --git a/cmd/plugin/main.go b/cmd/plugin/main.go
@@ -21,7 +21,7 @@ import (
 )
 
 const (
-	driverName    = "container-image.csi.tech"
+	driverName    = "container-image.csi.k8s.io"
 	driverVersion = "v1.0.0"
 
 	containerdScheme = "containerd"

diff --git a/pkg/backend/containerd/containerd.go b/pkg/backend/containerd/containerd.go
@@ -248,7 +248,7 @@ func (s snapshotMounter) ListSnapshots(ctx context.Context) (ss []backend.Snapsh
 }
 
 const (
-	labelPrefix         = "container-image.csi.tech"
+	labelPrefix         = "container-image.csi.k8s.io"
 	targetLabelPrefix   = labelPrefix + "/target"
 	volumeIdLabelPrefix = labelPrefix + "/id"
 	gcLabel             = "containerd.io/gc.root"

diff --git a/pkg/backend/mounter.go b/pkg/backend/mounter.go
@@ -230,5 +230,5 @@ func (s *SnapshotMounter) ImageExists(ctx context.Context, image docker.Named) b
 }
 
 func genSnapshotKey(parent string) SnapshotKey {
-	return SnapshotKey(fmt.Sprintf("container-image.csi.tech-%s", parent))
+	return SnapshotKey(fmt.Sprintf("container-image.csi.k8s.io-%s", parent))
 }
diff --git a/sample/ephemeral-volume.yaml b/sample/ephemeral-volume.yaml
@@ -20,7 +20,7 @@ spec:
       volumes:
         - name: target
           csi:
-            driver: container-image.csi.tech
+            driver: container-image.csi.k8s.io
             volumeAttributes:
               image: "docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
               # # set pullAlways if you want to ignore local images

diff --git a/sample/install/cri-o.yaml b/sample/install/cri-o.yaml
@@ -2,7 +2,7 @@
 apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
-  name: container-image.csi.tech
+  name: container-image.csi.k8s.io
 spec:
   attachRequired: false
   podInfoOnMount: true
@@ -69,7 +69,7 @@ spec:
       containers:
         - args:
             - --csi-address=/csi/csi.sock
-            - --kubelet-registration-path=/var/lib/kubelet/plugins/container-image.csi.tech/csi.sock
+            - --kubelet-registration-path=/var/lib/kubelet/plugins/container-image.csi.k8s.io/csi.sock
           env:
             - name: KUBE_NODE_NAME
               valueFrom:
@@ -84,7 +84,7 @@ spec:
                 command:
                   - /bin/sh
                   - -c
-                  - rm -rf /registration/container-image.csi.tech /registration/container-image.csi.tech-reg.sock
+                  - rm -rf /registration/container-image.csi.k8s.io /registration/container-image.csi.k8s.io-reg.sock
           name: node-driver-registrar
           resources: {}
           volumeMounts:
@@ -130,7 +130,7 @@ spec:
       serviceAccountName: container-image-csi-driver
       volumes:
         - hostPath:
-            path: /var/lib/kubelet/plugins/container-image.csi.tech
+            path: /var/lib/kubelet/plugins/container-image.csi.k8s.io
             type: DirectoryOrCreate
           name: socket-dir
         - hostPath:

diff --git a/sample/install/k3s-containerd.yaml b/sample/install/k3s-containerd.yaml
@@ -1,7 +1,7 @@
 apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
-  name: container-image.csi.tech
+  name: container-image.csi.k8s.io
 spec:
   attachRequired: false
   podInfoOnMount: true
@@ -63,7 +63,7 @@ spec:
       containers:
         - args:
             - --csi-address=/csi/csi.sock
-            - --kubelet-registration-path=/var/lib/kubelet/plugins/container-image.csi.tech/csi.sock
+            - --kubelet-registration-path=/var/lib/kubelet/plugins/container-image.csi.k8s.io/csi.sock
           env:
             - name: KUBE_NODE_NAME
               valueFrom:
@@ -78,7 +78,7 @@ spec:
                 command:
                   - /bin/sh
                   - -c
-                  - rm -rf /registration/container-image.csi.tech /registration/container-image.csi.tech-reg.sock
+                  - rm -rf /registration/container-image.csi.k8s.io /registration/container-image.csi.k8s.io-reg.sock
           name: node-driver-registrar
           resources: {}
           volumeMounts:
@@ -121,7 +121,7 @@ spec:
       serviceAccountName: container-image-csi-driver
       volumes:
         - hostPath:
-            path: /var/lib/kubelet/plugins/container-image.csi.tech
+            path: /var/lib/kubelet/plugins/container-image.csi.k8s.io
             type: DirectoryOrCreate
           name: socket-dir
         - hostPath:

diff --git a/sample/install/minikube-containerd.yaml b/sample/install/minikube-containerd.yaml
@@ -2,7 +2,7 @@
 apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
-  name: container-image.csi.tech
+  name: container-image.csi.k8s.io
 spec:
   attachRequired: false
   podInfoOnMount: true
@@ -69,7 +69,7 @@ spec:
       containers:
         - args:
             - --csi-address=/csi/csi.sock
-            - --kubelet-registration-path=/var/lib/kubelet/plugins/container-image.csi.tech/csi.sock
+            - --kubelet-registration-path=/var/lib/kubelet/plugins/container-image.csi.k8s.io/csi.sock
           env:
             - name: KUBE_NODE_NAME
               valueFrom:
@@ -84,7 +84,7 @@ spec:
                 command:
                   - /bin/sh
                   - -c
-                  - rm -rf /registration/container-image.csi.tech /registration/container-image.csi.tech-reg.sock
+                  - rm -rf /registration/container-image.csi.k8s.io /registration/container-image.csi.k8s.io-reg.sock
           name: node-driver-registrar
           resources: {}
           volumeMounts:
@@ -127,7 +127,7 @@ spec:
       serviceAccountName: container-image-csi-driver
       volumes:
         - hostPath:
-            path: /var/lib/kubelet/plugins/container-image.csi.tech
+            path: /var/lib/kubelet/plugins/container-image.csi.k8s.io
             type: DirectoryOrCreate
           name: socket-dir
         - hostPath:

diff --git a/sample/install/snap-microk8s-containerd.yaml b/sample/install/snap-microk8s-containerd.yaml
@@ -1,7 +1,7 @@
 apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
-  name: container-image.csi.tech
+  name: container-image.csi.k8s.io
 spec:
   attachRequired: false
   podInfoOnMount: true
@@ -63,7 +63,7 @@ spec:
       containers:
         - args:
             - --csi-address=/csi/csi.sock
-            - --kubelet-registration-path=/var/snap/microk8s/common/var/lib/kubelet/plugins/container-image.csi.tech/csi.sock
+            - --kubelet-registration-path=/var/snap/microk8s/common/var/lib/kubelet/plugins/container-image.csi.k8s.io/csi.sock
           env:
             - name: KUBE_NODE_NAME
               valueFrom:
@@ -78,7 +78,7 @@ spec:
                 command:
                   - /bin/sh
                   - -c
-                  - rm -rf /registration/container-image.csi.tech /registration/container-image.csi.tech-reg.sock
+                  - rm -rf /registration/container-image.csi.k8s.io /registration/container-image.csi.k8s.io-reg.sock
           name: node-driver-registrar
           resources: {}
           volumeMounts:
@@ -121,7 +121,7 @@ spec:
       serviceAccountName: container-image-csi-driver
       volumes:
         - hostPath:
-            path: /var/snap/microk8s/common/var/lib/kubelet/plugins/container-image.csi.tech
+            path: /var/snap/microk8s/common/var/lib/kubelet/plugins/container-image.csi.k8s.io
             type: DirectoryOrCreate
           name: socket-dir
         - hostPath:

diff --git a/sample/pre-provisioned-pv.yaml b/sample/pre-provisioned-pv.yaml
@@ -1,22 +1,22 @@
 kind: StorageClass
 apiVersion: storage.k8s.io/v1
 metadata:
-  name: container-image.csi.tech
-provisioner: container-image.csi.tech
+  name: container-image.csi.k8s.io
+provisioner: container-image.csi.k8s.io
 ---
 apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: pv-test-container-image-csi-driver-test-simple-fs
 spec:
-  storageClassName: container-image.csi.tech
+  storageClassName: container-image.csi.k8s.io
   capacity:
     storage: 5Gi
   accessModes:
     - ReadOnlyMany
   persistentVolumeReclaimPolicy: Retain
   csi:
-    driver: container-image.csi.tech
+    driver: container-image.csi.k8s.io
     volumeHandle: "docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
     # volumeAttributes:
       # # set pullAlways if you want to ignore local images
@@ -30,7 +30,7 @@ kind: PersistentVolumeClaim
 metadata:
   name: pvc-test-container-image-csi-driver-test-simple-fs
 spec:
-  storageClassName: container-image.csi.tech
+  storageClassName: container-image.csi.k8s.io
   accessModes:
     - ReadOnlyMany
   resources:

diff --git a/test/e2e/driver.go b/test/e2e/driver.go
@@ -16,7 +16,7 @@ func (d driver) GetVolume(config *testsuites.PerTestConfig, volumeNumber int) (a
 }
 
 func (d driver) GetCSIDriverName(config *testsuites.PerTestConfig) string {
-	return "container-image.csi.tech"
+	return "container-image.csi.k8s.io"
 }
 
 func (d driver) GetPersistentVolumeSource(readOnly bool, fsType string, testVolume testsuites.TestVolume) (*v1.PersistentVolumeSource, *v1.VolumeNodeAffinity) {
@@ -26,7 +26,7 @@ func (d driver) GetPersistentVolumeSource(readOnly bool, fsType string, testVolu
 
 	return &v1.PersistentVolumeSource{
 			CSI: &v1.CSIPersistentVolumeSource{
-				Driver:       "container-image.csi.tech",
+				Driver:       "container-image.csi.k8s.io",
 				VolumeHandle: "docker.io/warmmetal/container-image-csi-driver-test:simple-fs",
 				ReadOnly:     true,
 			},
@@ -51,7 +51,7 @@ func (d driver) GetVolumeSource(readOnly bool, fsType string, testVolume testsui
 	ro := readOnly
 	return &v1.VolumeSource{
 		CSI: &v1.CSIVolumeSource{
-			Driver:   "container-image.csi.tech",
+			Driver:   "container-image.csi.k8s.io",
 			ReadOnly: &ro,
 			VolumeAttributes: map[string]string{
 				"image": "docker.io/warmmetal/container-image-csi-driver-test:simple-fs",
@@ -71,7 +71,7 @@ func (d driver) CreateVolume(config *testsuites.PerTestConfig, volumeType testpa
 
 func (d driver) GetDriverInfo() *testsuites.DriverInfo {
 	return &testsuites.DriverInfo{
-		Name: "container-image.csi.tech",
+		Name: "container-image.csi.k8s.io",
 		Capabilities: map[testsuites.Capability]bool{
 			testsuites.CapExec:             true,
 			testsuites.CapMultiPODs:        true,
@@ -100,7 +100,7 @@ func (d driver) SkipUnsupportedTest(pattern testpatterns.TestPattern) {
 
 	if !supported {
 		e2eskipper.Skipf("Driver %q does not support tests %q-%q-%q - skipping",
-			"container-image.csi.tech", pattern.Name, pattern.VolType, pattern.VolMode)
+			"container-image.csi.k8s.io", pattern.Name, pattern.VolType, pattern.VolMode)
 	}
 }
 

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
@@ -20,7 +20,7 @@ spec:
       volumes:
         - name: target
           csi:
-            driver: container-image.csi.tech
+            driver: container-image.csi.k8s.io
             volumeAttributes:
               image: "private-registry:5000/warmmetal/container-image-csi-driver-test:simple-fs"
               pullAlways: "true"

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
@@ -1,30 +1,30 @@
 kind: StorageClass
 apiVersion: storage.k8s.io/v1
 metadata:
-  name: container-image.csi.tech
-provisioner: container-image.csi.tech
+  name: container-image.csi.k8s.io
+provisioner: container-image.csi.k8s.io
 ---
 apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: pv-private-with-daemon-secret
 spec:
-  storageClassName: container-image.csi.tech
+  storageClassName: container-image.csi.k8s.io
   capacity:
     storage: 5Gi
   accessModes:
     - ReadOnlyMany
   persistentVolumeReclaimPolicy: Retain
   csi:
-    driver: container-image.csi.tech
+    driver: container-image.csi.k8s.io
     volumeHandle: "private-registry:5000/warmmetal/container-image-csi-driver-test:simple-fs"
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: pvc-private-with-daemon-secret
 spec:
-  storageClassName: container-image.csi.tech
+  storageClassName: container-image.csi.k8s.io
   accessModes:
     - ReadOnlyMany
   resources: