diff --git a/readme.md b/readme.md index 330bb402a9427bbc6184642f7d6aa2b17117ad5c..40a3d69317d1b3fbcb18dd50c7ba8877b9929d08 100644 --- a/readme.md +++ b/readme.md @@ -3,7 +3,7 @@ # 1.install # label node -kubectl label node harbor-registry=enabled +kubectl label node harbor=enabled helm install \ /etc/kubernetes/helm/harbor \ @@ -25,114 +25,9 @@ helm upgrade harbor /etc/kubernetes/helm/harbor \ cat /etc/kubernetes/helm/harbor/values-overrides.yaml ``` -### 有持久化存储StorageOS - -```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: "storageos" - 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: "storageos" - 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: "storageos" - accessMode: ReadWriteOnce - size: 5Gi - -clair: - enabled: true - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/clair - tag: v2.0.6 - volumes: - pgData: - storageClass: "storageos" - 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 +### 有持久化存储Storage -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 -``` +参考values-storage.yaml ### 使用HostPath存储数据 @@ -140,96 +35,16 @@ notary: ``` harbor: enabled -harbor-registry: enabled kubectl label node harbor=enabled +# kubectl label node harbor- ``` -```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 - password: "passwd" - nodeSelector: - harbor: enabled +参考values-hostpath.yaml -registry: - image: - repository: registry.cn-qingdao.aliyuncs.com/wod/registry - tag: 2.6.2 - hostpath: /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 -``` # images + ```bash # harbor-ui docker pull goharbor/harbor-ui:v1.6.0 && \ diff --git a/templates/adminserver/service.yaml b/templates/adminserver/service.yaml index 1a571e6ce83a2289883a23eec14679afa7e1d1fd..c0b3f98952d26b7fe4fee3557320ae80e23a3285 100644 --- a/templates/adminserver/service.yaml +++ b/templates/adminserver/service.yaml @@ -2,6 +2,8 @@ apiVersion: v1 kind: Service metadata: name: "{{ template "harbor.fullname" . }}-adminserver" + labels: +{{ include "harbor.labels" . | indent 4 }} spec: ports: - port: 80 diff --git a/values-hostpath.yaml b/values-hostpath.yaml new file mode 100644 index 0000000000000000000000000000000000000000..bae677a653e553d38a87f151da2e1b9ccdc00106 --- /dev/null +++ b/values-hostpath.yaml @@ -0,0 +1,81 @@ +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 + password: "passwd" + nodeSelector: + harbor: enabled + +registry: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/registry + tag: 2.6.2 + hostpath: /data/registry + 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 + +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-storage.yaml b/values-storage.yaml new file mode 100644 index 0000000000000000000000000000000000000000..7ae2cc67022a48d847f33e636713b7f8cd03ea29 --- /dev/null +++ b/values-storage.yaml @@ -0,0 +1,104 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..c787765a8b15b991aea3cc89993c62ada0cd7866 --- /dev/null +++ b/values-test.yaml @@ -0,0 +1,93 @@ +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: + 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: + 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