From 8c9885245a07b15cda1900ff78a62f5a84a052f1 Mon Sep 17 00:00:00 2001 From: saad-ali Date: Wed, 12 Aug 2020 23:27:57 -0700 Subject: [PATCH] Move extra-create-metadata to stable --- deploy/kubernetes/base/controller/controller.yaml | 1 + .../enable-extra-create-metadata.yaml | 4 ---- .../prow-gke-release-staging-head/kustomization.yaml | 6 ------ 3 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 deploy/kubernetes/overlays/prow-gke-release-staging-head/enable-extra-create-metadata.yaml diff --git a/deploy/kubernetes/base/controller/controller.yaml b/deploy/kubernetes/base/controller/controller.yaml index a113aa1a9..98cb7c296 100644 --- a/deploy/kubernetes/base/controller/controller.yaml +++ b/deploy/kubernetes/base/controller/controller.yaml @@ -33,6 +33,7 @@ spec: - "--leader-election-type=leases" - "--leader-election-namespace=$(PDCSI_NAMESPACE)" - "--timeout=250s" + - "--extra-create-metadata" # - "--run-controller-service=false" # disable the controller service of the CSI driver # - "--run-node-service=false" # disable the node service of the CSI driver env: diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-head/enable-extra-create-metadata.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-head/enable-extra-create-metadata.yaml deleted file mode 100644 index 55abf2f8c..000000000 --- a/deploy/kubernetes/overlays/prow-gke-release-staging-head/enable-extra-create-metadata.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# Enable extra-create-metadata flag for external-provisioner -- op: add - path: /spec/template/spec/containers/0/args/- - value: "--extra-create-metadata" 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 699060189..cef121c3b 100644 --- a/deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml +++ b/deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml @@ -17,9 +17,3 @@ patchesJson6902: kind: Deployment name: csi-gce-pd-controller path: volume-inuse-error-handler.yaml -- target: - group: apps - version: v1 - kind: Deployment - name: csi-gce-pd-controller - path: enable-extra-create-metadata.yaml