github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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 
```
This commit is contained in:
Kubernetes Submit Queue 2017-09-23 15:26:54 -07:00 committed by GitHub
commit e9dbad33ae
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/juju/layers/kubernetes-worker/metadata.yaml
View File

@ -33,10 +33,14 @@ provides:
interface: kubernetes-cni interface: kubernetes-cni
scope: container scope: container
resources: resources:
cni: cni-amd64:
type: file type: file
filename: cni.tgz filename: cni.tgz
description: CNI plugins description: CNI plugins for amd64
cni-s390x:
type: file
filename: cni.tgz
description: CNI plugins for s390x
kubectl: kubectl:
type: file type: file
filename: kubectl.snap filename: kubectl.snap

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

@ -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)