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

Proposed fix to Issue 8667 (#8944) 

Proposed fix to Issue 8667

Proposed fix to Issue 8667
pull/8957/head
Steffen Becker 2022-06-10 08:37:46 +02:00 committed by GitHub
parent 024a3ee551
commit 6b43d6aff2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
inventory/sample/group_vars/all/vsphere.yml
View File

@ -14,15 +14,15 @@
## gcr.io/cloud-provider-vsphere/cpi/release/manager ## gcr.io/cloud-provider-vsphere/cpi/release/manager
# external_vsphere_cloud_controller_image_tag: "latest" # external_vsphere_cloud_controller_image_tag: "latest"
## gcr.io/cloud-provider-vsphere/csi/release/syncer ## gcr.io/cloud-provider-vsphere/csi/release/syncer
# vsphere_syncer_image_tag: "v2.4.0" # vsphere_syncer_image_tag: "v2.5.1"
## registry.k8s.io/sig-storage/csi-attacher ## registry.k8s.io/sig-storage/csi-attacher
# vsphere_csi_attacher_image_tag: "v3.3.0" # vsphere_csi_attacher_image_tag: "v3.4.0"
## gcr.io/cloud-provider-vsphere/csi/release/driver ## gcr.io/cloud-provider-vsphere/csi/release/driver
# vsphere_csi_controller: "v2.4.0" # vsphere_csi_controller: "v2.5.1"
## registry.k8s.io/sig-storage/livenessprobe ## registry.k8s.io/sig-storage/livenessprobe
# vsphere_csi_liveness_probe_image_tag: "v2.4.0" # vsphere_csi_liveness_probe_image_tag: "v2.6.0"
## registry.k8s.io/sig-storage/csi-provisioner ## registry.k8s.io/sig-storage/csi-provisioner
# vsphere_csi_provisioner_image_tag: "v3.0.0" # vsphere_csi_provisioner_image_tag: "v3.1.0"
## registry.k8s.io/sig-storage/csi-resizer ## registry.k8s.io/sig-storage/csi-resizer
## makes sense only for vSphere version >=7.0 ## makes sense only for vSphere version >=7.0
# vsphere_csi_resizer_tag: "v1.3.0" # vsphere_csi_resizer_tag: "v1.3.0"

4
roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-controller-config.yml.j2
View File

@ -1,7 +1,11 @@
apiVersion: v1 apiVersion: v1
data: data:
"csi-migration": "false" "csi-migration": "false"
{% if external_vsphere_version >= "7.0" %}
"csi-auth-check": "true" "csi-auth-check": "true"
{% else %}
"csi-auth-check": "false"
{% endif %}
"online-volume-extend": "true" "online-volume-extend": "true"
"trigger-csi-fullsync": "false" "trigger-csi-fullsync": "false"
"async-query-volume": "true" "async-query-volume": "true"

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

@ -88,12 +88,10 @@ spec:
{% endif %} {% endif %}
- name: vsphere-csi-controller - name: vsphere-csi-controller
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 }}
{% if external_vsphere_version >= "7.0u1" %}
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=$(CSI_NAMESPACE)"
- "--use-gocsi=false" - "--use-gocsi=false"
{% endif %}
imagePullPolicy: {{ k8s_image_pull_policy }} imagePullPolicy: {{ k8s_image_pull_policy }}
env: env:
- name: CSI_ENDPOINT - name: CSI_ENDPOINT
@ -113,11 +111,11 @@ spec:
value: "100" value: "100"
- name: INCLUSTER_CLIENT_BURST - name: INCLUSTER_CLIENT_BURST
value: "100" value: "100"
{% endif %}
- name: CSI_NAMESPACE - name: CSI_NAMESPACE
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
{% endif %}
volumeMounts: volumeMounts:
- mountPath: /etc/cloud - mountPath: /etc/cloud
name: vsphere-config-volume name: vsphere-config-volume
@ -154,10 +152,8 @@ spec:
image: {{ gcr_image_repo }}/cloud-provider-vsphere/csi/release/syncer:{{ vsphere_syncer_image_tag }} image: {{ gcr_image_repo }}/cloud-provider-vsphere/csi/release/syncer:{{ vsphere_syncer_image_tag }}
args: args:
- "--leader-election" - "--leader-election"
{% if external_vsphere_version >= "7.0u1" %}
- "--fss-name=internal-feature-states.csi.vsphere.vmware.com" - "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
- "--fss-namespace=$(CSI_NAMESPACE)" - "--fss-namespace=$(CSI_NAMESPACE)"
{% endif %}
imagePullPolicy: {{ k8s_image_pull_policy }} imagePullPolicy: {{ k8s_image_pull_policy }}
ports: ports:
- containerPort: 2113 - containerPort: 2113
@ -175,11 +171,11 @@ spec:
value: "100" value: "100"
- name: INCLUSTER_CLIENT_BURST - name: INCLUSTER_CLIENT_BURST
value: "100" value: "100"
{% endif %}
- name: CSI_NAMESPACE - name: CSI_NAMESPACE
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
{% endif %}
volumeMounts: volumeMounts:
- mountPath: /etc/cloud - mountPath: /etc/cloud
name: vsphere-config-volume name: vsphere-config-volume

2
roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-controller-rbac.yml.j2
View File

@ -41,7 +41,6 @@ rules:
- apiGroups: ["storage.k8s.io"] - apiGroups: ["storage.k8s.io"]
resources: ["volumeattachments"] resources: ["volumeattachments"]
verbs: ["get", "list", "watch", "patch", "update"] verbs: ["get", "list", "watch", "patch", "update"]
{% if external_vsphere_version >= "7.0u1" %}
- apiGroups: ["cns.vmware.com"] - apiGroups: ["cns.vmware.com"]
resources: ["triggercsifullsyncs"] resources: ["triggercsifullsyncs"]
verbs: ["create", "get", "update", "watch", "list"] verbs: ["create", "get", "update", "watch", "list"]
@ -57,7 +56,6 @@ rules:
- apiGroups: [ "cns.vmware.com" ] - apiGroups: [ "cns.vmware.com" ]
resources: [ "csinodetopologies" ] resources: [ "csinodetopologies" ]
verbs: ["get", "update", "watch", "list"] verbs: ["get", "update", "watch", "list"]
{% endif %}
- apiGroups: ["storage.k8s.io"] - apiGroups: ["storage.k8s.io"]
resources: ["volumeattachments/status"] resources: ["volumeattachments/status"]
verbs: ["patch"] verbs: ["patch"]

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

@ -55,12 +55,10 @@ spec:
- name: vsphere-csi-node - name: vsphere-csi-node
image: {{ gcr_image_repo }}/cloud-provider-vsphere/csi/release/driver:{{ vsphere_csi_driver_image_tag }} image: {{ gcr_image_repo }}/cloud-provider-vsphere/csi/release/driver:{{ vsphere_csi_driver_image_tag }}
imagePullPolicy: {{ k8s_image_pull_policy }} imagePullPolicy: {{ k8s_image_pull_policy }}
{% if external_vsphere_version >= "7.0u1" %}
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=$(CSI_NAMESPACE)"
- "--use-gocsi=false" - "--use-gocsi=false"
{% endif %}
imagePullPolicy: "Always" imagePullPolicy: "Always"
env: env:
- name: NODE_NAME - name: NODE_NAME
@ -81,12 +79,10 @@ spec:
value: "true" value: "true"
- name: LOGGER_LEVEL - name: LOGGER_LEVEL
value: "PRODUCTION" # Options: DEVELOPMENT, PRODUCTION value: "PRODUCTION" # Options: DEVELOPMENT, PRODUCTION
{% if external_vsphere_version >= "7.0u1" %}
- name: CSI_NAMESPACE - name: CSI_NAMESPACE
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
{% endif %}
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
value: "1" value: "1"
securityContext: securityContext: