From 60d640afb91ca3f8c6a3719a48e8cefab2c68f83 Mon Sep 17 00:00:00 2001 From: lvyongxin Date: Mon, 17 Aug 2020 16:53:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0ingressroute?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/ingress/ingress.yaml | 85 +++++++++++++++++- values-pg.yaml | 158 +++++++++++++++++++++++++++++++++ values-stolon.yaml | 143 +++++++++++++++++++++++++++++ 3 files changed, 385 insertions(+), 1 deletion(-) create mode 100644 values-pg.yaml create mode 100644 values-stolon.yaml diff --git a/templates/ingress/ingress.yaml b/templates/ingress/ingress.yaml index d72bc92..c3358da 100644 --- a/templates/ingress/ingress.yaml +++ b/templates/ingress/ingress.yaml @@ -103,4 +103,87 @@ spec: host: {{ $ingress.hosts.notary }} {{- end }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} +--- +apiVersion: bcc.bd-apaas.com/v1alpha1 +kind: IngressRoute +metadata: + name: harbor-ingress + namespace: {{ .Release.Namespace }} +spec: + entryPoints: + - websecure + routes: + - kind: Rule + match: Host(`{{ $ingress.hosts.core }}`) && PathPrefix(`/`) + middlewares: [] + priority: 0 + services: + - kind: Service + name: harbor-portal + namespace: devops + port: 80 + - kind: Rule + match: Host(`{{ $ingress.hosts.core }}`) && PathPrefix(`/api/`) + middlewares: [] + priority: 0 + services: + - kind: Service + name: harbor-core + namespace: devops + port: 80 + - kind: Rule + match: Host(`{{ $ingress.hosts.core }}`) && PathPrefix(`/service/`) + middlewares: [] + priority: 0 + services: + - kind: Service + name: harbor-core + namespace: devops + port: 80 + - kind: Rule + match: Host(`{{ $ingress.hosts.core }}`) && PathPrefix(`/v2/`) + middlewares: [] + priority: 0 + services: + - kind: Service + name: harbor-core + namespace: devops + port: 80 + - kind: Rule + match: Host(`{{ $ingress.hosts.core }}`) && PathPrefix(`/chartrepo/`) + middlewares: [] + priority: 0 + services: + - kind: Service + name: harbor-core + namespace: devops + port: 80 + - kind: Rule + match: Host(`{{ $ingress.hosts.core }}`) && PathPrefix(`/c/`) + middlewares: [] + priority: 0 + services: + - kind: Service + name: harbor-core + namespace: devops + port: 80 + - kind: Rule + match: Host(`{{ $ingress.hosts.core }}`) && PathPrefix(`/`) + middlewares: [] + priority: 0 + services: + - kind: Service + name: harbor-notary-server + namespace: devops + port: 4443 + tls: + certResolver: default +--- +apiVersion: bcc.bd-apaas.com/v1alpha1 +kind: IngressHost +metadata: + name: harbor + namespace: {{ .Release.Namespace }} +spec: + host: {{ $ingress.hosts.core }} \ No newline at end of file diff --git a/values-pg.yaml b/values-pg.yaml new file mode 100644 index 0000000..6d4f8a9 --- /dev/null +++ b/values-pg.yaml @@ -0,0 +1,158 @@ +expose: + type: ingress + tls: + enabled: false + ingress: + hosts: + core: hub.test.wodcloud.com + notary: notary.test.wodcloud.com + annotations: + ingress.kubernetes.io/proxy-body-size: "0" + +externalURL: https://hub.test.wodcloud.com + +persistence: + enabled: true + imageChartStorage: + # s3 , filesystem + type: filesystem + filesystem: + rootdirectory: /data + #s3: + # accesskey: AKIAIOSFODNN7EXAMPLE + # secretkey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY + # region: us-east-1 + # regionendpoint: https://minio.sxwh.local + # bucket: registry + # encrypt: false + # v4auth: true + # chunksize: '5242880' + # rootdirectory: / + +imagePullPolicy: IfNotPresent + +logLevel: info +harborAdminPassword: "spaceIN511" +secretKey: "IpTIscRIgmerlare" + +portal: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-portal + tag: v1.8.2 + replicas: 1 + +core: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core + tag: v1.8.2 + replicas: 1 + +jobservice: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice + tag: v1.8.2 + replicas: 1 + maxJobWorkers: 10 + jobLogger: file + +registry: + registry: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/registry + tag: 2.7.1 + resources: + limits: + memory: 4Gi + requests: + memory: 256Mi + nodeSelector: + harbor: enabled + storageSpec: + # type: emptyDir , hostPath , volumeClaimTemplate + type: hostPath + emptyDir: {} + hostPath: + root: /data + volumeClaimTemplate: + spec: + storageClassName: rook-ceph-block + accessModes: ["ReadWriteOnce"] + resources: + requests: + storage: 100Gi + selector: {} + + controller: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl + tag: v1.8.2 + replicas: 1 + +chartmuseum: + enabled: true + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon + tag: v0.9.0-v1.8.2 + replicas: 1 + nodeSelector: + harbor: enabled + storageSpec: + type: hostPath + emptyDir: {} + hostPath: + root: /data + +clair: + enabled: true + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/clair-photon + tag: v2.0.8-v1.8.2 + replicas: 1 + +notary: + enabled: true + server: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/notary-server-photon + 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.8.2 + replicas: 1 + +database: + type: internal + internal: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db + tag: v1.8.2 + password: "spaceIN511" + resources: + limits: + memory: 4Gi + requests: + memory: 256Mi + nodeSelector: + harbor: enabled + storageSpec: + type: hostPath + emptyDir: {} + hostPath: + root: /data + volumeClaimTemplate: + spec: + storageClassName: rook-ceph-block + accessModes: ["ReadWriteOnce"] + resources: + requests: + storage: 20Gi + selector: {} + +redis: + type: internal + internal: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/redis + tag: 4.0.14-alpine \ No newline at end of file diff --git a/values-stolon.yaml b/values-stolon.yaml new file mode 100644 index 0000000..cf640ab --- /dev/null +++ b/values-stolon.yaml @@ -0,0 +1,143 @@ +expose: + type: ingress + tls: + enabled: false + ingress: + hosts: + core: hub.test.wodcloud.com + notary: notary.test.wodcloud.com + annotations: + ingress.kubernetes.io/proxy-body-size: "0" + +externalURL: https://hub.test.wodcloud.com + +persistence: + enabled: true + imageChartStorage: + # s3 , filesystem + type: filesystem + filesystem: + rootdirectory: /data + #s3: + # accesskey: AKIAIOSFODNN7EXAMPLE + # secretkey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY + # region: us-east-1 + # regionendpoint: https://minio.sxwh.local + # bucket: registry + # encrypt: false + # v4auth: true + # chunksize: '5242880' + # rootdirectory: / + +imagePullPolicy: IfNotPresent + +logLevel: info +harborAdminPassword: "spaceIN511" +secretKey: "IpTIscRIgmerlare" + +portal: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-portal + tag: v1.8.2 + replicas: 1 + +core: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core + tag: v1.8.2 + replicas: 1 + +jobservice: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice + tag: v1.8.2 + replicas: 1 + maxJobWorkers: 10 + jobLogger: file + +registry: + registry: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/registry + tag: 2.7.1 + resources: + limits: + memory: 4Gi + requests: + memory: 256Mi + nodeSelector: + harbor: enabled + storageSpec: + # type: emptyDir , hostPath , volumeClaimTemplate + type: hostPath + emptyDir: {} + hostPath: + root: /data + volumeClaimTemplate: + spec: + storageClassName: rook-ceph-block + accessModes: ["ReadWriteOnce"] + resources: + requests: + storage: 100Gi + selector: {} + + controller: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl + tag: v1.8.2 + replicas: 1 + +chartmuseum: + enabled: true + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum-photon + tag: v0.9.0-v1.8.2 + replicas: 1 + nodeSelector: + harbor: enabled + storageSpec: + type: hostPath + emptyDir: {} + hostPath: + root: /data + +clair: + enabled: true + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/clair-photon + tag: v2.0.8-v1.8.2 + replicas: 1 + +notary: + enabled: true + server: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/notary-server-photon + 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.8.2 + replicas: 1 + +database: + type: external + external: + host: "stolon-proxy.devops" + port: "5432" + username: "postgres" + password: "spaceIN511" + coreDatabase: "hub_registry" + clairDatabase: "hub_clair" + notaryServerDatabase: "hub_notary_server" + notarySignerDatabase: "hub_notary_signer" + sslmode: "disable" + +redis: + type: internal + internal: + image: + repository: registry.cn-qingdao.aliyuncs.com/wod/redis + tag: 4.0.14-alpine \ No newline at end of file -- 2.26.0