Merge pull request #48 from projectsyn/upgrade-3.3

Update to upstream version v3.3.0

Author: megian

class/defaults.yml

@@ -1,7 +1,7 @@
 parameters:
   csi_cloudscale:
     namespace: syn-csi-cloudscale
-    version: v3.2.1
+    version: v3.3.0
     # This switch is required to selectively disable the commoponent
     # TODO: Reevaluate the need for this once disabeling got implemented.
     # See: https://github.com/projectsyn/commodore/issues/71

docs/modules/ROOT/pages/references/parameters.adoc

@@ -18,7 +18,7 @@ See https://kubernetes.io/docs/concepts/policy/resource-quotas/#limit-priority-c
 
 [horizontal]
 type:: string
-default:: `v3.2.1`
+default:: `v3.3.0`
 
 Version of the driver to install.
 See https://github.com/cloudscale-ch/csi-cloudscale/releases[available versions].

tests/golden/defaults/csi-cloudscale/csi-cloudscale/10_deployments.yaml

@@ -1,115 +1,13 @@
-apiVersion: apps/v1
-kind: StatefulSet
+apiVersion: v1
+kind: ServiceAccount
 metadata:
-  name: csi-cloudscale-controller
+  name: csi-cloudscale-controller-sa
   namespace: syn-csi-cloudscale
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: csi-cloudscale-controller
-  serviceName: csi-cloudscale
-  template:
-    metadata:
-      labels:
-        app: csi-cloudscale-controller
-        role: csi-cloudscale
-    spec:
-      containers:
-        - args:
-            - --csi-address=$(ADDRESS)
-            - --default-fstype=ext4
-            - --v=5
-          env:
-            - name: ADDRESS
-              value: /var/lib/csi/sockets/pluginproxy/csi.sock
-          image: quay.io/k8scsi/csi-provisioner:v2.0.4
-          imagePullPolicy: Always
-          name: csi-provisioner
-          resources:
-            limits:
-              cpu: 100m
-            requests:
-              cpu: 20m
-              memory: 32Mi
-          volumeMounts:
-            - mountPath: /var/lib/csi/sockets/pluginproxy/
-              name: socket-dir
-        - args:
-            - --csi-address=$(ADDRESS)
-            - --v=5
-          env:
-            - name: ADDRESS
-              value: /var/lib/csi/sockets/pluginproxy/csi.sock
-          image: quay.io/k8scsi/csi-attacher:v3.0.2
-          imagePullPolicy: Always
-          name: csi-attacher
-          resources:
-            limits:
-              cpu: 100m
-            requests:
-              cpu: 20m
-              memory: 32Mi
-          volumeMounts:
-            - mountPath: /var/lib/csi/sockets/pluginproxy/
-              name: socket-dir
-        - args:
-            - --csi-address=$(ADDRESS)
-            - --timeout=30s
-            - --v=5
-            - --handle-volume-inuse-error=false
-          env:
-            - name: ADDRESS
-              value: /var/lib/csi/sockets/pluginproxy/csi.sock
-          image: quay.io/k8scsi/csi-resizer:v1.0.1
-          imagePullPolicy: IfNotPresent
-          name: csi-resizer
-          resources:
-            limits:
-              cpu: 100m
-            requests:
-              cpu: 20m
-              memory: 32Mi
-          volumeMounts:
-            - mountPath: /var/lib/csi/sockets/pluginproxy/
-              name: socket-dir
-        - args:
-            - --endpoint=$(CSI_ENDPOINT)
-            - --url=$(CLOUDSCALE_API_URL)
-          env:
-            - name: CSI_ENDPOINT
-              value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock
-            - name: CLOUDSCALE_API_URL
-              value: https://api.cloudscale.ch/
-            - name: CLOUDSCALE_ACCESS_TOKEN
-              valueFrom:
-                secretKeyRef:
-                  key: access-token
-                  name: cloudscale
-          image: quay.io/cloudscalech/cloudscale-csi-plugin:v3.2.1
-          imagePullPolicy: Always
-          name: csi-cloudscale-plugin
-          resources:
-            limits:
-              cpu: 100m
-              memory: 1Gi
-            requests:
-              cpu: 20m
-              memory: 32Mi
-          volumeMounts:
-            - mountPath: /var/lib/csi/sockets/pluginproxy/
-              name: socket-dir
-      hostNetwork: true
-      priorityClassName: system-cluster-critical
-      serviceAccount: csi-cloudscale-controller-sa
-      volumes:
-        - emptyDir: {}
-          name: socket-dir
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: csi-cloudscale-controller-sa
+  name: csi-cloudscale-node-sa
   namespace: syn-csi-cloudscale
 ---
 apiVersion: apps/v1
@@ -142,6 +40,7 @@ spec:
                 fieldRef:
                   fieldPath: spec.nodeName
           image: quay.io/k8scsi/csi-node-driver-registrar:v2.0.1
+          imagePullPolicy: IfNotPresent
           lifecycle:
             preStop:
               exec:
@@ -168,13 +67,15 @@ spec:
               value: unix:///csi/csi.sock
             - name: CLOUDSCALE_API_URL
               value: https://api.cloudscale.ch/
+            - name: CLOUDSCALE_MAX_CSI_VOLUMES_PER_NODE
+              value: '125'
             - name: CLOUDSCALE_ACCESS_TOKEN
               valueFrom:
                 secretKeyRef:
                   key: access-token
                   name: cloudscale
-          image: quay.io/cloudscalech/cloudscale-csi-plugin:v3.2.1
-          imagePullPolicy: Always
+          image: quay.io/cloudscalech/cloudscale-csi-plugin:v3.3.0
+          imagePullPolicy: IfNotPresent
           name: csi-cloudscale-plugin
           resources:
             limits:
@@ -222,8 +123,110 @@ spec:
             medium: Memory
           name: tmpfs
 ---
-apiVersion: v1
-kind: ServiceAccount
+apiVersion: apps/v1
+kind: StatefulSet
 metadata:
-  name: csi-cloudscale-node-sa
+  name: csi-cloudscale-controller
   namespace: syn-csi-cloudscale
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: csi-cloudscale-controller
+  serviceName: csi-cloudscale
+  template:
+    metadata:
+      labels:
+        app: csi-cloudscale-controller
+        role: csi-cloudscale
+    spec:
+      containers:
+        - args:
+            - --csi-address=$(ADDRESS)
+            - --default-fstype=ext4
+            - --v=5
+          env:
+            - name: ADDRESS
+              value: /var/lib/csi/sockets/pluginproxy/csi.sock
+          image: quay.io/k8scsi/csi-provisioner:v2.0.4
+          imagePullPolicy: IfNotPresent
+          name: csi-provisioner
+          resources:
+            limits:
+              cpu: 100m
+            requests:
+              cpu: 20m
+              memory: 32Mi
+          volumeMounts:
+            - mountPath: /var/lib/csi/sockets/pluginproxy/
+              name: socket-dir
+        - args:
+            - --csi-address=$(ADDRESS)
+            - --v=5
+          env:
+            - name: ADDRESS
+              value: /var/lib/csi/sockets/pluginproxy/csi.sock
+          image: quay.io/k8scsi/csi-attacher:v3.0.2
+          imagePullPolicy: IfNotPresent
+          name: csi-attacher
+          resources:
+            limits:
+              cpu: 100m
+            requests:
+              cpu: 20m
+              memory: 32Mi
+          volumeMounts:
+            - mountPath: /var/lib/csi/sockets/pluginproxy/
+              name: socket-dir
+        - args:
+            - --csi-address=$(ADDRESS)
+            - --timeout=30s
+            - --v=5
+            - --handle-volume-inuse-error=false
+          env:
+            - name: ADDRESS
+              value: /var/lib/csi/sockets/pluginproxy/csi.sock
+          image: quay.io/k8scsi/csi-resizer:v1.0.1
+          imagePullPolicy: IfNotPresent
+          name: csi-resizer
+          resources:
+            limits:
+              cpu: 100m
+            requests:
+              cpu: 20m
+              memory: 32Mi
+          volumeMounts:
+            - mountPath: /var/lib/csi/sockets/pluginproxy/
+              name: socket-dir
+        - args:
+            - --endpoint=$(CSI_ENDPOINT)
+            - --url=$(CLOUDSCALE_API_URL)
+          env:
+            - name: CSI_ENDPOINT
+              value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock
+            - name: CLOUDSCALE_API_URL
+              value: https://api.cloudscale.ch/
+            - name: CLOUDSCALE_ACCESS_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  key: access-token
+                  name: cloudscale
+          image: quay.io/cloudscalech/cloudscale-csi-plugin:v3.3.0
+          imagePullPolicy: IfNotPresent
+          name: csi-cloudscale-plugin
+          resources:
+            limits:
+              cpu: 100m
+              memory: 1Gi
+            requests:
+              cpu: 20m
+              memory: 32Mi
+          volumeMounts:
+            - mountPath: /var/lib/csi/sockets/pluginproxy/
+              name: socket-dir
+      hostNetwork: true
+      priorityClassName: system-cluster-critical
+      serviceAccount: csi-cloudscale-controller-sa
+      volumes:
+        - emptyDir: {}
+          name: socket-dir

tests/golden/defaults/csi-cloudscale/csi-cloudscale/20_rbac.yaml

@@ -80,19 +80,6 @@ rules:
       - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: csi-cloudscale-provisioner-binding
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: csi-cloudscale-provisioner-role
-subjects:
-  - kind: ServiceAccount
-    name: csi-cloudscale-controller-sa
-    namespace: syn-csi-cloudscale
----
-apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: csi-cloudscale-attacher-role
@@ -141,19 +128,6 @@ rules:
       - patch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: csi-cloudscale-attacher-binding
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: csi-cloudscale-attacher-role
-subjects:
-  - kind: ServiceAccount
-    name: csi-cloudscale-controller-sa
-    namespace: syn-csi-cloudscale
----
-apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: csi-cloudscale-resizer-role
@@ -195,19 +169,6 @@ rules:
       - patch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: csi-cloudscale-resizer-binding
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: csi-cloudscale-resizer-role
-subjects:
-  - kind: ServiceAccount
-    name: csi-cloudscale-controller-sa
-    namespace: syn-csi-cloudscale
----
-apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: csi-cloudscale-node-driver-registrar-role
@@ -227,6 +188,45 @@ rules:
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
+metadata:
+  name: csi-cloudscale-provisioner-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: csi-cloudscale-provisioner-role
+subjects:
+  - kind: ServiceAccount
+    name: csi-cloudscale-controller-sa
+    namespace: syn-csi-cloudscale
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: csi-cloudscale-resizer-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: csi-cloudscale-resizer-role
+subjects:
+  - kind: ServiceAccount
+    name: csi-cloudscale-controller-sa
+    namespace: syn-csi-cloudscale
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: csi-cloudscale-attacher-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: csi-cloudscale-attacher-role
+subjects:
+  - kind: ServiceAccount
+    name: csi-cloudscale-controller-sa
+    namespace: syn-csi-cloudscale
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
 metadata:
   name: csi-cloudscale-node-driver-registrar-binding
 roleRef: