update harbor v2.8.4 and fix harbor setup

example/config.yml

@@ -227,4 +227,3 @@ HARBOR_SELF_SIGNED_CERT: true
 # install extra component
 HARBOR_WITH_NOTARY: false
 HARBOR_WITH_TRIVY: false
-HARBOR_WITH_CHARTMUSEUM: true

ezdown

@@ -20,7 +20,7 @@ K8S_BIN_VER=v1.28.1
 EXT_BIN_VER=1.8.0
 # https://github.com/easzlab/dockerfile-kubeasz-sys-pkg
 SYS_PKG_VER=1.0.0
-HARBOR_VER=v2.6.4
+HARBOR_VER=v2.8.4
 REGISTRY_MIRROR=CN
 
 # images downloaded by default(with 'ezdown -D')
@@ -153,8 +153,8 @@ function download_docker() {
   fi
 
   tar zxf "$BASE/down/docker-$DOCKER_VER.tgz" -C "$BASE/down" && \
-  mkdir -p "$BASE/docker-bin" && \
-  cp -f "$BASE"/down/docker/* "$BASE/docker-bin" && \
+  mkdir -p "$BASE/bin/docker-bin" && \
+  cp -f "$BASE"/down/docker/* "$BASE/bin/docker-bin" && \
   mv -f "$BASE"/down/docker/* /opt/kube/bin && \
   ln -sf /opt/kube/bin/docker /bin/docker 
 }

playbooks/11.harbor.yml

@@ -9,16 +9,8 @@
   - { role: prepare, when: "NEW_INSTALL|bool" }
   - { role: docker, when: "NEW_INSTALL|bool" }
   - { role: harbor, when: "NEW_INSTALL|bool" }
-  tasks:
-  - name: Fetching the HARBOR SERVER's CA cert
-    fetch:
-      src: "{{ ca_dir }}/ca.pem"
-      dest: "{{ base_dir }}/down/"
-      flat: yes
-    when: 'HARBOR_SELF_SIGNED_CERT|bool' 
-    #when: hostvars[groups.harbor[0]]['SELF_SIGNED_CERT']|bool
 
-### --- config k8s nodes to use with harbor ---
+### --- config k8s nodes to work with harbor ---
 - hosts: 
   - kube_master
   - kube_node

roles/docker/tasks/main.yml

@@ -2,6 +2,26 @@
   shell: 'systemctl is-active docker || echo "NoFound"'
   register: docker_svc
 
+- name: 获取docker版本信息
+  shell: "{{ base_dir }}/bin/docker-bin/dockerd --version|cut -d' ' -f3"
+  register: docker_ver
+  connection: local
+  run_once: true
+  tags: upgrade_docker, download_docker
+
+- name: debug info
+  debug: var="docker_ver"
+  connection: local
+  run_once: true
+  tags: upgrade_docker, download_docker
+
+- name: 转换docker版本信息为浮点数
+  set_fact:
+    DOCKER_VER: "{{ docker_ver.stdout.split('.')[0]|int + docker_ver.stdout.split('.')[1]|int/100 }}"
+  connection: local
+  run_once: true
+  tags: upgrade_docker, download_docker
+
 - name: 已安装提示
   debug:
     msg: "docker 服务已安装"

roles/docker/templates/daemon.json.j2

@@ -10,7 +10,7 @@
 {% if DOCKER_ENABLE_REMOTE_API %}
   "hosts": ["tcp://0.0.0.0:2376", "unix:///var/run/docker.sock"],
 {% endif %}
-  "insecure-registries": {{ INSECURE_REG }},
+  "insecure-registries": [{{ INSECURE_REG_STRING }}],
   "max-concurrent-downloads": 10,
   "live-restore": true,
   "log-driver": "json-file",

roles/docker/vars/main.yml

@@ -4,3 +4,7 @@ CGROUP_DRIVER: "{%- if DOCKER_VER|float >= 20.10 -%} \
                 {%- else -%} \
                      cgroupfs \
                 {%- endif -%}"
+
+#
+INSECURE_REG_STR: "{% for reg in INSECURE_REG %}\"{{ reg }}\",{% endfor %}"
+INSECURE_REG_STRING: "{{ INSECURE_REG_STR.rstrip(',') }}"

roles/harbor/tasks/main.yml

@@ -67,13 +67,6 @@
   - name: 准备 harbor 配置文件
     template: src=harbor-{{ HARBOR_VER_MAIN }}.yml.j2 dest={{ HARBOR_PATH }}/harbor/harbor.yml
 
-    #- name: 配置 harbor.yml 文件
-    #template: src=harbor-{{ HARBOR_VER_MAIN }}.yml.j2 dest={{ HARBOR_PATH }}/harbor/harbor.yml
-    #when: HARBOR_VER_MAIN in ["v1.8", "v1.9", "v1.10"]
-
-  - set_fact: HARBOR_INST_OPS="{{ HARBOR_INST_OPS }} --with-chartmuseum"
-    when: "HARBOR_WITH_CHARTMUSEUM|bool"
-
   - set_fact: HARBOR_INST_OPS="{{ HARBOR_INST_OPS }} --with-notary" 
     when: "HARBOR_WITH_NOTARY|bool"