diff --git a/roles/cluster-addon/tasks/main.yml b/roles/cluster-addon/tasks/main.yml index 3321935..65a574f 100644 --- a/roles/cluster-addon/tasks/main.yml +++ b/roles/cluster-addon/tasks/main.yml @@ -124,31 +124,6 @@ - import_tasks: ingress.yml when: '"ingress-controller" not in pod_info.stdout and ingress_install == "yes"' -- block: - - block: - - name: 尝试推送离线 heapster镜像(若执行失败,可忽略) - copy: src={{ base_dir }}/down/{{ heapster_offline }} dest=/opt/kube/images/{{ heapster_offline }} - when: 'heapster_offline in download_info.stdout' - - - name: 获取heapster离线镜像推送情况 - command: "ls /opt/kube/images" - register: image_info - - - name: 导入 heapster的离线镜像(若执行失败,可忽略) - shell: "{{ bin_dir }}/docker load -i /opt/kube/images/{{ heapster_offline }}" - when: 'heapster_offline in image_info.stdout and CONTAINER_RUNTIME == "docker"' - - - name: 导入 heapster的离线镜像(若执行失败,可忽略) - shell: "{{ bin_dir }}/ctr -n=k8s.io images import /opt/kube/images/{{ heapster_offline }}" - when: 'heapster_offline in image_info.stdout and CONTAINER_RUNTIME == "containerd"' - - - name: 创建 heapster部署 - shell: "{{ bin_dir }}/kubectl apply -f {{ base_dir }}/manifests/heapster/heapster.yaml" - delegate_to: "{{ groups.deploy[0] }}" - run_once: true - when: '"heapster" not in pod_info.stdout and heapster_install == "yes"' - ignore_errors: true - - block: - block: - name: 尝试推送离线 metallb镜像(若执行失败,可忽略)