diff options
| author |   Yibo Cai <yibo.cai@arm.com> | 2018-08-16 05:05:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-08-16 05:05:29 +0000 |
| commit | cc71c866cb9880ac014bcf9a3ba52d579d8e5df2 (patch) | |
| tree | 5dccc376e60b3d78c71c14c1655618e684cdb183 | |
| parent | 381a1df096e1f358bef8de1dbaa7593379357f22 (diff) | |
| parent | 0e6ffa22f729d755db3c4903fa9e6eb1e872854e (diff) | |
Merge "Change the dashboard and heapster images in k8s to arm64 when running on arm platform"
| -rw-r--r-- | deploy/adapters/ansible/kubernetes/roles/kargo/files/extra-vars-aarch64.yml | 1 | ||||
| -rw-r--r-- | deploy/adapters/ansible/kubernetes/roles/post-k8s/tasks/main.yml | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/kubernetes/roles/kargo/files/extra-vars-aarch64.yml b/deploy/adapters/ansible/kubernetes/roles/kargo/files/extra-vars-aarch64.yml index 2e31cbdb..ae3dce76 100644 --- a/deploy/adapters/ansible/kubernetes/roles/kargo/files/extra-vars-aarch64.yml +++ b/deploy/adapters/ansible/kubernetes/roles/kargo/files/extra-vars-aarch64.yml @@ -14,6 +14,7 @@ dnsmasq_nanny_image_repo: "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-arm64" dnsmasq_sidecar_image_repo: "gcr.io/google_containers/k8s-dns-sidecar-arm64" kubednsautoscaler_image_repo: "gcr.io/google_containers/\ cluster-proportional-autoscaler-arm64" +dashboard_image_repo: "gcr.io/google_containers/kubernetes-dashboard-arm64" # inventory/group_vars/k8s-cluster.yml kube_network_plugin: flannel diff --git a/deploy/adapters/ansible/kubernetes/roles/post-k8s/tasks/main.yml b/deploy/adapters/ansible/kubernetes/roles/post-k8s/tasks/main.yml index 1c691b8e..d382a5e1 100644 --- a/deploy/adapters/ansible/kubernetes/roles/post-k8s/tasks/main.yml +++ b/deploy/adapters/ansible/kubernetes/roles/post-k8s/tasks/main.yml @@ -46,6 +46,15 @@ - heapster.enabled - inventory_hostname == groups['kube_master'][0] +- name: replace the cpu architecture for aarch64 + shell: | + cd "{{ local_release_dir }}/heapster/heapster-{{ heapster.version }}/deploy/"; + find ./kube-config -name "*.yaml" -exec sed -i "s/amd64/arm64/g" {} \; + when: + - heapster.enabled + - inventory_hostname == groups['kube_master'][0] + - ansible_architecture == "aarch64" + - name: install the heapster shell: | cd "{{ local_release_dir }}/heapster/heapster-{{ heapster.version }}/deploy/"; |