Skip to content

Commit 164ce57

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "[k8s-coreos] Default hyperkube_prefix to rancher"
2 parents b73c6d2 + e47f640 commit 164ce57

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

doc/source/user/index.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1288,7 +1288,7 @@ _`hyperkube_prefix`
12881288
unofficial sources like `docker.io/rancher/`, `ghcr.io/openstackmagnum/` or
12891289
your own container registry. If `container_infra_prefix` label is defined, it
12901290
still takes precedence over this label.
1291-
Default: k8s.gcr.io/
1291+
Default: docker.io/rancher/
12921292

12931293
_`kube_tag`
12941294
This label allows users to select a specific Kubernetes release based on its
@@ -1301,6 +1301,7 @@ _`kube_tag`
13011301
Train default: v1.15.7
13021302
Ussuri default: v1.18.2
13031303
Victoria default: v1.18.16
1304+
Yoga default: v1.23.3-rancher1
13041305

13051306
_`heapster_enabled`
13061307
heapster_enabled is used to enable disable the installation of heapster.

magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -453,35 +453,35 @@ parameters:
453453
hyperkube_prefix:
454454
type: string
455455
description: prefix to use for hyperkube images
456-
default: k8s.gcr.io/
456+
default: docker.io/rancher/
457457

458458
kube_tag:
459459
type: string
460460
description:
461461
tag of the k8s containers used to provision the kubernetes cluster
462462
https://github.com/kubernetes/kubernetes/releases
463-
default: v1.18.16
463+
default: v1.23.3-rancher1
464464

465465
master_kube_tag:
466466
type: string
467467
description:
468468
tag of the k8s containers used to provision the kubernetes cluster
469469
https://github.com/kubernetes/kubernetes/releases
470-
default: v1.18.16
470+
default: v1.23.3-rancher1
471471

472472
minion_kube_tag:
473473
type: string
474474
description:
475475
tag of the k8s containers used to provision the kubernetes cluster
476476
https://github.com/kubernetes/kubernetes/releases
477-
default: v1.18.16
477+
default: v1.23.3-rancher1
478478

479479
cloud_provider_tag:
480480
type: string
481481
description:
482482
tag of the k8scloudprovider/openstack-cloud-controller-manager
483483
https://hub.docker.com/r/k8scloudprovider/openstack-cloud-controller-manager/tags/
484-
default: v1.18.0
484+
default: v1.23.1
485485

486486
cloud_provider_enabled:
487487
type: boolean

0 commit comments

Comments
 (0)