From 6592e44d18285bfd99ee3651a464a4d21e4b30c3 Mon Sep 17 00:00:00 2001 From: Marco Ceppi Date: Thu, 14 Dec 2017 12:58:52 +0000 Subject: [PATCH] Use an s390x default-http-backend This needs to be refactored to eventually say all non x86 architectures place a -arch() in the image name to support ppc64el, arm, etc. Most all gcr.io/google_containers have -arch() image names. --- .../layers/kubernetes-worker/reactive/kubernetes_worker.py | 6 ++++++ .../kubernetes-worker/templates/default-http-backend.yaml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py index 4e233cb8991..fea91cb798a 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -605,6 +605,12 @@ def launch_default_ingress_controller(): context['arch'] = arch() addon_path = '/root/cdk/addons/{}' + context['defaultbackend_image'] = \ + "gcr.io/google_containers/defaultbackend:1.4" + if arch() == 's390x': + context['defaultbackend_image'] = \ + "gcr.io/google_containers/defaultbackend-s390x:1.4" + # Render the default http backend (404) replicationcontroller manifest manifest = addon_path.format('default-http-backend.yaml') render('default-http-backend.yaml', manifest, context) diff --git a/cluster/juju/layers/kubernetes-worker/templates/default-http-backend.yaml b/cluster/juju/layers/kubernetes-worker/templates/default-http-backend.yaml index 6c826ac320e..91b800ab753 100644 --- a/cluster/juju/layers/kubernetes-worker/templates/default-http-backend.yaml +++ b/cluster/juju/layers/kubernetes-worker/templates/default-http-backend.yaml @@ -17,7 +17,7 @@ spec: # Any image is permissable as long as: # 1. It serves a 404 page at / # 2. It serves 200 on a /healthz endpoint - image: gcr.io/google_containers/defaultbackend:1.0 + image: {{ defaultbackend_image }} livenessProbe: httpGet: path: /healthz