Updated resources for v4.1.4

pkg/admin/installer/daemonset.go

@@ -297,7 +297,7 @@ func (t daemonsetTask) doCreateDaemonset(ctx context.Context, args *Args) (err e
 		}
 	}
 	if selectorValue == "" {
-		selectorValue = fmt.Sprintf("%v-%v", consts.Identity, getRandSuffix())
+		selectorValue = fmt.Sprintf("%v-%v", consts.Identity, consts.NodeServerName)
 	}
 
 	daemonset := newDaemonset(podSpec, consts.NodeServerName, selectorValue, args)
@@ -360,7 +360,7 @@ func (t daemonsetTask) doCreateLegacyDaemonset(ctx context.Context, args *Args)
 		}
 	}
 	if selectorValue == "" {
-		selectorValue = fmt.Sprintf("%v-%v", consts.Identity, getRandSuffix())
+		selectorValue = fmt.Sprintf("%v-%v", consts.Identity, consts.LegacyNodeServerName)
 	}
 
 	daemonset := newDaemonset(podSpec, consts.LegacyNodeServerName, selectorValue, args)

pkg/admin/installer/deployment.go

@@ -195,7 +195,7 @@ func (t deploymentTask) doCreateDeployment(ctx context.Context, args *Args, lega
 		}
 	}
 	if selectorValue == "" {
-		selectorValue = fmt.Sprintf("%v-%v", consts.ControllerServerName, getRandSuffix())
+		selectorValue = fmt.Sprintf("%v-%v", consts.ControllerServerName, name)
 	}
 
 	replicas := int32(3)

pkg/admin/installer/utils.go

@@ -18,10 +18,7 @@ package installer
 
 import (
 	"context"
-	"crypto/rand"
-	"encoding/base32"
 	"path"
-	"strings"
 
 	"github.com/minio/directpv/pkg/k8s"
 	"k8s.io/klog/v2"
@@ -31,14 +28,6 @@ func newPluginsSocketDir(kubeletDir, name string) string {
 	return path.Join(kubeletDir, "plugins", k8s.SanitizeResourceName(name))
 }
 
-func getRandSuffix() string {
-	b := make([]byte, 5)
-	if _, err := rand.Read(b); err != nil {
-		klog.Fatalf("unable to generate random bytes; %v", err)
-	}
-	return strings.ToLower(base32.StdEncoding.EncodeToString(b)[:5])
-}
-
 func sendDoneMessage(ctx context.Context, progressCh chan<- Message, err error) (sent bool) {
 	sent = sendMessage(ctx, progressCh, newDoneMessage(err))
 	if !sent && err != nil {

resources/base/CSIDriver.yaml

@@ -17,5 +17,3 @@ spec:
   volumeLifecycleModes:
   - Persistent
   - Ephemeral
-
-

resources/base/ClusterRole.yaml

@@ -169,5 +169,3 @@ rules:
   - get
   - list
   - watch
-
-

resources/base/ClusterRoleBinding.yaml

@@ -20,5 +20,3 @@ subjects:
 - kind: ServiceAccount
   name: directpv-min-io
   namespace: directpv
-
-

resources/base/DaemonSet.yaml

@@ -16,14 +16,14 @@ metadata:
 spec:
   selector:
     matchLabels:
-      selector.directpv.min.io: directpv-min-io-2c3pu
+      selector.directpv.min.io: directpv-min-io-node-server
   template:
     metadata:
       annotations:
         created-by: kubectl-directpv
       creationTimestamp: null
       labels:
-        selector.directpv.min.io: directpv-min-io-2c3pu
+        selector.directpv.min.io: directpv-min-io-node-server
         selector.directpv.min.io.service: enabled
       name: node-server
       namespace: directpv
@@ -67,7 +67,7 @@ spec:
               fieldPath: spec.nodeName
         - name: CSI_ENDPOINT
           value: unix:///csi/csi.sock
-        image: quay.io/minio/directpv:v4.1.4
+        image: quay.io/minio/directpv@sha256:83fd05fe114ed15c3975333c90cbe18c782d9c4d5c7ad6fdb8cc835e380ba505
         livenessProbe:
           failureThreshold: 5
           httpGet:
@@ -138,7 +138,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
-        image: quay.io/minio/directpv:v4.1.4
+        image: quay.io/minio/directpv@sha256:83fd05fe114ed15c3975333c90cbe18c782d9c4d5c7ad6fdb8cc835e380ba505
         name: node-controller
         resources: {}
         securityContext:
@@ -230,5 +230,3 @@ status:
   desiredNumberScheduled: 0
   numberMisscheduled: 0
   numberReady: 0
-
-

resources/base/Deployment.yaml

@@ -17,7 +17,7 @@ spec:
   replicas: 3
   selector:
     matchLabels:
-      selector.directpv.min.io: controller-ms345
+      selector.directpv.min.io: controller-controller
   strategy:
     type: Recreate
   template:
@@ -26,7 +26,7 @@ spec:
         created-by: kubectl-directpv
       creationTimestamp: null
       labels:
-        selector.directpv.min.io: controller-ms345
+        selector.directpv.min.io: controller-controller
       name: controller
       namespace: directpv
     spec:
@@ -86,7 +86,7 @@ spec:
               fieldPath: spec.nodeName
         - name: CSI_ENDPOINT
           value: unix:///csi/csi.sock
-        image: quay.io/minio/directpv:v4.1.4
+        image: quay.io/minio/directpv@sha256:83fd05fe114ed15c3975333c90cbe18c782d9c4d5c7ad6fdb8cc835e380ba505
         name: controller
         ports:
         - containerPort: 30443
@@ -118,5 +118,3 @@ spec:
           type: DirectoryOrCreate
         name: socket-dir
 status: {}
-
-

resources/base/Namespace.yaml

@@ -15,5 +15,3 @@ metadata:
   name: directpv
 spec: {}
 status: {}
-
-

resources/base/Role.yaml

@@ -25,5 +25,3 @@ rules:
   - list
   - update
   - watch
-
-

resources/base/RoleBinding.yaml

@@ -21,5 +21,3 @@ subjects:
 - kind: ServiceAccount
   name: directpv-min-io
   namespace: directpv
-
-

resources/base/ServiceAccount.yaml

@@ -12,5 +12,3 @@ metadata:
     directpv.min.io/version: v1beta1
   name: directpv-min-io
   namespace: directpv
-
-

resources/base/StorageClass.yaml

@@ -24,5 +24,3 @@ parameters:
 provisioner: directpv-min-io
 reclaimPolicy: Delete
 volumeBindingMode: WaitForFirstConsumer
-
-

resources/base/directpvdrives.directpv.min.io.yaml

@@ -164,5 +164,3 @@ status:
     plural: ""
   conditions: null
   storedVersions: null
-
-

resources/base/directpvinitrequests.directpv.min.io.yaml

@@ -100,5 +100,3 @@ status:
     plural: ""
   conditions: null
   storedVersions: null
-
-

resources/base/directpvnodes.directpv.min.io.yaml

@@ -166,5 +166,3 @@ status:
     plural: ""
   conditions: null
   storedVersions: null
-
-

resources/base/directpvvolumes.directpv.min.io.yaml

@@ -158,5 +158,3 @@ status:
     plural: ""
   conditions: null
   storedVersions: null
-
-

resources/base/kustomization.yaml

@@ -0,0 +1,48 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - Namespace.yaml
+  - directpvdrives.directpv.min.io.yaml
+  - directpvinitrequests.directpv.min.io.yaml
+  - directpvnodes.directpv.min.io.yaml
+  - directpvvolumes.directpv.min.io.yaml
+  - CSIDriver.yaml
+  - StorageClass.yaml
+  - ServiceAccount.yaml
+  - ClusterRole.yaml
+  - ClusterRoleBinding.yaml
+  - Role.yaml
+  - RoleBinding.yaml
+  - DaemonSet.yaml
+  - Deployment.yaml
+
+images:
+  - name: quay.io/minio/directpv
+    digest: sha256:83fd05fe114ed15c3975333c90cbe18c782d9c4d5c7ad6fdb8cc835e380ba505
+
+  - name: quay.io/minio/csi-node-driver-registrar
+    digest: sha256:dafc7f667aa2e20d7f059c20db02dd6987c2624d64d8f166cd5930721be98ea9
+
+  - name: quay.io/minio/livenessprobe
+    digest: sha256:783010e10e4d74b6b2b157a4b52772c5a264fd76bb2ad671054b8c3f706c8324
+
+  - name: quay.io/minio/csi-provisioner
+    digest: sha256:fc1f992dd5591357fa123c396aaadaea5033f312b9c136a11d62cf698474bebb
+
+  - name: quay.io/minio/csi-resizer
+    digest: sha256:58fa627393f20892b105a137d27e236dfaec233a3a64980f84dcb15f38c21533
+
+patches:
+  - patch: |-
+      - op: replace
+        path: /metadata/annotations/directpv.min.io~1plugin-version
+        value: v4.1.4
+    target:
+      annotationSelector: directpv.min.io/plugin-version
+  - patch: |-
+      - op: replace
+        path: /metadata/annotations/directpv.min.io~1image-tag
+        value: v4.1.4
+    target:
+      annotationSelector: directpv.min.io/image-tag

resources/legacy/base/CSIDriver-direct-csi-min-io.yaml → resources/legacy/CSIDriver.yaml

@@ -17,5 +17,3 @@ spec:
   volumeLifecycleModes:
   - Persistent
   - Ephemeral
-
-