diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst
index a144a95e0d..af84fe2c59 100644
--- a/doc/source/user/index.rst
+++ b/doc/source/user/index.rst
@@ -1238,10 +1238,13 @@ _`kube_tag`
container tag for `Fedora Atomic
`_ or
`Fedora CoreOS and Fedora Atomic (with use_podman=true label)
- `_. If unset, the current
+ `_. If unset, the current
Magnum version's default Kubernetes release is installed. `Take a look at
the Wiki for a compatibility matrix between Kubernetes and Magnum Releases
`_.
+ Stein default: v1.11.6
+ Train default: v1.15.7
+ Ussuri default: v1.18.2
_`heapster_enabled`
heapster_enabled is used to enable disable the installation of heapster.
@@ -1260,17 +1263,13 @@ _`metrics_server_enabled`
Stein default: true
_`cloud_provider_tag`
- This label allows users to select `a specific release for the openstack
- cloud provider
- `_.
- If unset, the current Magnum version's default
- kubernetes/cloud-provider-openstack release is installed.
- For version compatibility, please consult the `release page
- `_ of
- the cloud-provider. The images are hosted `here
- `_.
+ This label allows users to override the default
+ openstack-cloud-controller-manager container image tag. Refer to
+ `openstack-cloud-controller-manager page for available tags
+ `_.
Stein default: v0.2.0
Train default: v1.15.0
+ Ussuri default: v1.18.0
_`etcd_tag`
This label allows users to select `a specific etcd version,
@@ -1323,6 +1322,7 @@ _`kube_dashboard_enabled`
_`cert_manager_api`
This label enables the kubernetes `certificate manager api
`_.
+
_`kubelet_options`
This label can hold any additional options to be passed to the kubelet.
For more details, refer to the `kubelet admin guide
@@ -1379,10 +1379,11 @@ _`cinder_csi_enabled`
Default: false
_`cinder_csi_plugin_tag`
- This label allows users to override the default container tag for Cinder CSI plugin.
- For additional tags, `refer to Cinder CSI plugin page
+ This label allows users to override the default cinder-csi-plugin container
+ image tag. Refer to `cinder-csi-plugin page for available tags
`_.
- Ussuri-default: v1.16.0
+ Train default: v1.16.0
+ Ussuri default: v1.18.0
_`csi_attacher_tag`
This label allows users to override the default container tag for CSI attacher.
@@ -1420,12 +1421,12 @@ _`keystone_auth_enabled`
authorization and authentication.
_`k8s_keystone_auth_tag`
- This label allows users to select `a specific k8s_keystone_auth
- version, based on its container tag
- `_.
- Stein-default: v1.13.0
- Train-default: v1.14.0
- Ussuri-default: v1.15.0
+ This label allows users to override the default k8s-keystone-auth container
+ image tag. Refer to `k8s-keystone-auth page for available tags
+ `_.
+ Stein default: v1.13.0
+ Train default: v1.14.0
+ Ussuri default: v1.18.0
_`monitoring_enabled`
Enable installation of cluster monitoring solution provided by the
@@ -1497,11 +1498,20 @@ _`draino_tag`
This label allows users to select a specific Draino version.
_`magnum_auto_healer_tag`
- This label allows users to select a specific magnum-auto-healer version.
- The default value for Train: v1.15.0
+ This label allows users to override the default magnum-auto-healer container
+ image tag. Refer to `magnum-auto-healer page for available tags
+ `_.
+ Stein default: v1.15.0
+ Train default: v1.15.0
+ Ussuri default: v1.18.0
_`autoscaler_tag`
- This label allows users to select a specific Cluster Autoscaler version.
+ This label allows users to override the default cluster-autoscaler container
+ image tag. Refer to `cluster-autoscaler page for available tags
+ `_.
+ Stein default: v1.0
+ Train default: v1.0
+ Ussuri default: v1.18.1
_`min_node_count`
The minmium node count of the cluster when doing auto scaling or auto
diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml
index 58230314ec..537ceaf645 100644
--- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml
+++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml
@@ -446,27 +446,31 @@ parameters:
kube_tag:
type: string
- description: tag of the k8s containers used to provision the kubernetes cluster
- default: v1.15.7
+ description:
+ tag of the k8s containers used to provision the kubernetes cluster
+ https://github.com/kubernetes/kubernetes/releases
+ default: v1.18.2
master_kube_tag:
type: string
- description: tag of the k8s containers used to provision the kubernetes cluster
- default: v1.15.7
+ description:
+ tag of the k8s containers used to provision the kubernetes cluster
+ https://github.com/kubernetes/kubernetes/releases
+ default: v1.18.2
minion_kube_tag:
type: string
- description: tag of the k8s containers used to provision the kubernetes cluster
- default: v1.15.7
+ description:
+ tag of the k8s containers used to provision the kubernetes cluster
+ https://github.com/kubernetes/kubernetes/releases
+ default: v1.18.2
- # FIXME update cloud_provider_tag when a fix for PVC is released
- # https://github.com/kubernetes/cloud-provider-openstack/pull/405
cloud_provider_tag:
type: string
description:
- tag of the kubernetes/cloud-provider-openstack
+ tag of the k8scloudprovider/openstack-cloud-controller-manager
https://hub.docker.com/r/k8scloudprovider/openstack-cloud-controller-manager/tags/
- default: v1.15.0
+ default: v1.18.0
cloud_provider_enabled:
type: boolean
@@ -495,7 +499,7 @@ parameters:
kube_version:
type: string
description: version of kubernetes used for kubernetes cluster
- default: v1.15.7
+ default: v1.18.2
kube_dashboard_version:
type: string
@@ -599,7 +603,9 @@ parameters:
octavia_ingress_controller_tag:
type: string
description: Octavia ingress controller docker image tag.
- default: "v1.15.0"
+ tag of the k8scloudprovider/octavia-ingress-controller container
+ https://hub.docker.com/r/k8scloudprovider/octavia-ingress-controller/tags/
+ default: v1.18.0
kubelet_options:
type: string
@@ -680,8 +686,10 @@ parameters:
k8s_keystone_auth_tag:
type: string
- description: tag of the k8s_keystone_auth container
- default: v1.15.0
+ description:
+ tag of the k8scloudprovider/k8s-keystone-auth container
+ https://hub.docker.com/r/k8scloudprovider/k8s-keystone-auth/tags/
+ default: v1.18.0
monitoring_enabled:
type: boolean
@@ -743,8 +751,10 @@ parameters:
magnum_auto_healer_tag:
type: string
- description: tag of the magnum-auto-healer service.
- default: "v1.15.0"
+ description:
+ tag of the k8scloudprovider/magnum-auto-healer container
+ https://hub.docker.com/r/k8scloudprovider/magnum-auto-healer/tags/
+ default: v1.18.0
auto_scaling_enabled:
type: boolean
@@ -763,7 +773,9 @@ parameters:
cinder_csi_plugin_tag:
type: string
description: tag of cinder csi plugin
- default: v1.16.0
+ tag of the k8scloudprovider/cinder-csi-plugin container
+ https://hub.docker.com/r/k8scloudprovider/cinder-csi-plugin/tags/
+ default: v1.18.0
csi_attacher_tag:
type: string
@@ -813,7 +825,9 @@ parameters:
autoscaler_tag:
type: string
description: tag of the autoscaler container
- default: v1.0
+ tag of the openstackmagnum/cluster-autoscaler container
+ https://hub.docker.com/r/openstackmagnum/cluster-autoscaler/tags/
+ default: v1.18.1
min_node_count:
type: number
diff --git a/releasenotes/notes/k8s-fcos-version-bumps-ca89507d2cf15384.yaml b/releasenotes/notes/k8s-fcos-version-bumps-ca89507d2cf15384.yaml
new file mode 100644
index 0000000000..395d0ed66c
--- /dev/null
+++ b/releasenotes/notes/k8s-fcos-version-bumps-ca89507d2cf15384.yaml
@@ -0,0 +1,11 @@
+---
+upgrade:
+ - |
+ Bump up default versions for fedora-coreos driver
+ kube_tag: v1.18.2
+ autoscaler_tag: v1.18.1
+ cloud_provider_tag: v1.18.0
+ cinder_csi_plugin_tag: v1.18.0
+ k8s_keystone_auth_tag: v1.18.0
+ magnum_auto_healer_tag: v1.18.0
+ octavia_ingress_controller_tag: v1.18.0