v2.1.3

.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
+      branch: release-v2.1
\ No newline at end of file

.helmignore

@@ -8,4 +8,6 @@ ansible/*
 raws/*
 .beagle.yml
 CONTRIBUTING.md
-Deploy.md
+Deploy.md
\ No newline at end of file
+.github/*
+values-operator.yaml
\ No newline at end of file

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