From b6f399f4fae0f8d85a2264b9bd4469ec8c46f890 Mon Sep 17 00:00:00 2001 From: Konstantinos Tsakalozos Date: Fri, 15 Sep 2017 15:40:21 +0300 Subject: [PATCH] Add s390x to juju kubernetes --- cluster/juju/layers/kubernetes-worker/metadata.yaml | 8 ++++++-- .../kubernetes-worker/reactive/kubernetes_worker.py | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cluster/juju/layers/kubernetes-worker/metadata.yaml b/cluster/juju/layers/kubernetes-worker/metadata.yaml index 74ef1588b3d..b367fcd9413 100644 --- 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 + description: CNI plugins for amd64 + cni-s390x: + type: file + filename: cni.tgz + description: CNI plugins for s390x kubectl: type: file filename: kubectl.snap diff --git a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py index 77ce0d4dc5c..da424e42819 100644 --- 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)