From 559070f694225e21fa55c5c424c9ffc5f9907279 Mon Sep 17 00:00:00 2001 From: Jiawei Wang Date: Wed, 5 Aug 2020 11:15:58 -0700 Subject: [PATCH 1/2] Change CSIDriver object version to v1beta1 to be compatiable with k8s version --- .../overlays/prow-gke-release-staging-rc/csi-driver.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/csi-driver.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/csi-driver.yaml index f37c28554..fb2812d5a 100644 --- a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/csi-driver.yaml +++ b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/csi-driver.yaml @@ -1,4 +1,4 @@ -apiVersion: storage.k8s.io/v1 +apiVersion: storage.k8s.io/v1beta1 kind: CSIDriver metadata: name: pd.csi.storage.gke.io From 924a39856af8bd6f1dcdbd023a79e2f4c877b77e Mon Sep 17 00:00:00 2001 From: Jiawei Wang Date: Wed, 5 Aug 2020 11:38:22 -0700 Subject: [PATCH 2/2] Add the change to staging-head --- .../overlays/prow-gke-release-staging-head/csi-driver.yaml | 7 +++++++ .../prow-gke-release-staging-head/kustomization.yaml | 1 + .../overlays/prow-gke-release-staging-rc/csi-driver.yaml | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 deploy/kubernetes/overlays/prow-gke-release-staging-head/csi-driver.yaml diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-head/csi-driver.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-head/csi-driver.yaml new file mode 100644 index 000000000..d15a496ba --- /dev/null +++ b/deploy/kubernetes/overlays/prow-gke-release-staging-head/csi-driver.yaml @@ -0,0 +1,7 @@ +apiVersion: storage.k8s.io/v1beta1 +kind: CSIDriver +metadata: + name: pd.csi.storage.gke.io +spec: + attachRequired: true + podInfoOnMount: false 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 4bdc0e4ab..8d7f8744f 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,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ../stable +- ./csi-driver.yaml transformers: - ../../images/prow-gke-release-staging-head patchesJson6902: diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/csi-driver.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/csi-driver.yaml index fb2812d5a..d15a496ba 100644 --- a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/csi-driver.yaml +++ b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/csi-driver.yaml @@ -4,4 +4,4 @@ metadata: name: pd.csi.storage.gke.io spec: attachRequired: true - podInfoOnMount: false \ No newline at end of file + podInfoOnMount: false