github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

Preparing for 1.11 release and update ingress image to 0.16.1

Browse Source
This commit is contained in:
Konstantinos Tsakalozos 2018-06-28 17:51:09 +03:00
parent ee2e11a0d4
commit 7d96095e68
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/juju/layers/kubernetes-e2e/config.yaml
View File

@ -1,6 +1,6 @@
options: options:
channel: channel:
type: string type: string
default: "1.10/stable" default: "1.11/stable"
description: | description: |
Snap channel to install Kubernetes snaps from Snap channel to install Kubernetes snaps from

2
cluster/juju/layers/kubernetes-master/config.yaml
View File

@ -85,7 +85,7 @@ options:
will not be loaded. will not be loaded.
channel: channel:
type: string type: string
default: "1.10/stable" default: "1.11/stable"
description: | description: |
Snap channel to install Kubernetes master services from Snap channel to install Kubernetes master services from
client_password: client_password:

2
cluster/juju/layers/kubernetes-worker/config.yaml
View File

@ -23,7 +23,7 @@ options:
policies (PSP) should be used to restrict container privileges. policies (PSP) should be used to restrict container privileges.
channel: channel:
type: string type: string
default: "1.10/stable" default: "1.11/stable"
description: | description: |
Snap channel to install Kubernetes worker services from Snap channel to install Kubernetes worker services from
require-manual-upgrade: require-manual-upgrade:

8
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View File

@ -747,10 +747,10 @@ def launch_default_ingress_controller():
'ingress-ssl-chain-completion') 'ingress-ssl-chain-completion')
context['ingress_image'] = config.get('nginx-image') context['ingress_image'] = config.get('nginx-image')
if context['ingress_image'] == "" or context['ingress_image'] == "auto": if context['ingress_image'] == "" or context['ingress_image'] == "auto":
images = {'amd64': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.15.0', # noqa images = {'amd64': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.1', # noqa
'arm64': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller-arm64:0.15.0', # noqa 'arm64': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller-arm64:0.16.1', # noqa
's390x': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller-s390x:0.15.0', # noqa 's390x': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller-s390x:0.16.1', # noqa
'ppc64el': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller-ppc64le:0.15.0', # noqa 'ppc64el': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller-ppc64le:0.16.1', # noqa
} }
context['ingress_image'] = images.get(context['arch'], images['amd64']) context['ingress_image'] = images.get(context['arch'], images['amd64'])
if get_version('kubelet') < (1, 9): if get_version('kubelet') < (1, 9):