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

Allow to use custom csi plugin image and enable topology support

This commit is contained in:
Jesse Haka 2020-11-11 09:50:08 +02:00
parent 9b3f13d93f
commit a8ed94b74f
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/kops/componentconfig.go
View File

@ -706,7 +706,9 @@ type OpenstackBlockStorageConfig struct {
IgnoreAZ *bool `json:"ignore-volume-az,omitempty"` IgnoreAZ *bool `json:"ignore-volume-az,omitempty"`
OverrideAZ *string `json:"override-volume-az,omitempty"` OverrideAZ *string `json:"override-volume-az,omitempty"`
// CreateStorageClass provisions a default class for the Cinder plugin // CreateStorageClass provisions a default class for the Cinder plugin
CreateStorageClass *bool `json:"createStorageClass,omitempty"` CreateStorageClass *bool `json:"createStorageClass,omitempty"`
CSIPluginImage string `json:"csiPluginImage,omitempty"`
CSITopologySupport *bool `json:"csiTopologySupport,omitempty"`
} }
// OpenstackMonitor defines the config for a health monitor // OpenstackMonitor defines the config for a health monitor

4
pkg/apis/kops/v1alpha2/componentconfig.go
View File

@ -707,7 +707,9 @@ type OpenstackBlockStorageConfig struct {
IgnoreAZ *bool `json:"ignore-volume-az,omitempty"` IgnoreAZ *bool `json:"ignore-volume-az,omitempty"`
OverrideAZ *string `json:"override-volume-az,omitempty"` OverrideAZ *string `json:"override-volume-az,omitempty"`
// CreateStorageClass provisions a default class for the Cinder plugin // CreateStorageClass provisions a default class for the Cinder plugin
CreateStorageClass *bool `json:"createStorageClass,omitempty"` CreateStorageClass *bool `json:"createStorageClass,omitempty"`
CSIPluginImage string `json:"csiPluginImage,omitempty"`
CSITopologySupport *bool `json:"csiTopologySupport,omitempty"`
} }
// OpenstackMonitor defines the config for a health monitor // OpenstackMonitor defines the config for a health monitor

7
upup/models/bindata.go
View File

@ -15641,6 +15641,9 @@ spec:
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--timeout=3m" - "--timeout=3m"
{{ if WithDefaultBool .CloudConfig.Openstack.BlockStorage.CSITopologySupport false }}
- --feature-gates=Topology=true
{{ end }}
env: env:
- name: ADDRESS - name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock value: /var/lib/csi/sockets/pluginproxy/csi.sock
@ -15671,7 +15674,7 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/ mountPath: /var/lib/csi/sockets/pluginproxy/
- name: cinder-csi-plugin - name: cinder-csi-plugin
image: docker.io/k8scloudprovider/cinder-csi-plugin:{{ OpenStackCCMTag }} image: "{{- if .CloudConfig.Openstack.BlockStorage.CSIPluginImage -}} {{ .CloudConfig.Openstack.BlockStorage.CSIPluginImage }} {{- else -}} docker.io/k8scloudprovider/cinder-csi-plugin:{{OpenStackCCMTag}} {{- end -}}"
args: args:
- /bin/cinder-csi-plugin - /bin/cinder-csi-plugin
- "--nodeid=$(NODE_ID)" - "--nodeid=$(NODE_ID)"
@ -15800,7 +15803,7 @@ spec:
capabilities: capabilities:
add: ["SYS_ADMIN"] add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true allowPrivilegeEscalation: true
image: docker.io/k8scloudprovider/cinder-csi-plugin:{{ OpenStackCCMTag }} image: "{{- if .CloudConfig.Openstack.BlockStorage.CSIPluginImage -}} {{ .CloudConfig.Openstack.BlockStorage.CSIPluginImage }} {{- else -}} docker.io/k8scloudprovider/cinder-csi-plugin:{{OpenStackCCMTag}} {{- end -}}"
args : args :
- /bin/cinder-csi-plugin - /bin/cinder-csi-plugin
- "--nodeid=$(NODE_ID)" - "--nodeid=$(NODE_ID)"

7
upup/models/cloudup/resources/addons/storage-openstack.addons.k8s.io/k8s-1.16.yaml.template
View File

@ -288,6 +288,9 @@ spec:
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--timeout=3m" - "--timeout=3m"
{{ if WithDefaultBool .CloudConfig.Openstack.BlockStorage.CSITopologySupport false }}
- --feature-gates=Topology=true
{{ end }}
env: env:
- name: ADDRESS - name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock value: /var/lib/csi/sockets/pluginproxy/csi.sock
@ -318,7 +321,7 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/ mountPath: /var/lib/csi/sockets/pluginproxy/
- name: cinder-csi-plugin - name: cinder-csi-plugin
image: docker.io/k8scloudprovider/cinder-csi-plugin:{{ OpenStackCCMTag }} image: "{{- if .CloudConfig.Openstack.BlockStorage.CSIPluginImage -}} {{ .CloudConfig.Openstack.BlockStorage.CSIPluginImage }} {{- else -}} docker.io/k8scloudprovider/cinder-csi-plugin:{{OpenStackCCMTag}} {{- end -}}"
args: args:
- /bin/cinder-csi-plugin - /bin/cinder-csi-plugin
- "--nodeid=$(NODE_ID)" - "--nodeid=$(NODE_ID)"
@ -447,7 +450,7 @@ spec:
capabilities: capabilities:
add: ["SYS_ADMIN"] add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true allowPrivilegeEscalation: true
image: docker.io/k8scloudprovider/cinder-csi-plugin:{{ OpenStackCCMTag }} image: "{{- if .CloudConfig.Openstack.BlockStorage.CSIPluginImage -}} {{ .CloudConfig.Openstack.BlockStorage.CSIPluginImage }} {{- else -}} docker.io/k8scloudprovider/cinder-csi-plugin:{{OpenStackCCMTag}} {{- end -}}"
args : args :
- /bin/cinder-csi-plugin - /bin/cinder-csi-plugin
- "--nodeid=$(NODE_ID)" - "--nodeid=$(NODE_ID)"