From 1850c4cbbe440a7ef482bdd1bb4750825408c132 Mon Sep 17 00:00:00 2001
From: shucheng <shucheng@bd-apaas.com>
Date: Sun, 18 Apr 2021 11:44:08 +0800
Subject: [PATCH] v2.1.3

---
 .beagle.yml                          |  8 ++++----
 Deploy.md                            | 12 ++++++------
 ansible/images.yaml                  | 22 +++++++++++-----------
 templates/registry/registry-dpl.yaml | 16 ++++++++++------
 4 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/.beagle.yml b/.beagle.yml
index b207cf6..7e00a9f 100644
--- a/.beagle.yml
+++ b/.beagle.yml
@@ -16,7 +16,7 @@ pipeline:
     volumes:
       - /data/downloads/k8s/charts/:/charts
     environment:
-      - TGZ_TARGET=harbor-v2.1.1.tgz
+      - TGZ_TARGET=harbor-v2.1.3.tgz
     commands:
       - rm -rf .git
       - tar -zcvf $TGZ_TARGET .
@@ -38,7 +38,7 @@ pipeline:
         --extra-vars
         '{
         "TARGET_ARCH":"amd64",
-        "TARGET_VERSION":"v2.1.1"
+        "TARGET_VERSION":"v2.1.3"
         }'
         --extra-vars "@images.yaml"
     when:
@@ -58,7 +58,7 @@ pipeline:
         --extra-vars
         '{
         "TARGET_ARCH":"arm64",
-        "TARGET_VERSION":"v2.1.1"
+        "TARGET_VERSION":"v2.1.3"
         }'
         --extra-vars "@images.yaml"
     when:
@@ -78,7 +78,7 @@ pipeline:
         --extra-vars
         '{
         "TARGET_ARCH":"ppc64le",
-        "TARGET_VERSION":"v2.1.1"
+        "TARGET_VERSION":"v2.1.3"
         }'
         --extra-vars "@images.yaml"
     when:
diff --git a/Deploy.md b/Deploy.md
index ab06503..c712323 100644
--- a/Deploy.md
+++ b/Deploy.md
@@ -9,8 +9,8 @@ kubectl create ns devops
 helm install \
 --namespace=devops \
 harbor \
-/etc/kubernetes/helm/harbor \
--f /etc/kubernetes/helm/harbor/values-overrides.yaml
+/etc/kubernetes/helm/beagle-harbor \
+-f /etc/kubernetes/helm/beagle-harbor/values-overrides.yaml
 
 # uninstall
 helm uninstall \
@@ -21,15 +21,15 @@ harbor
 helm upgrade \
 --namespace=devops \
 harbor \
-/etc/kubernetes/helm/harbor \
--f /etc/kubernetes/helm/harbor/values-overrides.yaml
+/etc/kubernetes/helm/beagle-harbor \
+-f /etc/kubernetes/helm/beagle-harbor/values-overrides.yaml
 
 # template
 helm template \
 --namespace=devops \
 harbor \
-/etc/kubernetes/helm/harbor \
--f /etc/kubernetes/helm/harbor/values-overrides.yaml > /etc/kubernetes/helm/harbor/dist.yaml
+/etc/kubernetes/helm/beagle-harbor \
+-f /etc/kubernetes/helm/beagle-harbor/values-overrides.yaml > /etc/kubernetes/helm/beagle-harbor/dist.yaml
 ```
 
 ## images x86_64
diff --git a/ansible/images.yaml b/ansible/images.yaml
index db0f634..d88bf93 100644
--- a/ansible/images.yaml
+++ b/ansible/images.yaml
@@ -1,26 +1,26 @@
 IMAGES:
   - repo: harbor-portal
-    tag: "v2.1.1"
+    tag: "v2.1.3"
   - repo: harbor-core
-    tag: "v2.1.1"
+    tag: "v2.1.3"
   - repo: harbor-jobservice
-    tag: "v2.1.1"
+    tag: "v2.1.3"
   - repo: harbor-db
-    tag: "v2.1.1"
+    tag: "v2.1.3"
   - repo: harbor-registryctl
-    tag: "v2.1.1"
+    tag: "v2.1.3"
   - repo: harbor-chartmuseum
-    tag: "v2.1.1"
+    tag: "v2.1.3"
   - repo: harbor-clair
-    tag: "v2.1.1"
+    tag: "v2.1.3"
   - repo: harbor-clair-adapter
-    tag: "v2.1.1"
+    tag: "v2.1.3"
   - repo: harbor-trivy-adapter
-    tag: "v2.1.1"
+    tag: "v2.1.3"
   - repo: harbor-notary-server
-    tag: "v2.1.1"
+    tag: "v2.1.3"
   - repo: harbor-notary-signer
-    tag: "v2.1.1"
+    tag: "v2.1.3"
   - repo: registry
     tag: "2.7.1"
   - repo: redis
diff --git a/templates/registry/registry-dpl.yaml b/templates/registry/registry-dpl.yaml
index cf98138..2313e92 100644
--- a/templates/registry/registry-dpl.yaml
+++ b/templates/registry/registry-dpl.yaml
@@ -46,12 +46,12 @@ spec:
       {{- end }}
       containers:
       - name: registry
-{{- if contains "/" .Values.registry.image.repository }}
-        image: "{{ .Values.registry.image.repository }}"
+{{- if contains "/" .Values.registry.registry.image.repository }}
+        image: "{{ .Values.registry.registry.image.repository }}"
 {{- else }}
-        image: "{{ .Values.registry.image.hub | default .Values.global.hub }}/{{ .Values.registry.image.repository }}:{{ .Values.registry.image.tag | default .Values.global.tag }}{{ template "beagle.arch" . }}"
+        image: "{{ .Values.registry.registry.image.hub | default .Values.global.hub }}/{{ .Values.registry.registry.image.repository }}:{{ .Values.registry.registry.image.tag | default .Values.global.tag }}{{ template "beagle.arch" . }}"
 {{- end }}
-        imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}"
+        imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"
         livenessProbe:
           httpGet:
             path: /
@@ -134,8 +134,12 @@ spec:
 {{ include "harbor.caBundleVolumeMount" . | indent 8 }}
         {{- end }}
       - name: registryctl
-        image: {{ .Values.registry.controller.image.repository }}:{{ .Values.registry.controller.image.tag }}
-        imagePullPolicy: {{ .Values.imagePullPolicy }}
+{{- if contains "/" .Values.registry.controller.image.repository }}
+        image: "{{ .Values.registry.controller.image.repository }}"
+{{- else }}
+        image: "{{ .Values.registry.controller.image.hub | default .Values.global.hub }}/{{ .Values.registry.controller.image.repository }}:{{ .Values.registry.controller.image.tag | default .Values.global.tag }}{{ template "beagle.arch" . }}"
+{{- end }}
+        imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"
         livenessProbe:
           httpGet:
             path: /api/health
-- 
2.26.0