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

Merge pull request #69120 from aledbf/defaultbackend

Browse Source 
Update default backend image
This commit is contained in:
k8s-ci-robot 2018-10-03 04:43:39 -07:00 committed by GitHub
commit c520b2cbc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -891,13 +891,13 @@ def launch_default_ingress_controller():
context['defaultbackend_image'] == "auto"): context['defaultbackend_image'] == "auto"):
if context['arch'] == 's390x': if context['arch'] == 's390x':
context['defaultbackend_image'] = \ context['defaultbackend_image'] = \
"k8s.gcr.io/defaultbackend-s390x:1.4" "k8s.gcr.io/defaultbackend-s390x:1.5"
elif context['arch'] == 'arm64': elif context['arch'] == 'arm64':
context['defaultbackend_image'] = \ context['defaultbackend_image'] = \
"k8s.gcr.io/defaultbackend-arm64:1.4" "k8s.gcr.io/defaultbackend-arm64:1.5"
else: else:
context['defaultbackend_image'] = \ context['defaultbackend_image'] = \
"k8s.gcr.io/defaultbackend:1.4" "k8s.gcr.io/defaultbackend-amd64:1.5"
# 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')