openstack
/
magnum
Code Issues Proposed changes

[k8s-coreos] Default hyperkube_prefix to rancher 

Change the default of hyperkube_prefix to
docker.io/rancher/ and kube_tag to v1.23.3-rancher1.

story: 2008609
task: 44568

Signed-off-by: Spyros Trigazis <spyridon.trigazis@cern.ch>
Change-Id: I340f9569f517191d54bc492c82c631f485511b0f
This commit is contained in:
Spyros 2022-02-22 16:22:36 +00:00
parent 2a7ab5e9a3
commit e47f640f3f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/source/user/index.rst
View File

@ -1288,7 +1288,7 @@ _`hyperkube_prefix`
unofficial sources like `docker.io/rancher/`, `ghcr.io/openstackmagnum/` or
your own container registry. If `container_infra_prefix` label is defined, it
still takes precedence over this label.
Default: k8s.gcr.io/
Default: docker.io/rancher/
_`kube_tag`
This label allows users to select a specific Kubernetes release based on its
@ -1301,6 +1301,7 @@ _`kube_tag`
Train default: v1.15.7
Ussuri default: v1.18.2
Victoria default: v1.18.16
Yoga default: v1.23.3-rancher1
_`heapster_enabled`
heapster_enabled is used to enable disable the installation of heapster.

10
magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml
View File

@ -453,35 +453,35 @@ parameters:
hyperkube_prefix:
type: string
description: prefix to use for hyperkube images
default: k8s.gcr.io/
default: docker.io/rancher/
kube_tag:
type: string
description:
tag of the k8s containers used to provision the kubernetes cluster
https://github.com/kubernetes/kubernetes/releases
default: v1.18.16
default: v1.23.3-rancher1
master_kube_tag:
type: string
description:
tag of the k8s containers used to provision the kubernetes cluster
https://github.com/kubernetes/kubernetes/releases
default: v1.18.16
default: v1.23.3-rancher1
minion_kube_tag:
type: string
description:
tag of the k8s containers used to provision the kubernetes cluster
https://github.com/kubernetes/kubernetes/releases
default: v1.18.16
default: v1.23.3-rancher1
cloud_provider_tag:
type: string
description:
tag of the k8scloudprovider/openstack-cloud-controller-manager
https://hub.docker.com/r/k8scloudprovider/openstack-cloud-controller-manager/tags/
default: v1.18.0
default: v1.23.1
cloud_provider_enabled:
type: boolean