update v1.8.2

Deploy.md

@@ -33,24 +33,24 @@ helm template \
 
 ```bash
 # goharbor/harbor-portal
-docker pull goharbor/harbor-portal:v1.7.5 && \
-docker tag goharbor/harbor-portal:v1.7.5 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-portal:v1.7.5 && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-portal:v1.7.5
+docker pull goharbor/harbor-portal:v1.8.2 && \
+docker tag goharbor/harbor-portal:v1.8.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-portal:v1.8.2 && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-portal:v1.8.2
 
 # goharbor/harbor-core
-docker pull goharbor/harbor-core:v1.7.5 && \
-docker tag goharbor/harbor-core:v1.7.5 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-core:v1.7.5 && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-core:v1.7.5
-
-# goharbor/harbor-adminserver
-docker pull goharbor/harbor-adminserver:v1.7.5 && \
-docker tag goharbor/harbor-adminserver:v1.7.5 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver:v1.7.5 && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver:v1.7.5
+docker pull goharbor/harbor-core:v1.8.2 && \
+docker tag goharbor/harbor-core:v1.8.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-core:v1.8.2 && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-core:v1.8.2
 
 # goharbor/harbor-jobservice
-docker pull goharbor/harbor-jobservice:v1.7.5 && \
-docker tag goharbor/harbor-jobservice:v1.7.5 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.7.5 && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.7.5
+docker pull goharbor/harbor-jobservice:v1.8.2 && \
+docker tag goharbor/harbor-jobservice:v1.8.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.8.2 && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.8.2
+
+# goharbor/harbor-db
+docker pull goharbor/harbor-db:v1.8.2 && \
+docker tag goharbor/harbor-db:v1.8.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.8.2 && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.8.2
 
 # registry
 docker pull registry:2.7.1 && \
@@ -58,32 +58,28 @@ docker tag registry:2.7.1 registry-vpc.cn-qingdao.aliyuncs.com/wod/registry:2.7.
 docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/registry:2.7.1
 
 # goharbor/harbor-registryctl
-docker pull goharbor/harbor-registryctl:v1.7.5 && \
-docker tag goharbor/harbor-registryctl:v1.7.5 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-registryctl:v1.7.5 && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-registryctl:v1.7.5
+docker pull goharbor/harbor-registryctl:v1.8.2 && \
+docker tag goharbor/harbor-registryctl:v1.8.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-registryctl:v1.8.2 && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-registryctl:v1.8.2
 
 # goharbor/chartmuseum-photon
-docker pull goharbor/chartmuseum-photon:v0.8.1-v1.7.5 && \
-docker tag goharbor/chartmuseum-photon:v0.8.1-v1.7.5 registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon:v0.8.1-v1.7.5 && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon:v0.8.1-v1.7.5
+docker pull goharbor/chartmuseum-photon:v0.9.0-v1.8.2 && \
+docker tag goharbor/chartmuseum-photon:v0.9.0-v1.8.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon:v0.9.0-v1.8.2 && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon:v0.9.0-v1.8.2
 
 # goharbor/clair-photon
-docker pull goharbor/clair-photon:v2.0.8-v1.7.5 && \
-docker tag goharbor/clair-photon:v2.0.8-v1.7.5 registry-vpc.cn-qingdao.aliyuncs.com/wod/clair-photon:v2.0.8-v1.7.5 && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/clair-photon:v2.0.8-v1.7.5
+docker pull goharbor/clair-photon:v2.0.8-v1.8.2 && \
+docker tag goharbor/clair-photon:v2.0.8-v1.8.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/clair-photon:v2.0.8-v1.8.2 && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/clair-photon:v2.0.8-v1.8.2
 
 # goharbor/notary-server-photon
-docker pull goharbor/notary-server-photon:v0.6.1-v1.7.5 && \
-docker tag goharbor/notary-server-photon:v0.6.1-v1.7.5 registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server-photon:v0.6.1-v1.7.5 && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server-photon:v0.6.1-v1.7.5
+docker pull goharbor/notary-server-photon:v0.6.1-v1.8.2 && \
+docker tag goharbor/notary-server-photon:v0.6.1-v1.8.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server-photon:v0.6.1-v1.8.2 && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-server-photon:v0.6.1-v1.8.2
 
 # goharbor/notary-signer-photon
-docker pull goharbor/notary-signer-photon:v0.6.1-v1.7.5 && \
-docker tag goharbor/notary-signer-photon:v0.6.1-v1.7.5 registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-signer-photon:v0.6.1-v1.7.5 && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-signer-photon:v0.6.1-v1.7.5
+docker pull goharbor/notary-signer-photon:v0.6.1-v1.8.2 && \
+docker tag goharbor/notary-signer-photon:v0.6.1-v1.8.2 registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-signer-photon:v0.6.1-v1.8.2 && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/notary-signer-photon:v0.6.1-v1.8.2
 
-# goharbor/harbor-db
-docker pull goharbor/harbor-db:v1.7.5 && \
-docker tag goharbor/harbor-db:v1.7.5 registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.7.5 && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.7.5
 ```

templates/chartmuseum/chartmuseum-dpl.yaml

@@ -59,35 +59,22 @@ spec:
         ports:
         - containerPort: 9999
         volumeMounts:
-        - name: chartmuseum-data
+        - name: data
           mountPath: /chart_storage
-          subPath: {{ .Values.persistence.persistentVolumeClaim.chartmuseum.subPath }}
         - name: etc-localtime
           mountPath: /etc/localtime
-        {{- if and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs") }}
-        - name: gcs-key
-          mountPath: /etc/chartmuseum/gcs-key.json
-          subPath: gcs-key.json
-        {{- end }}
       volumes:
       - name: etc-localtime
         hostPath:
           path: /etc/localtime      
-      - name: chartmuseum-data
-      {{- if and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "filesystem") }}
-        persistentVolumeClaim:
-          claimName: {{ .Values.persistence.persistentVolumeClaim.chartmuseum.existingClaim | default (include "harbor.chartmuseum" .) }}
-      {{- else }}
+      {{- if eq .Values.chartmuseum.storageSpec.type "hostPath" }}
+      - name: data
+        hostPath:
+          path: {{.Values.chartmuseum.storageSpec.hostPath.root | default "/data" }}/{{ .Release.Namespace }}/{{ .Release.Name }}/chartmuseum
+      {{- else if eq .Values.chartmuseum.storageSpec.type "emptyDir" }}
+      - name: data
         emptyDir: {}
       {{- end }}     
-      {{- if and .Values.persistence.enabled (eq .Values.persistence.imageChartStorage.type "gcs") }}
-      - name: gcs-key
-        secret:
-          secretName: {{ template "harbor.registry" . }}
-          items:
-            - key: GCS_KEY_DATA
-              path: gcs-key.json
-      {{- end }}
       {{- with .Values.chartmuseum.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}

templates/database/database-ss.yaml

@@ -64,20 +64,18 @@ spec:
           mountPath: /etc/localtime 
         - name: data
           mountPath: /var/lib/postgresql/data
-          subPath: {{ $database.subPath }}
       volumes:
       - name: etc-localtime
         hostPath:
           path: /etc/localtime    
-      {{- if not .Values.persistence.enabled }}            
-      - name: "data"
+      {{- if eq .Values.database.internal.storageSpec.type "hostPath" }}
+      - name: data
+        hostPath:
+          path: {{.Values.database.internal.storageSpec.hostPath.root | default "/data" }}/{{ .Release.Namespace }}/{{ .Release.Name }}/database
+      {{- else if eq .Values.database.internal.storageSpec.type "emptyDir" }}
+      - name: data
         emptyDir: {}
-      {{- else if $database.existingClaim }}
-      volumes:
-      - name: "data"
-        persistentVolumeClaim:
-          claimName: {{ $database.existingClaim }}
-      {{- end -}}
+      {{- end }}      
     {{- with .Values.database.internal.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}
@@ -90,23 +88,14 @@ spec:
       tolerations:
 {{ toYaml . | indent 8 }}
     {{- end }}
-  {{- if and .Values.persistence.enabled (not $database.existingClaim) }}
+  {{- if eq .Values.database.internal.storageSpec.type "volumeClaimTemplate" }}
   volumeClaimTemplates:
   - metadata:
       name: "data"
       labels:          
 {{ include "harbor.labels" . | indent 8 }}
+        app: database
     spec:
-      accessModes: [{{ $database.accessMode | quote }}]
-      {{- if $database.storageClass }}
-      {{- if (eq "-" $database.storageClass) }}
-      storageClassName: ""
-      {{- else }}
-      storageClassName: "{{ $database.storageClass }}"
+{{ toYaml $.Values.database.internal.storageSpec.volumeClaimTemplate.spec | indent 6 }}
   {{- end }}
-      {{- end }}
-      resources:
-        requests:
-          storage: {{ $database.size | quote }}
-  {{- end -}}
-  {{- end -}}
+{{- end -}}

templates/jobservice/jobservice-dpl.yaml

@@ -67,20 +67,14 @@ spec:
         - name: jobservice-config
           mountPath: /etc/jobservice/config.yml
           subPath: config.yml
-        - name: job-logs
+        - name: data
           mountPath: /var/log/jobs
-          subPath: {{ .Values.persistence.persistentVolumeClaim.jobservice.subPath }}
       volumes:
       - name: jobservice-config
         configMap:
           name: "{{ template "harbor.jobservice" . }}"
-      - name: job-logs
-        {{- if and .Values.persistence.enabled (eq .Values.jobservice.jobLogger "file") }}
-        persistentVolumeClaim:
-          claimName: {{ .Values.persistence.persistentVolumeClaim.jobservice.existingClaim | default (include "harbor.jobservice" .) }}  
-        {{- else }}
+      - name: data
         emptyDir: {}
-        {{- end }}
     {{- with .Values.jobservice.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}

templates/jobservice/jobservice-pvc.yaml

-{{- $jobservice := .Values.persistence.persistentVolumeClaim.jobservice -}}
-{{- if and .Values.persistence.enabled (not $jobservice.existingClaim) }}
-{{- if eq .Values.jobservice.jobLogger "file" }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "harbor.jobservice" . }}
-  {{- if eq .Values.persistence.resourcePolicy "keep" }}
-  annotations:
-    helm.sh/resource-policy: keep
-  {{- end }}
-  labels:
-{{ include "harbor.labels" . | indent 4 }}
-    app: jobservice
-spec:
-  accessModes: 
-    - {{ $jobservice.accessMode }}
-  resources:
-    requests:
-      storage: {{ $jobservice.size }}
-  {{- if $jobservice.storageClass }}
-    {{- if eq "-" $jobservice.storageClass }}
-  storageClassName: ""
-    {{- else }}
-  storageClassName: {{ $jobservice.storageClass }}
-    {{- end }}
-  {{- end }}
-{{- end }}
-{{- end }}
\ No newline at end of file

templates/redis/statefulset.yaml

@@ -65,23 +65,4 @@ spec:
       tolerations:
 {{ toYaml . | indent 8 }}
     {{- end }}
-  {{- if and .Values.persistence.enabled (not $redis.existingClaim) }}
-  volumeClaimTemplates:
-  - metadata:
-      name: data
-      labels:
-{{ include "harbor.labels" . | indent 8 }}
-    spec:
-      accessModes: [{{ $redis.accessMode | quote }}]
-      {{- if $redis.storageClass }}
-      {{- if (eq "-" $redis.storageClass) }}
-      storageClassName: ""
-      {{- else }}
-      storageClassName: "{{ $redis.storageClass }}"
-      {{- end }}
-      {{- end }}
-      resources:
-        requests:
-          storage: {{ $redis.size | quote }}
-  {{- end -}}
-  {{- end -}}
+{{- end -}}

templates/registry/registry-ss.yaml

@@ -136,14 +136,15 @@ spec:
         configMap:
           name: "{{ template "harbor.registry" . }}"
 {{- if eq $storage.type "filesystem" }}
-      {{- if .Values.registry.storageSpec.hostPath }}
+      {{- if eq .Values.registry.storageSpec.type "hostPath" }}
       - name: data
         hostPath:
           path: {{.Values.registry.storageSpec.hostPath.root | default "/data" }}/{{ .Release.Namespace }}/{{ .Release.Name }}/registry
-      {{- else if .Values.registry.storageSpec.emptyDir }}
+      {{- else if eq .Values.registry.storageSpec.type "emptyDir" }}
       - name: data
         emptyDir: {}
-      {{- else if .Values.registry.storageSpec.volumeClaimTemplate }}
+      {{- end }}      
+  {{- if eq .Values.registry.storageSpec.type "volumeClaimTemplate" }}
   volumeClaimTemplates:
   - metadata:
       name: "data"

values-aliyun.yaml

@@ -23,25 +23,25 @@ secretKey: "IpTIscRIgmerlare"
 portal:
   image:
     repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-portal
-    tag: v1.7.5
+    tag: v1.8.2
   replicas: 1
 
 core:
   image:
     repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core
-    tag: v1.7.5
+    tag: v1.8.2
   replicas: 1
 
 adminserver:
   image:
     repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-adminserver
-    tag: v1.7.5
+    tag: v1.8.2
   replicas: 1  
 
 jobservice:
   image:
     repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice
-    tag: v1.7.5
+    tag: v1.8.2
   replicas: 1
   maxJobWorkers: 10
   jobLogger: file
@@ -74,7 +74,9 @@ registry:
       chunksize: 5242880
       rootdirectory: /    
   storageSpec:
-    # 不用hostPath，则注释
+    # type: emptyDir , hostPath , volumeClaimTemplate
+    type: hostPath
+    emptyDir: {}
     hostPath:
       root: /data
     volumeClaimTemplate:
@@ -89,23 +91,29 @@ registry:
   controller:
     image:
       repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl
-      tag: v1.7.5
+      tag: v1.8.2
   replicas: 1
 
 chartmuseum:
   enabled: true
   image:
     repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon
-    tag: v0.8.1-v1.7.5
+    tag: v0.9.0-v1.8.2
   replicas: 1
   nodeSelector:
     harbor: enabled  
+  storageSpec:
+    # type: emptyDir , hostPath
+    type: hostPath
+    emptyDir: {}
+    hostPath:
+      root: /data    
 
 clair:
   enabled: true
   image:
     repository: registry.cn-qingdao.aliyuncs.com/wod/clair-photon
-    tag: v2.0.8-v1.7.5
+    tag: v2.0.8-v1.8.2
   replicas: 1
   updatersInterval: 12
 
@@ -114,12 +122,12 @@ notary:
   server:
     image:
       repository: registry.cn-qingdao.aliyuncs.com/wod/notary-server-photon
-      tag: v0.6.1-v1.7.5
+      tag: v0.6.1-v1.8.2
     replicas: 1
   signer:
     image:
       repository: registry.cn-qingdao.aliyuncs.com/wod/notary-signer-photon
-      tag: v0.6.1-v1.7.5
+      tag: v0.6.1-v1.8.2
     replicas: 1
 
 database:
@@ -127,7 +135,7 @@ database:
   internal:
     image:
       repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
-      tag: v1.7.5
+      tag: v1.8.2
     password: "spaceIN511"
     resources:
       limits:
@@ -154,4 +162,4 @@ redis:
   internal:
     image:
       repository: registry.cn-qingdao.aliyuncs.com/wod/redis
-      tag: 4.0.11-alpine
+      tag: 4.0.14-alpine
\ No newline at end of file