From 29823ad361ecb1916c0fe229bef1fd41b33719f8 Mon Sep 17 00:00:00 2001
From: shucheng <shucheng@bd-apaas.com>
Date: Mon, 28 Dec 2020 00:32:00 +0800
Subject: [PATCH] v2.1.1

---
 Deploy.md          |  7 ++++---
 values-aliyun.yaml | 19 ++++++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Deploy.md b/Deploy.md
index 438cc26..075dd49 100644
--- a/Deploy.md
+++ b/Deploy.md
@@ -12,18 +12,19 @@ harbor \
 
 # uninstall
 helm uninstall \
-harbor \
---namespace devops
+--namespace=devops \
+harbor
 
 # update
 helm upgrade harbor /etc/kubernetes/helm/harbor \
+--namespace=devops \
 -f /etc/kubernetes/helm/harbor/values-overrides.yaml
 
 # template
 helm template \
 /etc/kubernetes/helm/harbor \
 --name=harbor \
---namespace=harbor \
+--namespace=devops \
 -f /etc/kubernetes/helm/harbor/values-overrides.yaml > /etc/kubernetes/helm/harbor/dist.yaml
 ```
 
diff --git a/values-aliyun.yaml b/values-aliyun.yaml
index 1aafa2b..e90cfa0 100644
--- a/values-aliyun.yaml
+++ b/values-aliyun.yaml
@@ -102,10 +102,11 @@ registry:
 
 chartmuseum:
   image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon
+    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-chartmuseum
     tag: v2.1.1
-  nodeSelector:
-    harbor: enabled  
+  nodeSelector: {}
+  # nodeSelector:
+  #   harbor: enabled
   storageSpec:
     type: hostPath
     emptyDir: {}
@@ -115,26 +116,26 @@ chartmuseum:
 clair:
   clair:
     image:
-      repository: registry.cn-qingdao.aliyuncs.com/wod/clair-photon
+      repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair
       tag: v2.1.1
   adapter:
     image:
-      repository: registry.cn-qingdao.aliyuncs.com/wod/clair-adapter-photon
+      repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair-adapter
       tag: v2.1.1
 
 trivy:
   image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/trivy-adapter-photon
+    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-trivy-adapter
     tag: v2.1.1
 
 notary:
   server:
     image:
-      repository: registry.cn-qingdao.aliyuncs.com/wod/notary-server-photon
+      repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-server
       tag: v2.1.1
   signer:
     image:
-      repository: registry.cn-qingdao.aliyuncs.com/wod/notary-signer-photon
+      repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-signer
       tag: v2.1.1
 
 database:
@@ -155,4 +156,4 @@ redis:
   internal:
     image:
       repository: registry.cn-qingdao.aliyuncs.com/wod/redis
-      tag: 4.0.14-alpine
\ No newline at end of file
+      tag: 6.0.9
\ No newline at end of file
-- 
2.26.0