From 6969481f118af101b4f05d0b7b55de304713b41e Mon Sep 17 00:00:00 2001 From: Michelle Au Date: Thu, 18 Apr 2019 16:38:37 -0700 Subject: [PATCH 1/2] enable topology in staging --- deploy/kubernetes/base/controller.yaml | 1 + deploy/kubernetes/base/setup-cluster.yaml | 3 +++ .../prow-gke-release-staging-rc/kustomization.yaml | 6 +++--- .../overlays/stable/controller_disable_topology.yaml | 12 ++++++++++++ deploy/kubernetes/overlays/stable/kustomization.yaml | 2 ++ 5 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 deploy/kubernetes/overlays/stable/controller_disable_topology.yaml diff --git a/deploy/kubernetes/base/controller.yaml b/deploy/kubernetes/base/controller.yaml index aad15d236..c19ea93e2 100644 --- a/deploy/kubernetes/base/controller.yaml +++ b/deploy/kubernetes/base/controller.yaml @@ -20,6 +20,7 @@ spec: args: - "--v=5" - "--csi-address=/csi/csi.sock" + - "--feature-gates=Topology=true" volumeMounts: - name: socket-dir mountPath: /csi diff --git a/deploy/kubernetes/base/setup-cluster.yaml b/deploy/kubernetes/base/setup-cluster.yaml index 2f7f5fe87..a05db30ad 100644 --- a/deploy/kubernetes/base/setup-cluster.yaml +++ b/deploy/kubernetes/base/setup-cluster.yaml @@ -54,6 +54,9 @@ rules: - apiGroups: ["storage.k8s.io"] resources: ["storageclasses"] verbs: ["get", "list", "watch"] + - apiGroups: ["storage.k8s.io"] + resources: ["csinodes"] + verbs: ["get", "list", "watch"] - apiGroups: [""] resources: ["events"] verbs: ["list", "watch", "create", "update", "patch"] diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml index cb085285a..5847ae56d 100644 --- a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml +++ b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml @@ -8,10 +8,10 @@ images: newTag: "v0.4.0-gke.0" - name: REPLACEME/csi-provisioner newName: gcr.io/gke-release-staging/csi-provisioner - newTag: "v1.0.1-gke.0" + newTag: "v1.1.0-gke.0" - name: REPLACEME/csi-attacher newName: gcr.io/gke-release-staging/csi-attacher - newTag: "v1.0.1-gke.0" + newTag: "v1.1.0-gke.0" - name: REPLACEME/csi-node-driver-registrar newName: gcr.io/gke-release-staging/csi-node-driver-registrar - newTag: "v1.0.1-gke.0" + newTag: "v1.1.0-gke.0" diff --git a/deploy/kubernetes/overlays/stable/controller_disable_topology.yaml b/deploy/kubernetes/overlays/stable/controller_disable_topology.yaml new file mode 100644 index 000000000..cf22f1062 --- /dev/null +++ b/deploy/kubernetes/overlays/stable/controller_disable_topology.yaml @@ -0,0 +1,12 @@ +kind: StatefulSet +apiVersion: apps/v1 +metadata: + name: csi-gce-pd-controller +spec: + template: + spec: + containers: + - name: csi-provisioner + args: + - "--v=5" + - "--csi-address=/csi/csi.sock" diff --git a/deploy/kubernetes/overlays/stable/kustomization.yaml b/deploy/kubernetes/overlays/stable/kustomization.yaml index 537c52de3..d03950e7f 100644 --- a/deploy/kubernetes/overlays/stable/kustomization.yaml +++ b/deploy/kubernetes/overlays/stable/kustomization.yaml @@ -2,6 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization bases: - ../../base +patches: +- controller_disable_topology.yaml images: - name: REPLACEME/gcp-compute-persistent-disk-csi-driver newName: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver From fc73cc2d5505b9b56ee2bda1239e58e2380b30b5 Mon Sep 17 00:00:00 2001 From: Michelle Au Date: Mon, 22 Apr 2019 16:21:58 -0700 Subject: [PATCH 2/2] Patch as enabling topology instead of disabling topology --- deploy/kubernetes/base/controller.yaml | 1 - .../controller_enable_topology.yaml} | 1 + deploy/kubernetes/overlays/alpha/kustomization.yaml | 1 + .../controller_enable_topology.yaml | 13 +++++++++++++ .../kustomization.yaml | 2 ++ .../controller_enable_topology.yaml | 13 +++++++++++++ .../prow-gke-release-staging-rc/kustomization.yaml | 2 ++ .../kubernetes/overlays/stable/kustomization.yaml | 2 -- 8 files changed, 32 insertions(+), 3 deletions(-) rename deploy/kubernetes/overlays/{stable/controller_disable_topology.yaml => alpha/controller_enable_topology.yaml} (83%) create mode 100644 deploy/kubernetes/overlays/prow-gke-release-staging-head/controller_enable_topology.yaml create mode 100644 deploy/kubernetes/overlays/prow-gke-release-staging-rc/controller_enable_topology.yaml diff --git a/deploy/kubernetes/base/controller.yaml b/deploy/kubernetes/base/controller.yaml index c19ea93e2..aad15d236 100644 --- a/deploy/kubernetes/base/controller.yaml +++ b/deploy/kubernetes/base/controller.yaml @@ -20,7 +20,6 @@ spec: args: - "--v=5" - "--csi-address=/csi/csi.sock" - - "--feature-gates=Topology=true" volumeMounts: - name: socket-dir mountPath: /csi diff --git a/deploy/kubernetes/overlays/stable/controller_disable_topology.yaml b/deploy/kubernetes/overlays/alpha/controller_enable_topology.yaml similarity index 83% rename from deploy/kubernetes/overlays/stable/controller_disable_topology.yaml rename to deploy/kubernetes/overlays/alpha/controller_enable_topology.yaml index cf22f1062..0b1e55584 100644 --- a/deploy/kubernetes/overlays/stable/controller_disable_topology.yaml +++ b/deploy/kubernetes/overlays/alpha/controller_enable_topology.yaml @@ -10,3 +10,4 @@ spec: args: - "--v=5" - "--csi-address=/csi/csi.sock" + - "--feature-gates=Topology=true" diff --git a/deploy/kubernetes/overlays/alpha/kustomization.yaml b/deploy/kubernetes/overlays/alpha/kustomization.yaml index 0830b91e1..f16573186 100644 --- a/deploy/kubernetes/overlays/alpha/kustomization.yaml +++ b/deploy/kubernetes/overlays/alpha/kustomization.yaml @@ -4,6 +4,7 @@ bases: - ../stable patches: - controller_add_snapshotter.yaml +- controller_enable_topology.yaml patchesJson6902: - target: group: rbac.authorization.k8s.io diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-head/controller_enable_topology.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-head/controller_enable_topology.yaml new file mode 100644 index 000000000..0b1e55584 --- /dev/null +++ b/deploy/kubernetes/overlays/prow-gke-release-staging-head/controller_enable_topology.yaml @@ -0,0 +1,13 @@ +kind: StatefulSet +apiVersion: apps/v1 +metadata: + name: csi-gce-pd-controller +spec: + template: + spec: + containers: + - name: csi-provisioner + args: + - "--v=5" + - "--csi-address=/csi/csi.sock" + - "--feature-gates=Topology=true" diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml index 2778c468a..69809bea4 100644 --- a/deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml +++ b/deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml @@ -2,6 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization bases: - ../../base +patches: +- controller_enable_topology.yaml images: - name: REPLACEME/gcp-compute-persistent-disk-csi-driver newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/controller_enable_topology.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/controller_enable_topology.yaml new file mode 100644 index 000000000..0b1e55584 --- /dev/null +++ b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/controller_enable_topology.yaml @@ -0,0 +1,13 @@ +kind: StatefulSet +apiVersion: apps/v1 +metadata: + name: csi-gce-pd-controller +spec: + template: + spec: + containers: + - name: csi-provisioner + args: + - "--v=5" + - "--csi-address=/csi/csi.sock" + - "--feature-gates=Topology=true" diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml index 5847ae56d..686f92726 100644 --- a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml +++ b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml @@ -2,6 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization bases: - ../../base +patches: +- controller_enable_topology.yaml images: - name: REPLACEME/gcp-compute-persistent-disk-csi-driver newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver diff --git a/deploy/kubernetes/overlays/stable/kustomization.yaml b/deploy/kubernetes/overlays/stable/kustomization.yaml index d03950e7f..537c52de3 100644 --- a/deploy/kubernetes/overlays/stable/kustomization.yaml +++ b/deploy/kubernetes/overlays/stable/kustomization.yaml @@ -2,8 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization bases: - ../../base -patches: -- controller_disable_topology.yaml images: - name: REPLACEME/gcp-compute-persistent-disk-csi-driver newName: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver