kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
pull/9065/head
Emin AKTAS 2022-07-06 11:00:50 +03:00 committed by GitHub
parent 9ca5632582
commit 4607ac2e93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-controller-deployment.yml.j2
View File

@ -90,7 +90,7 @@ spec:
image: {{ gcr_image_repo }}/cloud-provider-vsphere/csi/release/driver:{{ vsphere_csi_controller }} image: {{ gcr_image_repo }}/cloud-provider-vsphere/csi/release/driver:{{ vsphere_csi_controller }}
args: args:
- "--fss-name=internal-feature-states.csi.vsphere.vmware.com" - "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
- "--fss-namespace=$(CSI_NAMESPACE)" - "--fss-namespace=kube-system"
- "--use-gocsi=false" - "--use-gocsi=false"
imagePullPolicy: {{ k8s_image_pull_policy }} imagePullPolicy: {{ k8s_image_pull_policy }}
env: env:
@ -112,10 +112,6 @@ spec:
- name: INCLUSTER_CLIENT_BURST - name: INCLUSTER_CLIENT_BURST
value: "100" value: "100"
{% endif %} {% endif %}
- name: CSI_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
volumeMounts: volumeMounts:
- mountPath: /etc/cloud - mountPath: /etc/cloud
name: vsphere-config-volume name: vsphere-config-volume
@ -153,7 +149,7 @@ spec:
args: args:
- "--leader-election" - "--leader-election"
- "--fss-name=internal-feature-states.csi.vsphere.vmware.com" - "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
- "--fss-namespace=$(CSI_NAMESPACE)" - "--fss-namespace=kube-system"
imagePullPolicy: {{ k8s_image_pull_policy }} imagePullPolicy: {{ k8s_image_pull_policy }}
ports: ports:
- containerPort: 2113 - containerPort: 2113
@ -172,10 +168,6 @@ spec:
- name: INCLUSTER_CLIENT_BURST - name: INCLUSTER_CLIENT_BURST
value: "100" value: "100"
{% endif %} {% endif %}
- name: CSI_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
volumeMounts: volumeMounts:
- mountPath: /etc/cloud - mountPath: /etc/cloud
name: vsphere-config-volume name: vsphere-config-volume

6
roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-node.yml.j2
View File

@ -57,7 +57,7 @@ spec:
imagePullPolicy: {{ k8s_image_pull_policy }} imagePullPolicy: {{ k8s_image_pull_policy }}
args: args:
- "--fss-name=internal-feature-states.csi.vsphere.vmware.com" - "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
- "--fss-namespace=$(CSI_NAMESPACE)" - "--fss-namespace=kube-system"
- "--use-gocsi=false" - "--use-gocsi=false"
imagePullPolicy: "Always" imagePullPolicy: "Always"
env: env:
@ -79,10 +79,6 @@ spec:
value: "true" value: "true"
- name: LOGGER_LEVEL - name: LOGGER_LEVEL
value: "PRODUCTION" # Options: DEVELOPMENT, PRODUCTION value: "PRODUCTION" # Options: DEVELOPMENT, PRODUCTION
- name: CSI_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
value: "1" value: "1"
securityContext: securityContext: