Merge "[k8s-coreos] Default hyperkube_prefix to rancher"

This commit is contained in:
Zuul 2022-03-01 09:51:45 +00:00 committed by Gerrit Code Review
commit 164ce57af6
2 changed files with 7 additions and 6 deletions

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.

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