Add s390x to juju kubernetes

parent b5fbd71b
...@@ -33,10 +33,14 @@ provides: ...@@ -33,10 +33,14 @@ provides:
interface: kubernetes-cni interface: kubernetes-cni
scope: container scope: container
resources: resources:
cni: cni-amd64:
type: file
filename: cni.tgz
description: CNI plugins for amd64
cni-s390x:
type: file type: file
filename: cni.tgz filename: cni.tgz
description: CNI plugins description: CNI plugins for s390x
kubectl: kubectl:
type: file type: file
filename: kubectl.snap filename: kubectl.snap
......
...@@ -179,7 +179,8 @@ def install_cni_plugins(): ...@@ -179,7 +179,8 @@ def install_cni_plugins():
# Get the resource via resource_get # Get the resource via resource_get
try: try:
archive = hookenv.resource_get('cni') resource_name = 'cni-{}'.format(arch())
archive = hookenv.resource_get(resource_name)
except Exception: except Exception:
message = 'Error fetching the cni resource.' message = 'Error fetching the cni resource.'
hookenv.log(message) hookenv.log(message)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment