When cilium installs hubble, install Hubble CLI

Signed-off-by: dcwbq <biqiang.wu@daocloud.io>
This commit is contained in:
dcwbq 2022-10-28 20:24:04 +08:00
parent 2af918132e
commit 3393af0871
2 changed files with 34 additions and 0 deletions

View file

@ -118,6 +118,7 @@ pod_infra_version: "3.7"
cilium_version: "v1.12.1" cilium_version: "v1.12.1"
cilium_enable_hubble: false cilium_enable_hubble: false
cilium_hubble_cli_version: "v0.10.0"
kube_ovn_version: "v1.9.7" kube_ovn_version: "v1.9.7"
kube_ovn_dpdk_version: "19.11-{{ kube_ovn_version }}" kube_ovn_dpdk_version: "19.11-{{ kube_ovn_version }}"
@ -158,6 +159,7 @@ cni_download_url: "https://github.com/containernetworking/plugins/releases/downl
calicoctl_download_url: "https://github.com/projectcalico/calico/releases/download/{{ calico_ctl_version }}/calicoctl-linux-{{ image_arch }}" calicoctl_download_url: "https://github.com/projectcalico/calico/releases/download/{{ calico_ctl_version }}/calicoctl-linux-{{ image_arch }}"
calicoctl_alternate_download_url: "https://github.com/projectcalico/calicoctl/releases/download/{{ calico_ctl_version }}/calicoctl-linux-{{ image_arch }}" calicoctl_alternate_download_url: "https://github.com/projectcalico/calicoctl/releases/download/{{ calico_ctl_version }}/calicoctl-linux-{{ image_arch }}"
calico_crds_download_url: "https://github.com/projectcalico/calico/archive/{{ calico_version }}.tar.gz" calico_crds_download_url: "https://github.com/projectcalico/calico/archive/{{ calico_version }}.tar.gz"
cilium_hubblecli_download_url: "https://github.com/cilium/hubble/releases/download/{{ cilium_hubble_cli_version }}/hubble-linux-{{ image_arch }}.tar.gz"
crictl_download_url: "https://github.com/kubernetes-sigs/cri-tools/releases/download/{{ crictl_version }}/crictl-{{ crictl_version }}-{{ ansible_system | lower }}-{{ image_arch }}.tar.gz" crictl_download_url: "https://github.com/kubernetes-sigs/cri-tools/releases/download/{{ crictl_version }}/crictl-{{ crictl_version }}-{{ ansible_system | lower }}-{{ image_arch }}.tar.gz"
crio_download_url: "https://storage.googleapis.com/cri-o/artifacts/cri-o.{{ image_arch }}.{{ crio_version }}.tar.gz" crio_download_url: "https://storage.googleapis.com/cri-o/artifacts/cri-o.{{ image_arch }}.{{ crio_version }}.tar.gz"
helm_download_url: "https://get.helm.sh/helm-{{ helm_version }}-linux-{{ image_arch }}.tar.gz" helm_download_url: "https://get.helm.sh/helm-{{ helm_version }}-linux-{{ image_arch }}.tar.gz"
@ -574,6 +576,16 @@ cni_binary_checksums:
v1.0.1: f078e33067e6daaef3a3a5010d6440f2464b7973dec3ca0b5d5be22fdcb1fd96 v1.0.1: f078e33067e6daaef3a3a5010d6440f2464b7973dec3ca0b5d5be22fdcb1fd96
v1.1.1: 1551259fbfe861d942846bee028d5a85f492393e04bcd6609ac8aaa7a3d71431 v1.1.1: 1551259fbfe861d942846bee028d5a85f492393e04bcd6609ac8aaa7a3d71431
cilium_hubblecli_binary_checksums:
arm:
v0.10.0: b7507d5caa41dbbd17e9e663cdeb01c9e3f8a443bfbcedb77256d901a6504653
amd64:
v0.10.0: b421b7cfb8a616d8206fcf725a21a0e168b47e7009a74f4070d7e7cced8ccfad
arm64:
v0.10.0: dd7dd0dab8c2234517a4f3b3ad1c65d1675f24dfafc6520b513fd088388a284c
ppc64le:
v0.10.0: 0
calicoctl_binary_checksums: calicoctl_binary_checksums:
arm: arm:
v3.23.3: 0 v3.23.3: 0
@ -858,6 +870,7 @@ kubectl_binary_checksum: "{{ kubectl_checksums[image_arch][kube_version] }}"
kubeadm_binary_checksum: "{{ kubeadm_checksums[image_arch][kubeadm_version] }}" kubeadm_binary_checksum: "{{ kubeadm_checksums[image_arch][kubeadm_version] }}"
calicoctl_binary_checksum: "{{ calicoctl_binary_checksums[image_arch][calico_ctl_version] }}" calicoctl_binary_checksum: "{{ calicoctl_binary_checksums[image_arch][calico_ctl_version] }}"
calico_crds_archive_checksum: "{{ calico_crds_archive_checksums[calico_version] }}" calico_crds_archive_checksum: "{{ calico_crds_archive_checksums[calico_version] }}"
cilium_hubblecli_binary_checksum: "{{ cilium_hubblecli_binary_checksums[image_arch][cilium_hubble_cli_version] }}"
crictl_binary_checksum: "{{ crictl_checksums[image_arch][crictl_version] }}" crictl_binary_checksum: "{{ crictl_checksums[image_arch][crictl_version] }}"
crio_archive_checksum: "{{ crio_archive_checksums[image_arch][crio_version] }}" crio_archive_checksum: "{{ crio_archive_checksums[image_arch][crio_version] }}"
cri_dockerd_archive_checksum: "{{ cri_dockerd_archive_checksums[image_arch][cri_dockerd_version] }}" cri_dockerd_archive_checksum: "{{ cri_dockerd_archive_checksums[image_arch][cri_dockerd_version] }}"
@ -1362,6 +1375,19 @@ downloads:
groups: groups:
- k8s_cluster - k8s_cluster
cilium_hubblecli:
enabled: "{{ cilium_enable_hubble }}"
file: true
version: "{{ cilium_hubble_cli_version }}"
dest: "{{ local_release_dir }}/hubble"
sha256: "{{ cilium_hubblecli_binary_checksum }}"
url: "{{ cilium_hubblecli_download_url }}"
unarchive: true
owner: "root"
mode: "0755"
groups:
- k8s_cluster
cilium_hubble_envoy: cilium_hubble_envoy:
enabled: "{{ cilium_enable_hubble }}" enabled: "{{ cilium_enable_hubble }}"
container: true container: true

View file

@ -88,3 +88,11 @@
dest: /etc/cni/net.d/000-cilium-portmap.conflist dest: /etc/cni/net.d/000-cilium-portmap.conflist
mode: 0644 mode: 0644
when: cilium_enable_portmap when: cilium_enable_portmap
- name: Cilium | Copy Hubblecli binary from download dir
copy:
src: "{{ local_release_dir }}/hubble"
dest: "{{ bin_dir }}/hubble"
mode: 0755
remote_src: yes
when: cilium_hubble_install