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

Merge pull request #15249 from zetaab/registryk8sos 

switch to use registry.k8s.io images for openstack
This commit is contained in:
Kubernetes Prow Robot 2023-03-18 08:51:15 -07:00 committed by GitHub
parent bbf50b0a12 69460da4c1
commit cbebf994a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
upup/models/cloudup/resources/addons/openstack.addons.k8s.io/k8s-1.13.yaml.template
View File

@ -220,7 +220,7 @@ spec:
operator: Exists operator: Exists
containers: containers:
- name: openstack-cloud-controller-manager - name: openstack-cloud-controller-manager
image: "{{- if .ExternalCloudControllerManager.Image -}} {{ .ExternalCloudControllerManager.Image }} {{- else -}} docker.io/k8scloudprovider/openstack-cloud-controller-manager:{{OpenStackCCMTag}} {{- end -}}" image: "{{- if .ExternalCloudControllerManager.Image -}} {{ .ExternalCloudControllerManager.Image }} {{- else -}} registry.k8s.io/provider-os/openstack-cloud-controller-manager:{{OpenStackCCMTag}} {{- end -}}"
args: args:
- /bin/openstack-cloud-controller-manager - /bin/openstack-cloud-controller-manager
{{- range $arg := CloudControllerConfigArgv }} {{- range $arg := CloudControllerConfigArgv }}

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

@ -321,7 +321,7 @@ spec:
- mountPath: /var/lib/csi/sockets/pluginproxy/ - mountPath: /var/lib/csi/sockets/pluginproxy/
name: socket-dir name: socket-dir
- name: cinder-csi-plugin - name: cinder-csi-plugin
image: "{{- if .CloudProvider.Openstack.BlockStorage.CSIPluginImage -}} {{ .CloudProvider.Openstack.BlockStorage.CSIPluginImage }} {{- else -}} docker.io/k8scloudprovider/cinder-csi-plugin:{{OpenStackCSITag}} {{- end -}}" image: "{{- if .CloudProvider.Openstack.BlockStorage.CSIPluginImage -}} {{ .CloudProvider.Openstack.BlockStorage.CSIPluginImage }} {{- else -}} registry.k8s.io/provider-os/cinder-csi-plugin:{{OpenStackCSITag}} {{- end -}}"
args: args:
- /bin/cinder-csi-plugin - /bin/cinder-csi-plugin
- "--endpoint=$(CSI_ENDPOINT)" - "--endpoint=$(CSI_ENDPOINT)"

12
upup/pkg/fi/cloudup/template_functions.go
View File

@ -845,14 +845,12 @@ func (tf *TemplateFunctions) OpenStackCCMTag() string {
if err != nil { if err != nil {
tag = "latest" tag = "latest"
} else { } else {
if parsed.Minor == 23 { if parsed.Minor == 24 {
tag = "v1.23.1"
} else if parsed.Minor == 24 {
tag = "v1.24.6" tag = "v1.24.6"
} else if parsed.Minor == 25 { } else if parsed.Minor == 25 {
tag = "v1.25.4" tag = "v1.25.5"
} else if parsed.Minor == 26 { } else if parsed.Minor == 26 {
tag = "v1.26.1" tag = "v1.26.2"
} else { } else {
// otherwise we use always .0 ccm image, if needed that can be overrided using clusterspec // otherwise we use always .0 ccm image, if needed that can be overrided using clusterspec
tag = fmt.Sprintf("v%d.%d.0", parsed.Major, parsed.Minor) tag = fmt.Sprintf("v%d.%d.0", parsed.Major, parsed.Minor)
@ -872,9 +870,9 @@ func (tf *TemplateFunctions) OpenStackCSITag() string {
if parsed.Minor == 24 { if parsed.Minor == 24 {
tag = "v1.24.6" tag = "v1.24.6"
} else if parsed.Minor == 25 { } else if parsed.Minor == 25 {
tag = "v1.25.4" tag = "v1.25.5"
} else if parsed.Minor == 26 { } else if parsed.Minor == 26 {
tag = "v1.26.1" tag = "v1.26.2"
} else { } else {
// otherwise we use always .0 csi image, if needed that can be overrided using cloud config spec // otherwise we use always .0 csi image, if needed that can be overrided using cloud config spec
tag = fmt.Sprintf("v%d.%d.0", parsed.Major, parsed.Minor) tag = fmt.Sprintf("v%d.%d.0", parsed.Major, parsed.Minor)