From 20b8f0fa76fd43b74dfd64a53226bad75199643e Mon Sep 17 00:00:00 2001
From: shucheng <shucheng@bd-apaas.com>
Date: Sun, 6 Jun 2021 11:01:38 +0800
Subject: [PATCH] v2.1.3

---
 .beagle.yml | 29 +++++++++++------------------
 .helmignore |  4 +++-
 Deploy.md   |  4 +++-
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/.beagle.yml b/.beagle.yml
index 7e00a9f..58893a6 100644
--- a/.beagle.yml
+++ b/.beagle.yml
@@ -3,32 +3,28 @@ platform: 10.11.92.34
 clone:
   git:
     image: registry.cn-qingdao.aliyuncs.com/wod/devops-git:1.0
-    dns: 
+    dns:
       - 223.5.5.5
 
 pipeline:
-
   charts:
-    image: registry.cn-qingdao.aliyuncs.com/wod/alpine:3.12
+    image: registry.cn-qingdao.aliyuncs.com/wod/helm:v3.6.0
     pull: true
-    dns: 
+    dns:
       - 223.5.5.5
     volumes:
       - /data/downloads/k8s/charts/:/charts
     environment:
       - TGZ_TARGET=harbor-v2.1.3.tgz
     commands:
-      - rm -rf .git
-      - tar -zcvf $TGZ_TARGET .
-      - mv $TGZ_TARGET /charts/$TGZ_TARGET
+      - helm package . -d /charts/
     when:
-      branch: 
-        release-v2.1
+      branch: release-v2.1
 
   ansible-amd64:
     image: registry.cn-qingdao.aliyuncs.com/wod/ansible-kubernetes-image:v1.20.2
     pull: true
-    dns: 
+    dns:
       - 223.5.5.5
     commands:
       - cp -r ./ansible/main.yaml /etc/ansible/linux/main.yaml
@@ -42,13 +38,12 @@ pipeline:
         }'
         --extra-vars "@images.yaml"
     when:
-      branch: 
-        release-v2.1
+      branch: release-v2.1
 
   ansible-arm64:
     image: registry.cn-qingdao.aliyuncs.com/wod/ansible-kubernetes-image:v1.20.2
     pull: true
-    dns: 
+    dns:
       - 223.5.5.5
     commands:
       - cp -r ./ansible/main.yaml /etc/ansible/linux/main.yaml
@@ -62,13 +57,12 @@ pipeline:
         }'
         --extra-vars "@images.yaml"
     when:
-      branch: 
-        release-v2.1
+      branch: release-v2.1
 
   ansible-ppc64le:
     image: registry.cn-qingdao.aliyuncs.com/wod/ansible-kubernetes-image:v1.20.2
     pull: true
-    dns: 
+    dns:
       - 223.5.5.5
     commands:
       - cp -r ./ansible/main.yaml /etc/ansible/linux/main.yaml
@@ -82,5 +76,4 @@ pipeline:
         }'
         --extra-vars "@images.yaml"
     when:
-      branch: 
-        release-v2.1
\ No newline at end of file
+      branch: release-v2.1
diff --git a/.helmignore b/.helmignore
index 9ccbabd..13822e8 100644
--- a/.helmignore
+++ b/.helmignore
@@ -8,4 +8,6 @@ ansible/*
 raws/*
 .beagle.yml
 CONTRIBUTING.md
-Deploy.md
\ No newline at end of file
+Deploy.md
+.github/*
+values-operator.yaml
\ No newline at end of file
diff --git a/Deploy.md b/Deploy.md
index e074361..d2f1b67 100644
--- a/Deploy.md
+++ b/Deploy.md
@@ -30,6 +30,9 @@ helm template \
 harbor \
 /etc/kubernetes/helm/beagle-harbor \
 -f /etc/kubernetes/helm/beagle-harbor/values-overrides.yaml > /etc/kubernetes/helm/beagle-harbor/dist.yaml
+
+# package
+helm package . -d C:/Tmp/Charts
 ```
 
 ## images x86_64
@@ -67,7 +70,6 @@ registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-signer:v2.1.3
 registry.cn-qingdao.aliyuncs.com/wod/redis:6.0.9
 ```
 
-
 ## images arm64
 
 ```bash
-- 
2.26.0