Enable csi snapshotter to stable overlay

Author: saikat-royc

deploy/kubernetes/base/controller.yaml

@@ -48,6 +48,15 @@ spec:
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
+        - name: csi-snapshotter
+          imagePullPolicy: Always
+          image: gke.gcr.io/csi-snapshotter
+          args:
+            - "--v=5"
+            - "--csi-address=/csi/csi.sock"
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /csi
         - name: gce-pd-driver
           # Don't change base image without changing pdImagePlaceholder in
           # test/k8s-integration/main.go

deploy/kubernetes/base/kustomization.yaml

@@ -6,3 +6,4 @@ resources:
 - node.yaml
 - controller.yaml
 - setup-cluster.yaml
+- rbac_add_snapshotter.yaml

deploy/kubernetes/overlays/prow-gke-release-staging-head/rbac_add_snapshotter.yaml renamed to deploy/kubernetes/base/rbac_add_snapshotter.yaml

@@ -36,7 +36,12 @@ rules:
   - apiGroups: [""]
     resources: ["nodes"]
     verbs: ["get", "list", "watch"]
-
+  - apiGroups: ["snapshot.storage.k8s.io"]
+    resources: ["volumesnapshots"]
+    verbs: ["get", "list"]
+  - apiGroups: ["snapshot.storage.k8s.io"]
+    resources: ["volumesnapshotcontents"]
+    verbs: ["get", "list"]
 ---
 
 kind: ClusterRoleBinding

deploy/kubernetes/base/setup-cluster.yaml

@@ -2,17 +2,15 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 bases:
 - ../stable
-patches:
-- controller_add_snapshotter.yaml
+images:
+- name: gke.gcr.io/csi-snapshotter
+  newName: gke.gcr.io/csi-snapshotter
+  newTag: "v1.2.2-gke.0"
+# Patch additional rbacs needed for alpha snapshotter sidecar.
 patchesJson6902:
 - target:
     group: rbac.authorization.k8s.io
     version: v1
     kind: ClusterRole
-    name: csi-gce-pd-provisioner-role
-  path: rbac_add_snapshots_to_provisioner.yaml
-resources:
-- rbac_add_snapshotter.yaml
-# Reapplying namespace transformer to include newly added RBAC rules.
-namespace:
-  gce-pd-csi-driver
+    name: csi-gce-pd-snapshotter-role
+  path: rbac_add_snapshotter_alpha_rbacs.yaml

deploy/kubernetes/overlays/alpha/controller_add_snapshotter.yaml

@@ -0,0 +1,44 @@
+# arrays without strategic patch merge defined need to be appended
+# using jsonpatch
+# https://github.com/kubernetes-sigs/kustomize/blob/master/examples/jsonpatch.md
+- op: add
+  path: /rules/-
+  value:
+    apiGroups: [""]
+    resources: ["persistentvolumes"]
+    verbs: ["get", "list", "watch"]
+
+- op: add
+  path: /rules/-
+  value:
+    apiGroups: [""]
+    resources: ["persistentvolumeclaims"]
+    verbs: ["get", "list", "watch", "update"]
+
+- op: add
+  path: /rules/-
+  value:
+    apiGroups: ["storage.k8s.io"]
+    resources: ["storageclasses"]
+    verbs: ["get", "list", "watch"]
+
+- op: add
+  path: /rules/-
+  value:
+    apiGroups: ["snapshot.storage.k8s.io"]
+    resources: ["volumesnapshots"]
+    verbs: ["get", "list", "watch", "update"]
+
+- op: add
+  path: /rules/-
+  value:
+    apiGroups: ["snapshot.storage.k8s.io"]
+    resources: ["volumesnapshots/status"]
+    verbs: ["update"]
+
+- op: add
+  path: /rules/-
+  value:
+    apiGroups: ["apiextensions.k8s.io"]
+    resources: ["customresourcedefinitions"]
+    verbs: ["create", "list", "watch", "delete"]

deploy/kubernetes/overlays/alpha/kustomization.yaml

@@ -18,17 +18,6 @@ images:
 - name: gke.gcr.io/csi-resizer
   newName: quay.io/k8scsi/csi-resizer
   newTag: "canary"
-patches:
-- controller_add_snapshotter.yaml
-patchesJson6902:
-- target:
-    group: rbac.authorization.k8s.io
-    version: v1
-    kind: ClusterRole
-    name: csi-gce-pd-provisioner-role
-  path: rbac_add_snapshots_to_provisioner.yaml
-resources:
-- rbac_add_snapshotter.yaml
-# Reapplying namespace transformer to include newly added RBAC rules.
-namespace:
-  gce-pd-csi-driver
+- name: gke.gcr.io/csi-snapshotter
+  newName: quay.io/k8scsi/csi-snapshotter
+  newTag: "canary"

deploy/kubernetes/overlays/alpha/rbac_add_snapshots_to_provisioner.yaml

@@ -1,20 +1,19 @@
-# for external-snapshotter
-- op: add
-  path: /spec/template/spec/containers/0/args/-
-  value: "--metrics-address=:22014"
-
 # for external-provisioner
 - op: add
-  path: /spec/template/spec/containers/1/args/-
+  path: /spec/template/spec/containers/0/args/-
   value: "--metrics-address=:22011"
 
 # for external-attacher
 - op: add
-  path: /spec/template/spec/containers/2/args/-
+  path: /spec/template/spec/containers/1/args/-
   value: "--metrics-address=:22012"
 
 # for external-resizer
 - op: add
-  path: /spec/template/spec/containers/3/args/-
+  path: /spec/template/spec/containers/2/args/-
   value: "--metrics-address=:22013"
 
+# for external-snapshotter
+- op: add
+  path: /spec/template/spec/containers/3/args/-
+  value: "--metrics-address=:22014"

deploy/kubernetes/overlays/alpha/rbac_add_snapshotter.yaml

@@ -18,23 +18,13 @@ images:
 - name: gke.gcr.io/csi-resizer
   newName: gcr.io/gke-release-staging/csi-resizer
   newTag: "v0.5.0-gke.0"
-patches:
-- controller_add_snapshotter.yaml
+- name: gke.gcr.io/csi-snapshotter
+  newName: gcr.io/gke-release-staging/csi-snapshotter
+  newTag: "v2.1.1-gke.0"
 patchesJson6902:
-- target:
-    group: rbac.authorization.k8s.io
-    version: v1
-    kind: ClusterRole
-    name: csi-gce-pd-provisioner-role
-  path: rbac_add_snapshots_to_provisioner.yaml
 - target:
     group: apps
     version: v1
     kind: StatefulSet
     name: csi-gce-pd-controller
-  path: enable_sidecar_metrics.yaml
-resources:
-- rbac_add_snapshotter.yaml
-# Reapplying namespace transformer to include newly added RBAC rules.
-namespace:
-  gce-pd-csi-driver
+  path: enable_sidecar_metrics.yaml

deploy/kubernetes/overlays/alpha/rbac_add_snapshotter_alpha_rbacs.yaml

@@ -20,3 +20,6 @@ images:
 - name: gke.gcr.io/csi-resizer
   newName: gke.gcr.io/csi-resizer
   newTag: "v0.4.0-gke.0"
+- name: gke.gcr.io/csi-snapshotter
+  newName: gke.gcr.io/csi-snapshotter
+  newTag: "v2.1.1-gke.0"

deploy/kubernetes/overlays/prow-gke-release-staging-head/controller_add_snapshotter.yaml

@@ -44,7 +44,7 @@ else
   base_cmd="${base_cmd} --gce-region=${gce_region}"
 fi
 
-if [[ "$overlay_name" =~ .*"gke-release-staging".* ]]; then
+if [[ "$overlay_name" =~ .*"gke-release-staging".* ]] || [[ "$overlay_name" = "stable" ]]; then
   base_cmd="${base_cmd} --snapshotclass-file=pd-volumesnapshotclass.yaml"
 fi