update v1.8

templates/_helpers.tpl

@@ -13,7 +13,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 */}}
 {{- define "harbor.fullname" -}}
 {{- $name := default "harbor" .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s" .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/* Helm required labels */}}
@@ -21,7 +21,6 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 heritage: {{ .Release.Service }}
 release: {{ .Release.Name }}
 chart: {{ .Chart.Name }}
-app: "{{ template "harbor.name" . }}"
 {{- end -}}
 
 {{/* matchLabels */}}

templates/chartmuseum/chartmuseum-pvc.yaml

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

templates/registry/registry-ss.yaml

-{{- $storage := .Values.registry.storage }}
+{{- $storage := .Values.persistence.imageChartStorage }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -60,7 +60,7 @@ spec:
         {{- end }}  
         - name: registry-root-certificate
           mountPath: /etc/registry/root.crt
-          subPath: tokenServiceRootCertBundle
+          subPath: tls.crt
         - name: registry-config
           mountPath: /etc/registry/config.yml
           subPath: config.yml

values-aliyun.yaml

@@ -13,6 +13,19 @@ externalURL: https://hub.wodcloud.local
 
 persistence:
   enabled: false
+  imageChartStorage:
+    type: s3
+    s3:
+      accesskey: AKIAIOSFODNN7EXAMPLE
+      secretkey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
+      region: us-east-1
+      regionendpoint: http://minio.wodcloud.local
+      bucket: registry
+      encrypt: false
+      v4auth: true
+      chunksize: '5242880'
+      rootdirectory: /      
+
 
 imagePullPolicy: IfNotPresent
 
@@ -32,12 +45,6 @@ core:
     tag: v1.8.2
   replicas: 1
 
-adminserver:
-  image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-adminserver
-    tag: v1.8.2
-  replicas: 1  
-
 jobservice:
   image:
     repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice
@@ -57,22 +64,7 @@ registry:
       requests:
         memory: 256Mi
   nodeSelector:
-    harbor: enabled
-  storage:
-    # 存储类型，filesystem-本地文件存储,s3-minio s3存储
-    type: filesystem
-    filesystem:
-      rootdirectory: /data    
-    s3:
-      accesskey: AKIAIOSFODNN7EXAMPLE
-      secretkey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
-      region: us-east-1
-      regionendpoint: http://minio.wodcloud.local
-      bucket: registry
-      encrypt: false
-      v4auth: true
-      chunksize: 5242880
-      rootdirectory: /    
+    harbor: enabled  
   storageSpec:
     # type: emptyDir , hostPath , volumeClaimTemplate
     type: hostPath
@@ -103,7 +95,6 @@ chartmuseum:
   nodeSelector:
     harbor: enabled  
   storageSpec:
-    # type: emptyDir , hostPath
     type: hostPath
     emptyDir: {}
     hostPath:
@@ -115,7 +106,6 @@ clair:
     repository: registry.cn-qingdao.aliyuncs.com/wod/clair-photon
     tag: v2.0.8-v1.8.2
   replicas: 1
-  updatersInterval: 12
 
 notary:
   enabled: true
@@ -145,9 +135,10 @@ database:
     nodeSelector:
       harbor: enabled
     storageSpec:
-      root: /data
-      # 不用hostPath，则注释
-      hostPath: true        
+      type: hostPath
+      emptyDir: {}
+      hostPath:
+        root: /data         
       volumeClaimTemplate:
         spec:
           storageClassName: rook-ceph-block

values.yaml

@@ -33,10 +33,10 @@ expose:
     # set to `ncp` if using the NCP (NSX-T Container Plugin) ingress controller
     controller: default
     annotations:
-      ingress.kubernetes.io/ssl-redirect: "true"
-      ingress.kubernetes.io/proxy-body-size: "0"
-      nginx.ingress.kubernetes.io/ssl-redirect: "true"
-      nginx.ingress.kubernetes.io/proxy-body-size: "0"
+      # ingress.kubernetes.io/ssl-redirect: "true"
+      # ingress.kubernetes.io/proxy-body-size: "0"
+      # nginx.ingress.kubernetes.io/ssl-redirect: "true"
+      # nginx.ingress.kubernetes.io/proxy-body-size: "0"
   clusterIP:
     # The name of ClusterIP service
     name: harbor