openstack
/
magnum
Code Issues Proposed changes

Merge "Using v1.9.3 as default k8s version"

This commit is contained in:
Zuul 2018-02-21 11:10:32 +00:00 committed by Gerrit Code Review
parent 69296d4b43 1e36980cac
commit f61ef81ef1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2570,7 +2570,7 @@ The image currently has the following OS/software:
+-------------+-----------+
| Docker | 1.13.1 |
+-------------+-----------+
| Kubernetes | 1.7.4 |
| Kubernetes | 1.9.3 |
+-------------+-----------+
| etcd | 3.1.3 |
+-------------+-----------+

4
magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
View File

@ -313,12 +313,12 @@ parameters:
kube_tag:
type: string
description: tag of the k8s containers used to provision the kubernetes cluster
default: v1.7.4
default: v1.9.3
kube_version:
type: string
description: version of kubernetes used for kubernetes cluster
default: v1.7.4
default: v1.9.3
kube_dashboard_version:
type: string

4
magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml
View File

@ -316,12 +316,12 @@ parameters:
kube_tag:
type: string
description: tag of the k8s containers used to provision the kubernetes cluster
default: v1.7.4
default: v1.9.3
kube_version:
type: string
description: version of kubernetes used for kubernetes cluster
default: v1.7.4
default: v1.9.3
kube_dashboard_version:
type: string