From 4607ac2e93967722f1b94f40679024cf89c449d6 Mon Sep 17 00:00:00 2001
From: Emin AKTAS <eminaktas34@gmail.com>
Date: Wed, 6 Jul 2022 11:00:50 +0300
Subject: [PATCH] fix(vsphere-csi): remove namespace env variable and set
namespace as kube-system (#9046)
Signed-off-by: eminaktas <eminaktas34@gmail.com>
Co-authored-by: Yasin Taha Erol <yasintahaerol@gmail.com>
Co-authored-by: Yasin Taha Erol <yasintahaerol@gmail.com>
---
.../vsphere-csi-controller-deployment.yml.j2 | 12 ++----------
.../vsphere/templates/vsphere-csi-node.yml.j2 | 6 +-----
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-controller-deployment.yml.j2 b/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-controller-deployment.yml.j2
index e0c26496c..8ff8f6daf 100644
--- a/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-controller-deployment.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-controller-deployment.yml.j2
@@ -90,7 +90,7 @@ spec:
image: {{ gcr_image_repo }}/cloud-provider-vsphere/csi/release/driver:{{ vsphere_csi_controller }}
args:
- "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
- - "--fss-namespace=$(CSI_NAMESPACE)"
+ - "--fss-namespace=kube-system"
- "--use-gocsi=false"
imagePullPolicy: {{ k8s_image_pull_policy }}
env:
@@ -112,10 +112,6 @@ spec:
- name: INCLUSTER_CLIENT_BURST
value: "100"
{% endif %}
- - name: CSI_NAMESPACE
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
volumeMounts:
- mountPath: /etc/cloud
name: vsphere-config-volume
@@ -153,7 +149,7 @@ spec:
args:
- "--leader-election"
- "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
- - "--fss-namespace=$(CSI_NAMESPACE)"
+ - "--fss-namespace=kube-system"
imagePullPolicy: {{ k8s_image_pull_policy }}
ports:
- containerPort: 2113
@@ -172,10 +168,6 @@ spec:
- name: INCLUSTER_CLIENT_BURST
value: "100"
{% endif %}
- - name: CSI_NAMESPACE
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
volumeMounts:
- mountPath: /etc/cloud
name: vsphere-config-volume
diff --git a/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-node.yml.j2 b/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-node.yml.j2
index 53c90cd1a..1b55d629a 100644
--- a/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-node.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-node.yml.j2
@@ -57,7 +57,7 @@ spec:
imagePullPolicy: {{ k8s_image_pull_policy }}
args:
- "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
- - "--fss-namespace=$(CSI_NAMESPACE)"
+ - "--fss-namespace=kube-system"
- "--use-gocsi=false"
imagePullPolicy: "Always"
env:
@@ -79,10 +79,6 @@ spec:
value: "true"
- name: LOGGER_LEVEL
value: "PRODUCTION" # Options: DEVELOPMENT, PRODUCTION
- - name: CSI_NAMESPACE
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
value: "1"
securityContext:
--
GitLab