v1.3.0

qnap-dev · Aug 23, 2024 · bc0b98a · bc0b98a
1 parent 337b02e
commit bc0b98a
Show file tree

Hide file tree

Showing 22 changed files with 308 additions and 108 deletions.
diff --git a/Deploy/Trident/bundle.yaml b/Deploy/Trident/bundle.yaml
@@ -146,6 +146,12 @@ rules:
       - watch
       - update
       - patch
+  - apiGroups:
+      - snapshot.storage.k8s.io
+    resources:
+      - volumesnapshotclasses
+    verbs:
+      - create
   - apiGroups:
       - snapshot.storage.k8s.io
     resources:
@@ -220,12 +226,18 @@ rules:
       - tridentbackendconfigs/status
       - tridentmirrorrelationships
       - tridentmirrorrelationships/status
+      - tridentactionmirrorupdates
+      - tridentactionmirrorupdates/status
       - tridentsnapshotinfos
       - tridentsnapshotinfos/status
+      - tridentactionsnapshotrestores
+      - tridentactionsnapshotrestores/status
       - tridentprovisioners # Required for Tprov
       - tridentprovisioners/status # Required to update Tprov's status section
       - tridentorchestrators # Required for Torc
       - tridentorchestrators/status # Required to update Torc's status section
+      - tridentconfigurators # Required for tconf
+      - tridentconfigurators/status # Required to update tconf's status section
     verbs:
       - get
       - list
@@ -261,9 +273,6 @@ rules:
       - list
       - watch
       - create
-      - delete
-      - update
-      - patch
   - apiGroups:
       - apps
     resources:
@@ -301,10 +310,6 @@ rules:
       - get
       - list
       - create
-      - watch
-      - delete
-      - update
-      - patch
   - apiGroups:
       - ""
     resources:
@@ -322,7 +327,6 @@ rules:
     resources:
       - serviceaccounts
     verbs:
-      - watch
       - delete
       - update
       - patch
@@ -343,9 +347,6 @@ rules:
     verbs:
       - list
       - create
-      - delete
-      - update
-      - patch
   - apiGroups:
       - authorization.openshift.io
       - rbac.authorization.k8s.io
@@ -533,17 +534,28 @@ spec:
         - command:
             - /trident-operator
             - --log-level=debug
-            - --qts-cgi-image=qnapsystem/qnap-csi-backend-qts-sidecar:v1.2.1
+            - --qts-cgi-image=qnapsystem/qnap-csi-backend-qts-sidecar:v1.3.0
           env:
             - name: POD_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.name
             - name: OPERATOR_NAME
               value: trident-operator
-          image: qnapsystem/qnap-csi-operator:v1.2.0
-          imagePullPolicy: IfNotPresent
+          image: qnapsystem/qnap-csi-operator:v1.3.0
+          imagePullPolicy: IfNotPresent 
           name: trident-operator
+          resources:
+            requests:
+              cpu: "10m"
+              memory: "40Mi"
+            limits:
+              cpu: "20m"
+              memory: "80Mi"
+          securityContext:
+            capabilities:
+              drop:
+                - all
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:

diff --git a/Deploy/Trident/tridentorchestrator.yaml b/Deploy/Trident/tridentorchestrator.yaml
@@ -5,4 +5,4 @@ metadata:
 spec:
   debug: true
   namespace: trident
-  tridentImage: qnapsystem/qnap-csi:v1.2.1
+  tridentImage: qnapsystem/qnap-csi:v1.3.0
diff --git a/Helm/trident/Chart.yaml b/Helm/trident/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
-name: qnap-trident
+name: trident
 description: A Helm chart for deploying Trident CSI Plugin using Trident Operator
 type: application
 version: 2.0.0
-kubeVersion: ">= 1.21.0 <= 1.27"
-appVersion: 23.04.0
+kubeVersion: ">= 1.24.0 <= 1.30"
+appVersion: 1.3.0
diff --git a/Helm/trident/templates/bundle.yaml b/Helm/trident/templates/bundle.yaml
@@ -146,6 +146,12 @@ rules:
       - watch
       - update
       - patch
+  - apiGroups:
+      - snapshot.storage.k8s.io
+    resources:
+      - volumesnapshotclasses
+    verbs:
+      - create
   - apiGroups:
       - snapshot.storage.k8s.io
     resources:
@@ -220,12 +226,18 @@ rules:
       - tridentbackendconfigs/status
       - tridentmirrorrelationships
       - tridentmirrorrelationships/status
+      - tridentactionmirrorupdates
+      - tridentactionmirrorupdates/status
       - tridentsnapshotinfos
       - tridentsnapshotinfos/status
+      - tridentactionsnapshotrestores
+      - tridentactionsnapshotrestores/status
       - tridentprovisioners # Required for Tprov
       - tridentprovisioners/status # Required to update Tprov's status section
       - tridentorchestrators # Required for Torc
       - tridentorchestrators/status # Required to update Torc's status section
+      - tridentconfigurators # Required for tconf
+      - tridentconfigurators/status # Required to update tconf's status section
     verbs:
       - get
       - list
@@ -261,9 +273,6 @@ rules:
       - list
       - watch
       - create
-      - delete
-      - update
-      - patch
   - apiGroups:
       - apps
     resources:
@@ -301,10 +310,6 @@ rules:
       - get
       - list
       - create
-      - watch
-      - delete
-      - update
-      - patch
   - apiGroups:
       - ""
     resources:
@@ -322,7 +327,6 @@ rules:
     resources:
       - serviceaccounts
     verbs:
-      - watch
       - delete
       - update
       - patch
@@ -343,9 +347,6 @@ rules:
     verbs:
       - list
       - create
-      - delete
-      - update
-      - patch
   - apiGroups:
       - authorization.openshift.io
       - rbac.authorization.k8s.io
@@ -544,6 +545,17 @@ spec:
           image: {{ .Values.tridentOperator.image }}
           imagePullPolicy: {{ .Values.tridentOperator.imagePullPolicy }}
           name: trident-operator
+          resources:
+            requests:
+              cpu: "10m"
+              memory: "40Mi"
+            limits:
+              cpu: "20m"
+              memory: "80Mi"
+          securityContext:
+            capabilities:
+              drop:
+                - all
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:

diff --git a/Helm/trident/values.yaml b/Helm/trident/values.yaml
@@ -5,11 +5,11 @@
 replicaCount: 1
 
 tridentOperator:
-  image: qnapsystem/qnap-csi-operator:v1.2.0
-  cgiServerImage : qnapsystem/qnap-csi-backend-qts-sidecar:v1.2.1
+  image: qnapsystem/qnap-csi-operator:v1.3.0
+  cgiServerImage : qnapsystem/qnap-csi-backend-qts-sidecar:v1.3.0
   imagePullPolicy: IfNotPresent
   logLevel: debug
 
 tridentOrchestrator:
-  image: qnapsystem/qnap-csi:v1.2.1
+  image: qnapsystem/qnap-csi:v1.3.0
   debug: true
diff --git a/Samples/Backend/backend-sample-hero.yaml b/Samples/Backend/backend-sample-hero.yaml
@@ -0,0 +1,43 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: backend-hero
+  namespace: trident
+type: Opaque
+stringData:
+  username: david
+  password: abcd1234
+  storageAddress: 10.20.90.72
+---
+apiVersion: trident.qnap.io/v1
+kind: TridentBackendConfig
+metadata:
+  name: backend-hero
+  namespace: trident
+spec:
+  version: 1
+  storageDriverName: qnap-iscsi
+  backendName: hero
+  credentials:
+    name: backend-hero
+  debugTraceFlags:
+    method: true
+  storage:
+    - serviceLevel: Any
+      labels:
+        performance: any
+    - serviceLevel: RAID0-SSDCache
+      labels:
+        performance: premium
+      features:
+        ssdCache: "true"
+    - serviceLevel: RAID0
+      labels:
+        performance: standard
+      features:
+        raidLevel: "0"
+    - serviceLevel: RAID1
+      labels:
+        performance: basic
+      features:
+        raidLevel: "1"
diff --git a/Samples/backend-config-sample.yaml → Samples/Backend/backend-sample-qts.yaml b/Samples/backend-config-sample.yaml → Samples/Backend/backend-sample-qts.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: backend-qts-sample-secret
+  name: backend-qts
   namespace: trident
 type: Opaque
 stringData:
@@ -12,35 +12,49 @@ stringData:
 apiVersion: trident.qnap.io/v1
 kind: TridentBackendConfig
 metadata:
-  name: backend-qts-sample-config
+  name: backend-qts
   namespace: trident
 spec:
   version: 1
   storageDriverName: qnap-iscsi
-  backendName: qts-david
+  backendName: qts
   networkInterfaces: ["K8s-ISCSI"] #optional
   credentials:
-    name: backend-qts-sample-secret
+    name: backend-qts
   debugTraceFlags:
-    method: false
+    method: true
   storage:
-    - labels:
-        storage: qts-david
-        serviceLevel: Any
-    - labels:
+    - serviceLevel: Any
+      labels:
+        performance: any 
+    - serviceLevel: SSD-Cache
+      labels:
         performance: premium
       features:
         tiering: Enable
-        tierType: SSD
         ssdCache: "true"
-      serviceLevel: SSD-Cache
-    - labels:
+    - serviceLevel: Tiering
+      labels:
         performance: standard
       features:
         tiering: Enable
-      serviceLevel: Tiering
-    - labels:
+    - serviceLevel: Non-Tiering
+      labels:
         performance: basic
       features:
         tiering: Disable
-      serviceLevel: Non-Tiering
+    - serviceLevel: RAID0
+      labels:
+        performance: raid0
+      features:
+        raidLevel: "0"
+    - serviceLevel: RAID1
+      labels:
+        performance: raid1
+      features:
+        raidLevel: "1"
+    - serviceLevel: RAID5
+      labels:
+        performance: raid5
+      features:
+        raidLevel: "5"
diff --git a/Samples/backend-sample.json → Samples/Backend/backend-sample.json b/Samples/backend-sample.json → Samples/Backend/backend-sample.json
diff --git a/Samples/Snapshot/vol-snapshot.yaml b/Samples/Snapshot/vol-snapshot.yaml
@@ -5,4 +5,4 @@ metadata:
 spec:
   volumeSnapshotClassName: trident-snapshotclass
   source:
-    persistentVolumeClaimName: pvc-basic
+    persistentVolumeClaimName: pvc-premium
diff --git a/Samples/StorageClass/sc.yaml b/Samples/StorageClass/sc.yaml
@@ -23,4 +23,13 @@ metadata:
 provisioner: csi.trident.qnap.io
 parameters:
   selector: "performance=basic"
+allowVolumeExpansion: true
+---
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: any
+provisioner: csi.trident.qnap.io
+parameters:
+  selector: "performance=any"
 allowVolumeExpansion: true
diff --git a/Samples/StorageClass/sc_raid.yaml b/Samples/StorageClass/sc_raid.yaml
@@ -0,0 +1,26 @@
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: raid0
+provisioner: csi.trident.qnap.io
+parameters:
+  selector: "performance=raid0"
+allowVolumeExpansion: true
+---
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: raid1
+provisioner: csi.trident.qnap.io
+parameters:
+  selector: "performance=raid1"
+allowVolumeExpansion: true
+---
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: raid5
+provisioner: csi.trident.qnap.io
+parameters:
+  selector: "performance=raid5"
+allowVolumeExpansion: true