From f892a653ccef0d130cbcba95a1192fe69e309aca Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Wed, 26 Sep 2018 18:30:53 -0300 Subject: [PATCH] Update default backend image --- .../cluster-loadbalancing/glbc/default-svc-controller.yaml | 2 +- .../layers/kubernetes-worker/reactive/kubernetes_worker.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/addons/cluster-loadbalancing/glbc/default-svc-controller.yaml b/cluster/addons/cluster-loadbalancing/glbc/default-svc-controller.yaml index 0fbadc5e12b..cc8df84797e 100644 --- a/cluster/addons/cluster-loadbalancing/glbc/default-svc-controller.yaml +++ b/cluster/addons/cluster-loadbalancing/glbc/default-svc-controller.yaml @@ -25,7 +25,7 @@ spec: # Any image is permissible as long as: # 1. It serves a 404 page at / # 2. It serves 200 on a /healthz endpoint - image: k8s.gcr.io/defaultbackend:1.4 + image: k8s.gcr.io/defaultbackend-amd64:1.5 livenessProbe: httpGet: path: /healthz diff --git a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py index 52d4a4d0eb6..ab86004d235 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -891,13 +891,13 @@ def launch_default_ingress_controller(): context['defaultbackend_image'] == "auto"): if context['arch'] == 's390x': context['defaultbackend_image'] = \ - "k8s.gcr.io/defaultbackend-s390x:1.4" + "k8s.gcr.io/defaultbackend-s390x:1.5" elif context['arch'] == 'arm64': context['defaultbackend_image'] = \ - "k8s.gcr.io/defaultbackend-arm64:1.4" + "k8s.gcr.io/defaultbackend-arm64:1.5" else: context['defaultbackend_image'] = \ - "k8s.gcr.io/defaultbackend:1.4" + "k8s.gcr.io/defaultbackend-amd64:1.5" # Render the default http backend (404) replicationcontroller manifest manifest = addon_path.format('default-http-backend.yaml')