update

readme.md

@@ -51,11 +51,41 @@ docker tag redis:4.0.1-alpine  registry-vpc.cn-qingdao.aliyuncs.com/wod/redis:4.
 docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/redis:4.0.1-alpine
 ```
 
+## setup
+```bash
+# 1.install
+
+# label node
+kubectl label node <nodename> harbor-registry=enabled
+
+helm install \
+/etc/kubernetes/helm/harbor \
+--name=harbor \
+--namespace=devops \
+-f /etc/kubernetes/helm/harbor/values-overrides.yaml
+
+# uninstall
+helm delete harbor --purge
+
+# update
+helm upgrade harbor /etc/kubernetes/helm/harbor \
+-f /etc/kubernetes/helm/harbor/values-overrides.yaml
+
+# template
+helm template \
+/etc/kubernetes/helm/harbor \
+--name=harbor \
+--namespace=devops \
+-f /etc/kubernetes/helm/harbor/values-overrides.yaml \
+> /etc/kubernetes/helm/harbor/dist.yaml
+```
+
 ## overrides
 ```bash
 cat /etc/kubernetes/helm/harbor/values-overrides.yaml
 ```
 
+### 有持久化存储StorageOS
 ```yaml
 persistence:
   enabled: true
@@ -163,31 +193,97 @@ notary:
       tag: dev
 ```
 
-## setup
-```bash
-# 1.install
+### 使用HostPath存储数据
+在此之前规划一下哪台服务器存储什么内容
+```
+harbor-adminserver: enabled
+harbor-database: enabled
+harbor-registry: enabled
 
-# label node
-kubectl label node <nodename> harbor-registry=enabled
+kubectl label node <nodename> harbor-adminserver=enabled
+```
 
-helm install \
-/etc/kubernetes/helm/harbor \
---name=harbor \
---namespace=devops \
--f /etc/kubernetes/helm/harbor/values-overrides.yaml
 
-# uninstall
-helm delete harbor --purge
+```yaml
+persistence:
+  enabled: false
+externalProtocol: https
+externalDomain: harbor.local
+harborAdminPassword: "passwd"
 
-# update
-helm upgrade harbor /etc/kubernetes/helm/harbor \
--f /etc/kubernetes/helm/harbor/values-overrides.yaml
+ingress:
+  enabled: true
 
-# template
-helm template \
-/etc/kubernetes/helm/harbor \
---name=harbor \
---namespace=devops \
--f /etc/kubernetes/helm/harbor/values-overrides.yaml \
-> /etc/kubernetes/helm/harbor/dist.yaml
+adminserver:
+  image:
+    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-adminserver
+    tag: v1.6.0
+  nodeSelector:
+    harbor-adminserver: enabled
+
+jobservice:
+  image:
+    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice
+    tag: v1.6.0
+
+ui:
+  image:
+    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-ui
+    tag: v1.6.0
+
+busybox:
+  image:
+    repository: registry.cn-qingdao.aliyuncs.com/wod/busybox
+    tag: 1.29
+
+database:
+  internal:
+    image:
+      repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
+      tag: v1.6.0
+    password: "spaceIN511"
+    nodeSelector:
+      harbor-database: enabled
+
+registry:
+  image:
+    repository: registry.cn-qingdao.aliyuncs.com/wod/registry
+    tag: 2.6.2
+  hostpath: /etc/kubernetes/data/registry
+  nodeSelector:
+    harbor-registry: enabled
+
+chartmuseum:
+  enabled: true
+  image:
+    repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum
+    tag: v0.7.1
+
+clair:
+  enabled: true
+  image:
+    repository: registry.cn-qingdao.aliyuncs.com/wod/clair
+    tag: v2.0.6
+
+redis:
+  image:
+    repository: registry.cn-qingdao.aliyuncs.com/wod/redis
+    tag: 4.0.1-alpine
+  usePassword: false
+  cluster:
+    enabled: false
+  master:
+    persistence:
+      enabled: false
+
+notary:
+  enabled: true
+  server:
+    image:
+      repository: registry.cn-qingdao.aliyuncs.com/wod/notary-server-photon
+      tag: dev
+  signer:
+    image:
+      repository: registry.cn-qingdao.aliyuncs.com/wod/notary-signer-photon
+      tag: dev
 ```
\ No newline at end of file

templates/adminserver/adminserver-ss.yaml

@@ -49,7 +49,8 @@ spec:
       volumes:
       {{- if not .Values.persistence.enabled }}
       - name: data
-        emptyDir: {}
+        hostPath:
+          path: /data/{{ .Release.Namespace }}/{{ .Release.Name }}/adminserver
       {{- end }}
       - name: adminserver-key
         secret:

templates/database/database-ss.yaml

@@ -42,8 +42,9 @@ spec:
           mountPath: /var/lib/postgresql/data
       {{- if not .Values.persistence.enabled }}
       volumes:
-      - name: "data"
-        emptyDir: {}
+      - name: data
+        hostPath:
+          path: /data/{{ .Release.Namespace }}/{{ .Release.Name }}/database
       {{- end -}}
     {{- with .Values.database.internal.nodeSelector }}
       nodeSelector:

templates/registry/registry-ss.yaml

@@ -106,7 +106,7 @@ spec:
           name: "{{ template "harbor.fullname" . }}-registry"
       - name: registry-data
         hostPath:
-          path: /etc/kubernetes/data/registry          
+          path: {{ .Values.registry.hostpath }}
     {{- with .Values.registry.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}

values.yaml

@@ -142,6 +142,7 @@ registry:
     pullPolicy: IfNotPresent
   httpSecret: "BBRQwySksiHZqJUh"
   logLevel: info
+  hostpath: /etc/kubernetes/data/registry
   storage:
     # specify the type of storage: "filesystem", "azure", "gcs", "s3", "swift", 
     # "oss" and fill the information needed in the corresponding section
@@ -214,8 +215,8 @@ registry:
   #  requests:
   #    memory: 256Mi
   #    cpu: 100m
-  nodeSelector: 
-    kubernetes.io/hostname: 172.31.14.41
+  # nodeSelector: 
+  #   kubernetes.io/hostname: 172.31.14.41
   tolerations: []
   affinity: {}