github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Adding support for changing default backend and nginx container images

Browse Source
This commit is contained in:
Mike Wilson 2018-01-19 14:35:59 -05:00
parent 630b943e00
commit b04a88cc9e
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,3 +58,15 @@ options:
The value for this config must be a JSON array of credential objects, like this: The value for this config must be a JSON array of credential objects, like this:
[{"server": "my.registry", "username": "myUser", "password": "myPass"}] [{"server": "my.registry", "username": "myUser", "password": "myPass"}]
nginx-image:
type: string
default: "auto"
description: |
Docker image to use for the nginx ingress controller. Auto will select an image
based on architecture.
default-backend-image:
type: string
default: "auto"
description: |
Docker image to use for the default backend. Auto will select an image
based on architecture.

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

@ -624,17 +624,28 @@ def create_kubeconfig(kubeconfig, server, ca, key=None, certificate=None,
check_call(split(cmd.format(kubeconfig, context))) check_call(split(cmd.format(kubeconfig, context)))
@when_any('config.changed.default-backend-image',
'config.changed.nginx-image')
def launch_default_ingress_controller(): def launch_default_ingress_controller():
''' Launch the Kubernetes ingress controller & default backend (404) ''' ''' Launch the Kubernetes ingress controller & default backend (404) '''
config = hookenv.config()
# need to test this in case we get in here from a config change to the image
if not config.get('ingress'):
return
context = {} context = {}
context['arch'] = arch() context['arch'] = arch()
addon_path = '/root/cdk/addons/{}' addon_path = '/root/cdk/addons/{}'
context['defaultbackend_image'] = \ context['defaultbackend_image'] = config.get('default-backend-image')
"gcr.io/google_containers/defaultbackend:1.4" if context['defaultbackend_image'] == "" or context['defaultbackend_image'] == "auto":
if arch() == 's390x': if context['arch'] == 's390x':
context['defaultbackend_image'] = \ context['defaultbackend_image'] = \
"gcr.io/google_containers/defaultbackend-s390x:1.4" "gcr.io/google_containers/defaultbackend-s390x:1.4"
else:
context['defaultbackend_image'] = \
"gcr.io/google_containers/defaultbackend:1.4"
# Render the default http backend (404) replicationcontroller manifest # Render the default http backend (404) replicationcontroller manifest
manifest = addon_path.format('default-http-backend.yaml') manifest = addon_path.format('default-http-backend.yaml')
@ -650,11 +661,14 @@ def launch_default_ingress_controller():
return return
# Render the ingress daemon set controller manifest # Render the ingress daemon set controller manifest
context['ingress_image'] = \ context['ingress_image'] = config.get('nginx-image')
"gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.13" if context['ingress_image'] == "" or context['ingress_image'] == "auto":
if arch() == 's390x': if context['arch'] == 's390x':
context['ingress_image'] = \ context['ingress_image'] = \
"docker.io/cdkbot/nginx-ingress-controller-s390x:0.9.0-beta.13" "docker.io/cdkbot/nginx-ingress-controller-s390x:0.9.0-beta.13"
else:
context['ingress_image'] = \
"gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.15"
context['juju_application'] = hookenv.service_name() context['juju_application'] = hookenv.service_name()
manifest = addon_path.format('ingress-daemon-set.yaml') manifest = addon_path.format('ingress-daemon-set.yaml')
render('ingress-daemon-set.yaml', manifest, context) render('ingress-daemon-set.yaml', manifest, context)