From 4a4f7f8ff57e395f0160b41bffcb4b9e7b542aaa Mon Sep 17 00:00:00 2001
From: shucheng <shucheng@bd-apaas.com>
Date: Sun, 6 Jun 2021 12:06:06 +0800
Subject: [PATCH] v2.1.3

---
 .beagle.yml       | 30 +++++++++++++++---------------
 .helmignore       |  1 -
 ansible/main.yaml | 10 ----------
 3 files changed, 15 insertions(+), 26 deletions(-)
 delete mode 100644 ansible/main.yaml

diff --git a/.beagle.yml b/.beagle.yml
index e744dc5..c0703d6 100644
--- a/.beagle.yml
+++ b/.beagle.yml
@@ -20,57 +20,57 @@ pipeline:
       branch: release-v2.1
 
   ansible-amd64:
-    image: registry.cn-qingdao.aliyuncs.com/wod/ansible-kubernetes-image:v1.20.2
+    image: registry.cn-qingdao.aliyuncs.com/wod/ansible-kubernetes-image:v1.20.6
     pull: true
     dns:
       - 223.5.5.5
     commands:
-      - cp -r ./ansible/main.yaml /etc/ansible/linux/main.yaml
-      - cd ansible
       - >-
         ansible-playbook /etc/ansible/linux/main.yaml
         --extra-vars
         '{
-        "TARGET_ARCH":"amd64",
-        "TARGET_VERSION":"v2.1.3"
+          "REGISTRY_DATA_PATH": "/data/downloads/k8s/ansible/{{ TARGET_ARCH }}",
+          "REGISTRY_DATA_FILE": "images-harbor-{{ TARGET_VERSION }}.tar.gz",
+          "TARGET_ARCH":"amd64",
+          "TARGET_VERSION":"v2.1.3"
         }'
         --extra-vars "@images.yaml"
     when:
       branch: release-v2.1
 
   ansible-arm64:
-    image: registry.cn-qingdao.aliyuncs.com/wod/ansible-kubernetes-image:v1.20.2
+    image: registry.cn-qingdao.aliyuncs.com/wod/ansible-kubernetes-image:v1.20.6
     pull: true
     dns:
       - 223.5.5.5
     commands:
-      - cp -r ./ansible/main.yaml /etc/ansible/linux/main.yaml
-      - cd ansible
       - >-
         ansible-playbook /etc/ansible/linux/main.yaml
         --extra-vars
         '{
-        "TARGET_ARCH":"arm64",
-        "TARGET_VERSION":"v2.1.3"
+          "REGISTRY_DATA_PATH": "/data/downloads/k8s/ansible/{{ TARGET_ARCH }}",
+          "REGISTRY_DATA_FILE": "images-harbor-{{ TARGET_VERSION }}.tar.gz",
+          "TARGET_ARCH":"arm64",
+          "TARGET_VERSION":"v2.1.3"
         }'
         --extra-vars "@images.yaml"
     when:
       branch: release-v2.1
 
   ansible-ppc64le:
-    image: registry.cn-qingdao.aliyuncs.com/wod/ansible-kubernetes-image:v1.20.2
+    image: registry.cn-qingdao.aliyuncs.com/wod/ansible-kubernetes-image:v1.20.6
     pull: true
     dns:
       - 223.5.5.5
     commands:
-      - cp -r ./ansible/main.yaml /etc/ansible/linux/main.yaml
-      - cd ansible
       - >-
         ansible-playbook /etc/ansible/linux/main.yaml
         --extra-vars
         '{
-        "TARGET_ARCH":"ppc64le",
-        "TARGET_VERSION":"v2.1.3"
+          "REGISTRY_DATA_PATH": "/data/downloads/k8s/ansible/{{ TARGET_ARCH }}",
+          "REGISTRY_DATA_FILE": "images-harbor-{{ TARGET_VERSION }}.tar.gz",
+          "TARGET_ARCH":"ppc64le",
+          "TARGET_VERSION":"v2.1.3"
         }'
         --extra-vars "@images.yaml"
     when:
diff --git a/.helmignore b/.helmignore
index 13822e8..a59815e 100644
--- a/.helmignore
+++ b/.helmignore
@@ -4,7 +4,6 @@ docs/*
 CONTRIBUTING.md
 .travis.yaml
 test/*
-ansible/*
 raws/*
 .beagle.yml
 CONTRIBUTING.md
diff --git a/ansible/main.yaml b/ansible/main.yaml
deleted file mode 100644
index 301c0aa..0000000
--- a/ansible/main.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-- hosts: all
-  gather_facts: False
-  vars:
-    REGISTRY_DATA_PATH: '/data/downloads/k8s/registry/{{ TARGET_ARCH }}'
-    REGISTRY_DATA_FILE: "images-harbor-{{ TARGET_VERSION }}.tar.gz"
-  roles:
-  - role: wod.registry
-  - role: wod.registry-cache
-    CACHE_IMAGES: '{{ IMAGES }}'
-  - role: wod.tgz
\ No newline at end of file
-- 
2.26.0