From 0d202b684b52ec7a07cd208dfac6138adabc904b Mon Sep 17 00:00:00 2001 From: shucheng Date: Mon, 4 Mar 2019 00:14:03 +0800 Subject: [PATCH] update --- readme.md | 24 ++--- templates/adminserver/statefulset.yaml | 2 +- templates/chartmuseum/statefulset.yaml | 2 +- templates/clair/deployment.yaml | 6 +- templates/database/statefulset.yaml | 2 +- templates/jobservice/deployment.yaml | 6 +- templates/notary/notary-server.yaml | 6 +- templates/notary/notary-signer.yaml | 6 +- templates/redis/deployment.yml | 6 +- templates/registry/statefulset.yaml | 2 +- templates/ui/deployment.yaml | 8 +- values-hostpath.yaml => values-aliyun.yaml | 23 +++-- values-storage.yaml | 104 --------------------- values-test.yaml | 99 -------------------- values.yaml | 34 +++---- 15 files changed, 79 insertions(+), 251 deletions(-) rename values-hostpath.yaml => values-aliyun.yaml (85%) delete mode 100644 values-storage.yaml delete mode 100644 values-test.yaml diff --git a/readme.md b/readme.md index 40a3d69..f3e87a8 100644 --- a/readme.md +++ b/readme.md @@ -47,24 +47,24 @@ kubectl label node 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 && \ diff --git a/templates/adminserver/statefulset.yaml b/templates/adminserver/statefulset.yaml index 6d906a8..e3cd3a2 100644 --- a/templates/adminserver/statefulset.yaml +++ b/templates/adminserver/statefulset.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: StatefulSet metadata: name: "{{ template "harbor.fullname" . }}-adminserver" diff --git a/templates/chartmuseum/statefulset.yaml b/templates/chartmuseum/statefulset.yaml index 544f33b..5699109 100644 --- a/templates/chartmuseum/statefulset.yaml +++ b/templates/chartmuseum/statefulset.yaml @@ -1,5 +1,5 @@ {{- if .Values.chartmuseum.enabled }} -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: StatefulSet metadata: name: "{{ template "harbor.fullname" . }}-chartmuseum" diff --git a/templates/clair/deployment.yaml b/templates/clair/deployment.yaml index bac97a0..973e278 100644 --- a/templates/clair/deployment.yaml +++ b/templates/clair/deployment.yaml @@ -1,5 +1,5 @@ {{ 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: diff --git a/templates/database/statefulset.yaml b/templates/database/statefulset.yaml index 8a93f8c..9eae891 100644 --- a/templates/database/statefulset.yaml +++ b/templates/database/statefulset.yaml @@ -1,5 +1,5 @@ {{- if eq .Values.database.type "internal" -}} -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: StatefulSet metadata: name: "{{ template "harbor.fullname" . }}-database" diff --git a/templates/jobservice/deployment.yaml b/templates/jobservice/deployment.yaml index a99bcd3..ee27e26 100644 --- a/templates/jobservice/deployment.yaml +++ b/templates/jobservice/deployment.yaml @@ -1,4 +1,4 @@ -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: diff --git a/templates/notary/notary-server.yaml b/templates/notary/notary-server.yaml index 4abac77..a1befe1 100644 --- a/templates/notary/notary-server.yaml +++ b/templates/notary/notary-server.yaml @@ -1,5 +1,5 @@ {{ 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: diff --git a/templates/notary/notary-signer.yaml b/templates/notary/notary-signer.yaml index db367c4..f562971 100644 --- a/templates/notary/notary-signer.yaml +++ b/templates/notary/notary-signer.yaml @@ -1,5 +1,5 @@ {{ 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: diff --git a/templates/redis/deployment.yml b/templates/redis/deployment.yml index 83c3488..00be599 100644 --- a/templates/redis/deployment.yml +++ b/templates/redis/deployment.yml @@ -1,5 +1,5 @@ --- -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: diff --git a/templates/registry/statefulset.yaml b/templates/registry/statefulset.yaml index 1e7193d..a08fa68 100644 --- a/templates/registry/statefulset.yaml +++ b/templates/registry/statefulset.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: StatefulSet metadata: name: "{{ template "harbor.fullname" . }}-registry" diff --git a/templates/ui/deployment.yaml b/templates/ui/deployment.yaml index 5d014c0..6ddabfd 100644 --- a/templates/ui/deployment.yaml +++ b/templates/ui/deployment.yaml @@ -1,4 +1,4 @@ -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: diff --git a/values-hostpath.yaml b/values-aliyun.yaml similarity index 85% rename from values-hostpath.yaml rename to values-aliyun.yaml index ee87a66..36bfb98 100644 --- a/values-hostpath.yaml +++ b/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 diff --git a/values-storage.yaml b/values-storage.yaml deleted file mode 100644 index 7ae2cc6..0000000 --- a/values-storage.yaml +++ /dev/null @@ -1,104 +0,0 @@ -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 diff --git a/values-test.yaml b/values-test.yaml deleted file mode 100644 index 551b4cf..0000000 --- a/values-test.yaml +++ /dev/null @@ -1,99 +0,0 @@ -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 diff --git a/values.yaml b/values.yaml index f1956e3..b42ffc7 100644 --- a/values.yaml +++ b/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 -- 2.26.0