New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add s390x to juju kubernetes #52537

Merged
merged 1 commit into from Sep 23, 2017
Jump to file or symbol
Failed to load files and symbols.
+8 −3
Diff settings

Always

Just for now

@@ -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
@@ -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)
ProTip! Use n and p to navigate between commits in a pull request.