Merge pull request #52537 from juju-solutions/feature/s390x

Automatic merge from submit-queue (batch tested with PRs 52355, 52537, 52551, 52403, 50673). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. Add s390x to juju kubernetes **What this PR does / why we need it**: With this PR we add support for s390x to juju kubernetes worker **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: **Special notes for your reviewer**: **Release note**: ```Kubernetes deployments to s390x via Juju ```

Merge pull request #52537 from juju-solutions/feature/s390x
e9dbad33 · Kubernetes Submit Queue · GitHub · 7e7bcabe · b6f399f4 · e9dbad33
Commit e9dbad33 authored Sep 23, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 23, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

metadata.yaml cluster/juju/layers/kubernetes-worker/metadata.yaml +6 -2

kubernetes_worker.py ...ju/layers/kubernetes-worker/reactive/kubernetes_worker.py +2 -1

No files found.
--- a/cluster/juju/layers/kubernetes-worker/metadata.yaml
+++ b/cluster/juju/layers/kubernetes-worker/metadata.yaml
@@ -33,10 +33,14 @@ provides:
    interface: kubernetes-cni
    scope: container
 resources:
-  cni:
+  cni-amd64:
+    type: file
+    filename: cni.tgz
+    description: CNI plugins for amd64
+  cni-s390x:
    type: file
    filename: cni.tgz
-    description: CNI plugins
+    description: CNI plugins for s390x
  kubectl:
    type: file
    filename: kubectl.snap

--- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
+++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
@@ -179,7 +179,8 @@ def install_cni_plugins():
    # Get the resource via resource_get
    try:
-        archive = hookenv.resource_get('cni')
+        resource_name = 'cni-{}'.format(arch())
+        archive = hookenv.resource_get(resource_name)
    except Exception:
        message = 'Error fetching the cni resource.'
        hookenv.log(message)