update

readme.md

@@ -47,24 +47,24 @@ kubectl label node <nodename> harbor=enabled
 
 ```bash
 # harbor-ui
-docker pull goharbor/harbor-ui:v1.6.0 && \
-docker tag goharbor/harbor-ui:v1.6.0  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-ui:v1.6.0  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-ui:v1.6.0 
+docker pull goharbor/harbor-ui:v1.6.3 && \
+docker tag goharbor/harbor-ui:v1.6.3  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-ui:v1.6.3  && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-ui:v1.6.3 
 
 # harbor-adminserver
-docker pull goharbor/harbor-adminserver:v1.6.0 && \
-docker tag goharbor/harbor-adminserver:v1.6.0  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver:v1.6.0  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver:v1.6.0 
+docker pull goharbor/harbor-adminserver:v1.6.3 && \
+docker tag goharbor/harbor-adminserver:v1.6.3  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver:v1.6.3  && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-adminserver:v1.6.3 
 
 # harbor-jobservice
-docker pull goharbor/harbor-jobservice:v1.6.0 && \
-docker tag goharbor/harbor-jobservice:v1.6.0  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.6.0  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.6.0 
+docker pull goharbor/harbor-jobservice:v1.6.3 && \
+docker tag goharbor/harbor-jobservice:v1.6.3  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.6.3  && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v1.6.3 
 
 # harbor-db
-docker pull goharbor/harbor-db:v1.6.0 && \
-docker tag goharbor/harbor-db:v1.6.0  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.6.0  && \
-docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.6.0 
+docker pull goharbor/harbor-db:v1.6.3 && \
+docker tag goharbor/harbor-db:v1.6.3  registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.6.3  && \
+docker push registry-vpc.cn-qingdao.aliyuncs.com/wod/harbor-db:v1.6.3 
 
 # chartmuseum
 docker pull chartmuseum/chartmuseum:v0.7.1 && \

templates/adminserver/statefulset.yaml

-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: "{{ template "harbor.fullname" . }}-adminserver"

templates/chartmuseum/statefulset.yaml

 {{- if .Values.chartmuseum.enabled }}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: "{{ template "harbor.fullname" . }}-chartmuseum"

templates/clair/deployment.yaml

 {{ if .Values.clair.enabled }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "harbor.fullname" . }}-clair
@@ -9,6 +9,10 @@ metadata:
     version: {{ .Values.clair.image.tag }}
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+{{ include "harbor.labels" . | indent 6 }}
+      app: harbor-clair
   template:
     metadata:
       labels:

templates/database/statefulset.yaml

 {{- if eq .Values.database.type "internal" -}}
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: "{{ template "harbor.fullname" . }}-database"

templates/jobservice/deployment.yaml

-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: "{{ template "harbor.fullname" . }}-jobservice"
@@ -8,6 +8,10 @@ metadata:
     version: {{ .Values.jobservice.image.tag }}
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+{{ include "harbor.labels" . | indent 6 }}
+      app: harbor-jobservice  
   template:
     metadata:
       labels:

templates/notary/notary-server.yaml

 {{ if .Values.notary.enabled }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "harbor.fullname" . }}-notary-server
@@ -9,6 +9,10 @@ metadata:
     version: {{ .Values.notary.server.image.tag }}
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+{{ include "harbor.labels" . | indent 6 }}
+      app: harbor-notary-server
   template:
     metadata:
       labels:

templates/notary/notary-signer.yaml

 {{ if .Values.notary.enabled }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "harbor.fullname" . }}-notary-signer
@@ -9,6 +9,10 @@ metadata:
     version: {{ .Values.notary.signer.image.tag }}
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+{{ include "harbor.labels" . | indent 6 }}
+      app: harbor-notary-signer
   template:
     metadata:
       labels:

templates/redis/deployment.yml

 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "harbor.fullname" . }}-redis
@@ -9,6 +9,10 @@ metadata:
     version: {{ .Values.redis.image.tag }}
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+{{ include "harbor.labels" . | indent 6 }}
+      app: harbor-redis
   template:
     metadata:
       labels:

templates/registry/statefulset.yaml

-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: "{{ template "harbor.fullname" . }}-registry"

templates/ui/deployment.yaml

-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: "{{ template "harbor.fullname" . }}-ui"
@@ -8,10 +8,14 @@ metadata:
     version: {{ .Values.ui.image.tag }}
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+{{ include "harbor.labels" . | indent 6 }}
+      app: harbor-ui
   template:
     metadata:
       labels:
-{{ include "harbor.matchLabels" . | indent 8 }}
+{{ include "harbor.labels" . | indent 8 }}
         app: harbor-ui
         version: {{ .Values.ui.image.tag }}
     spec:

values-hostpath.yaml → values-aliyun.yaml

@@ -10,33 +10,33 @@ ingress:
 adminserver:
   image:
     repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-adminserver
-    tag: v1.6.0
+    tag: v1.6.3
   nodeSelector:
     harbor: enabled
 
 jobservice:
   image:
     repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice
-    tag: v1.6.0
+    tag: v1.6.3
 
 ui:
   image:
     repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-ui
-    tag: v1.6.0
+    tag: v1.6.3
 
 busybox:
   image:
     repository: registry.cn-qingdao.aliyuncs.com/wod/busybox
-    tag: 1.29
+    tag: "1.30"
 
 database:
   internal:
     image:
       repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
-      tag: v1.6.0
+      tag: v1.6.3
     resources:
       limits:
-        memory: 2Gi
+        memory: 4Gi
         cpu: 1000m
       requests:
         memory: 256Mi
@@ -52,7 +52,7 @@ registry:
   hostpath: /data/registry
   resources:
     limits:
-      memory: 1Gi
+      memory: 4Gi
       cpu: 1000m    
     requests:
       memory: 256Mi
@@ -71,11 +71,18 @@ clair:
   image:
     repository: registry.cn-qingdao.aliyuncs.com/wod/clair
     tag: v2.0.6
+  resources:
+    limits:
+      memory: 256Mi
+      cpu: 200m
+    requests:
+      memory: 128Mi
+      cpu: 100m         
 
 redis:
   image:
     repository: registry.cn-qingdao.aliyuncs.com/wod/redis
-    tag: 4.0.1-alpine
+    tag: 4.0.11-alpine
   usePassword: false
   cluster:
     enabled: false

values-storage.yaml

-persistence:
-  enabled: true
-externalProtocol: https
-externalDomain: hub.wodcloud.local
-harborAdminPassword: "passwd"
-
-ingress:
-  enabled: false
-
-istio:
-  enabled: true  
-
-adminserver:
-  image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-adminserver
-    tag: v1.6.0
-  volumes:
-    config:
-      storageClass: "rook-ceph-block"
-      accessMode: ReadWriteOnce
-      size: 1Gi
-
-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: "passwd"
-    volumes:
-      data:
-        storageClass: "rook-ceph-block"
-        accessMode: ReadWriteOnce
-        size: 5Gi
-
-registry:
-  image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/registry
-    tag: 2.6.2
-  volumes:
-    data:
-      # storageClass: "-"
-      accessMode: ReadWriteOnce
-      size: 5Gi
-  nodeSelector:
-    harbor-registry: enabled
-
-chartmuseum:
-  enabled: true
-  image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum
-    tag: v0.7.1
-  volumes:
-    data:
-      storageClass: "rook-ceph-block"
-      accessMode: ReadWriteOnce
-      size: 5Gi
-
-clair:
-  enabled: true
-  image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/clair
-    tag: v2.0.6
-  volumes:
-    pgData:
-      storageClass: "rook-ceph-block"
-      accessMode: ReadWriteOnce
-      size: 1Gi
-
-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

values-test.yaml

-persistence:
-  enabled: false
-externalProtocol: https
-externalDomain: hub.wodcloud.local
-harborAdminPassword: "passwd"
-
-ingress:
-  enabled: true
-
-adminserver:
-  image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-adminserver
-    tag: v1.6.0
-  nodeSelector:
-    harbor: 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
-    resources:
-      limits:
-        memory: 2Gi
-        cpu: 1000m
-      requests:
-        memory: 256Mi
-        cpu: 100m      
-    password: "passwd"
-    nodeSelector:
-      harbor: enabled
-
-registry:
-  image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/registry
-    tag: 2.6.2
-  hostpath: /data/registry
-  resources:
-    limits:
-      memory: 1Gi
-      cpu: 1000m    
-    requests:
-      memory: 256Mi
-      cpu: 100m
-  nodeSelector:
-    harbor: 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
-  resources:
-   requests:
-     memory: 256Mi
-     cpu: 100m    
-
-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

values.yaml

@@ -47,11 +47,11 @@ istio:
   enabled: false
 
 # The tag for Harbor docker images.
-harborImageTag: &harbor_image_tag dev
+harborImageTag: &harbor_image_tag v1.6.3
 
 adminserver:
   image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-adminserver
+    repository: goharbor/harbor-adminserver
     tag: *harbor_image_tag
     pullPolicy: IfNotPresent
   volumes:
@@ -69,7 +69,7 @@ adminserver:
 
 jobservice:
   image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice
+    repository: goharbor/harbor-jobservice
     tag: *harbor_image_tag
     pullPolicy: IfNotPresent
   secret: "BBRQwySksiHZqJUh"
@@ -84,7 +84,7 @@ jobservice:
 
 ui:
   image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-ui
+    repository: goharbor/harbor-ui
     tag: *harbor_image_tag
     pullPolicy: IfNotPresent
   secret: "BBRQwySksiHZqJUh"
@@ -98,7 +98,7 @@ ui:
 
 busybox:
   image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/busybox
+    repository: busybox
     tag: 1.29
 
 # TODO: change the style to be same with redis
@@ -108,7 +108,7 @@ database:
   type: internal
   internal:
     image:
-      repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
+      repository: goharbor/harbor-db
       tag: *harbor_image_tag
       pullPolicy: IfNotPresent
     # the superuser password of database
@@ -137,8 +137,8 @@ database:
 
 registry:
   image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/registry-photon
-    tag: dev
+    repository: registry
+    tag: 2.6.2
     pullPolicy: IfNotPresent
   httpSecret: "BBRQwySksiHZqJUh"
   logLevel: info
@@ -223,8 +223,8 @@ registry:
 chartmuseum:
   enabled: true
   image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon
-    tag: dev
+    repository: chartmuseum/chartmuseum
+    tag: v0.7.1
     pullPolicy: IfNotPresent
   volumes:
     data:
@@ -242,8 +242,8 @@ chartmuseum:
 clair:
   enabled: true
   image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/clair-photon
-    tag: dev
+    repository: quay.io/coreos/clair
+    tag: 2.0.6
     pullPolicy: IfNotPresent
   volumes:
     pgData:
@@ -260,7 +260,7 @@ clair:
 
 redis:
   image:
-    repository: registry.cn-qingdao.aliyuncs.com/wod/redis
+    repository: redis
     tag: 4.0.1-alpine
     pullPolicy: IfNotPresent
   # if external Redis is used, set "external.enabled" to "true"
@@ -287,13 +287,13 @@ notary:
   enabled: true
   server:
     image:
-      repository: registry.cn-qingdao.aliyuncs.com/wod/notary-server-photon
-      tag: dev
+      repository: notary
+      tag: server-0.5.0
       pullPolicy: IfNotPresent
   signer:
     image:
-      repository: registry.cn-qingdao.aliyuncs.com/wod/notary-signer-photon
-      tag: dev
+      repository: notary
+      tag: signer-0.5.0
       pullPolicy: IfNotPresent
     env:
       NOTARY_SIGNER_DEFAULTALIAS: defaultalias