Commit 0970b3e0 authored by 舒成's avatar 舒成

2.1.6

parent 7d41e5ec
Pipeline #62897 passed with stage
......@@ -35,7 +35,7 @@ steps:
"REGISTRY_DATA_PATH": "/data/downloads/k8s/registry/{{ TARGET_ARCH }}",
"REGISTRY_DATA_FILE": "images-harbor-{{ TARGET_VERSION }}.tar.gz",
"TARGET_ARCH":"amd64",
"TARGET_VERSION":"v2.1.3"
"TARGET_VERSION":"v2.1.6"
}'
--extra-vars "@ansible/images.yaml"
......@@ -49,7 +49,7 @@ steps:
"REGISTRY_DATA_PATH": "/data/downloads/k8s/registry/{{ TARGET_ARCH }}",
"REGISTRY_DATA_FILE": "images-harbor-{{ TARGET_VERSION }}.tar.gz",
"TARGET_ARCH":"arm64",
"TARGET_VERSION":"v2.1.3"
"TARGET_VERSION":"v2.1.6"
}'
--extra-vars "@ansible/images.yaml"
......@@ -63,7 +63,21 @@ steps:
"REGISTRY_DATA_PATH": "/data/downloads/k8s/registry/{{ TARGET_ARCH }}",
"REGISTRY_DATA_FILE": "images-harbor-{{ TARGET_VERSION }}.tar.gz",
"TARGET_ARCH":"ppc64le",
"TARGET_VERSION":"v2.1.3"
"TARGET_VERSION":"v2.1.6"
}'
--extra-vars "@ansible/images.yaml"
- name: ansible-mips64le
image: registry.cn-qingdao.aliyuncs.com/wod/ansible-image:v1.0
commands:
- >-
ansible-playbook /etc/ansible/linux/main.yml
--extra-vars
'{
"REGISTRY_DATA_PATH": "/data/downloads/k8s/registry/{{ TARGET_ARCH }}",
"REGISTRY_DATA_FILE": "images-harbor-{{ TARGET_VERSION }}.tar.gz",
"TARGET_ARCH":"mips64le",
"TARGET_VERSION":"v2.1.6"
}'
--extra-vars "@ansible/images.yaml"
......
charts/*
requirements.lock
\ No newline at end of file
requirements.lock
beagle-*.tgz
\ No newline at end of file
apiVersion: v1
name: beagle-harbor
version: 2.1.3
appVersion: 2.1.3
version: 2.1.6
appVersion: 2.1.6
description: An open source trusted cloud native registry that stores, signs, and scans content
keywords:
- docker
......
......@@ -31,76 +31,96 @@ harbor \
/etc/kubernetes/helm/beagle-harbor \
-f /etc/kubernetes/helm/beagle-harbor/values-overrides.yaml > /etc/kubernetes/helm/beagle-harbor/dist.yaml
# package
helm package . -d C:/Tmp/Charts
# 5. Package
## 打包项目
helm package .
## 部署项目
helm install \
harbor \
/etc/kubernetes/charts/beagle-harbor-2.1.6.tgz \
--namespace devops \
-f /etc/kubernetes/charts/beagle-harbor.yaml
## 更新项目
helm upgrade \
harbor \
/etc/kubernetes/charts/beagle-harbor-2.1.6.tgz \
--namespace devops \
-f /etc/kubernetes/charts/beagle-harbor.yaml
## 删除项目
helm uninstall \
--namespace devops \
harbor
```
## images x86_64
```bash
# gitlab.wodcloud.com/cloud/awecloud-goharbor-harbor
registry.cn-qingdao.aliyuncs.com/wod/harbor-portal:v2.1.3
registry.cn-qingdao.aliyuncs.com/wod/harbor-core:v2.1.3
registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v2.1.3
registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl:v2.1.3
registry.cn-qingdao.aliyuncs.com/wod/harbor-portal:v2.1.6
registry.cn-qingdao.aliyuncs.com/wod/harbor-core:v2.1.6
registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v2.1.6
registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl:v2.1.6
# gitlab.wodcloud.com/cloud/awecloud-goharbor-harbor-db
registry.cn-qingdao.aliyuncs.com/wod/harbor-db:v2.1.3
registry.cn-qingdao.aliyuncs.com/wod/harbor-db:v2.1.6
# registry
registry.cn-qingdao.aliyuncs.com/wod/registry:2.7.1
registry.cn-qingdao.aliyuncs.com/wod/registry:v2.7.1
# gitlab.wodcloud.com/cloud/chartmuseum
registry.cn-qingdao.aliyuncs.com/wod/harbor-chartmuseum:v2.1.3
registry.cn-qingdao.aliyuncs.com/wod/chartmuseum:v0.12.0
# gitlab.wodcloud.com/cloud/clair
registry.cn-qingdao.aliyuncs.com/wod/harbor-clair:v2.1.3
registry.cn-qingdao.aliyuncs.com/wod/clair:v2.1.7
# gitlab.wodcloud.com/cloud/awecloud-goharbor-harbor-scanner-clair
registry.cn-qingdao.aliyuncs.com/wod/harbor-clair-adapter:v2.1.3
registry.cn-qingdao.aliyuncs.com/wod/harbor-scanner-clair:v1.1.1
# gitlab.wodcloud.com/cloud/harbor-scanner-trivy
registry.cn-qingdao.aliyuncs.com/wod/harbor-trivy-adapter:v2.1.3
registry.cn-qingdao.aliyuncs.com/wod/harbor-scanner-trivy:v0.17.0
# gitlab.wodcloud.com/cloud/notary
registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-server:v2.1.3
registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-signer:v2.1.3
registry.cn-qingdao.aliyuncs.com/wod/notary-server:v0.6.1
registry.cn-qingdao.aliyuncs.com/wod/notary-signer:v0.6.1
# redis
registry.cn-qingdao.aliyuncs.com/wod/redis:6.0.9
registry.cn-qingdao.aliyuncs.com/wod/redis:6.2.6
```
## images arm64
```bash
# gitlab.wodcloud.com/cloud/awecloud-goharbor-harbor
registry.cn-qingdao.aliyuncs.com/wod/harbor-portal:v2.1.3-arm64
registry.cn-qingdao.aliyuncs.com/wod/harbor-core:v2.1.3-arm64
registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v2.1.3-arm64
registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl:v2.1.3-arm64
registry.cn-qingdao.aliyuncs.com/wod/harbor-portal:v2.1.6-arm64
registry.cn-qingdao.aliyuncs.com/wod/harbor-core:v2.1.6-arm64
registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v2.1.6-arm64
registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl:v2.1.6-arm64
# gitlab.wodcloud.com/cloud/awecloud-goharbor-harbor-db
registry.cn-qingdao.aliyuncs.com/wod/harbor-db:v2.1.3-arm64
registry.cn-qingdao.aliyuncs.com/wod/harbor-db:v2.1.6-arm64
# registry
registry.cn-qingdao.aliyuncs.com/wod/registry:2.7.1-arm64
registry.cn-qingdao.aliyuncs.com/wod/registry:v2.7.1-arm64
# gitlab.wodcloud.com/cloud/chartmuseum
registry.cn-qingdao.aliyuncs.com/wod/harbor-chartmuseum:v2.1.3-arm64
registry.cn-qingdao.aliyuncs.com/wod/chartmuseum:v0.12.0-arm64
# gitlab.wodcloud.com/cloud/clair
registry.cn-qingdao.aliyuncs.com/wod/harbor-clair:v2.1.3-arm64
registry.cn-qingdao.aliyuncs.com/wod/clair:v2.1.7-arm64
# gitlab.wodcloud.com/cloud/awecloud-goharbor-harbor-scanner-clair
registry.cn-qingdao.aliyuncs.com/wod/harbor-clair-adapter:v2.1.3-arm64
registry.cn-qingdao.aliyuncs.com/wod/harbor-scanner-clair:v1.1.1-arm64
# gitlab.wodcloud.com/cloud/harbor-scanner-trivy
registry.cn-qingdao.aliyuncs.com/wod/harbor-trivy-adapter:v2.1.3-arm64
registry.cn-qingdao.aliyuncs.com/wod/harbor-scanner-trivy:v0.17.0-arm64
# gitlab.wodcloud.com/cloud/notary
registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-server:v2.1.3-arm64
registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-signer:v2.1.3-arm64
registry.cn-qingdao.aliyuncs.com/wod/notary-server:v0.6.1-arm64
registry.cn-qingdao.aliyuncs.com/wod/notary-signer:v0.6.1-arm64
# redis
registry.cn-qingdao.aliyuncs.com/wod/redis:6.0.9-arm64
registry.cn-qingdao.aliyuncs.com/wod/redis:6.2.6-arm64
```
......@@ -271,7 +271,7 @@ The following table lists the configurable parameters of the Harbor chart and th
| `clair.clair.image.repository` | Repository for clair image | `goharbor/clair-photon` |
| `clair.clair.image.tag` | Tag for clair image | `dev` |
| `clair.clair.resources` | The [resources] to allocate for clair container | |
| `clair.adapter.image.repository` | Repository for clair adapter image | `goharbor/clair-adapter-photon` |
| `clair.adapter.image.repository` | Repository for clair adapter image | `goharbor/harbor-scanner-clair-photon` |
| `clair.adapter.image.tag` | Tag for clair adapter image | `dev` |
| `clair.adapter.resources` | The [resources] to allocate for clair adapter container | |
| `clair.replicas` | The replica count | `1` |
......
IMAGES:
- repo: harbor-portal
tag: "v2.1.3"
tag: 'v2.1.6'
- repo: harbor-core
tag: "v2.1.3"
tag: 'v2.1.6'
- repo: harbor-jobservice
tag: "v2.1.3"
tag: 'v2.1.6'
- repo: harbor-db
tag: "v2.1.3"
tag: 'v2.1.6'
- repo: harbor-registryctl
tag: "v2.1.3"
- repo: harbor-chartmuseum
tag: "v2.1.3"
- repo: harbor-clair
tag: "v2.1.3"
- repo: harbor-clair-adapter
tag: "v2.1.3"
- repo: harbor-trivy-adapter
tag: "v2.1.3"
- repo: harbor-notary-server
tag: "v2.1.3"
- repo: harbor-notary-signer
tag: "v2.1.3"
tag: 'v2.1.6'
- repo: chartmuseum
tag: 'v0.12.0'
- repo: clair
tag: 'v2.1.7'
- repo: harbor-scanner-clair
tag: 'v1.1.1'
- repo: harbor-scanner-trivy
tag: v0.17.0
- repo: notary-server
tag: v0.6.1
- repo: notary-signer
tag: v0.6.1
- repo: registry
tag: "2.7.1"
tag: 'v2.7.1'
- repo: redis
tag: "6.0.9"
\ No newline at end of file
tag: '6.2.6'
......@@ -7,7 +7,7 @@ expose:
core: hub.wodcloud.local
notary: notary.wodcloud.local
annotations:
ingress.kubernetes.io/proxy-body-size: "0"
ingress.kubernetes.io/proxy-body-size: '0'
externalURL: https://hub.wodcloud.local
......@@ -15,41 +15,41 @@ persistence:
enabled: true
persistentVolumeClaim:
registry:
existingClaim: ""
storageClass: "hostpath"
subPath: ""
existingClaim: ''
storageClass: 'hostpath'
subPath: ''
accessMode: ReadWriteOnce
size: 5Gi
chartmuseum:
existingClaim: ""
storageClass: "hostpath"
subPath: ""
existingClaim: ''
storageClass: 'hostpath'
subPath: ''
accessMode: ReadWriteOnce
size: 5Gi
jobservice:
existingClaim: ""
storageClass: "hostpath"
subPath: ""
existingClaim: ''
storageClass: 'hostpath'
subPath: ''
accessMode: ReadWriteOnce
size: 1Gi
database:
existingClaim: ""
storageClass: "hostpath"
subPath: ""
existingClaim: ''
storageClass: 'hostpath'
subPath: ''
accessMode: ReadWriteOnce
size: 1Gi
redis:
existingClaim: ""
storageClass: "hostpath"
subPath: ""
existingClaim: ''
storageClass: 'hostpath'
subPath: ''
accessMode: ReadWriteOnce
size: 1Gi
trivy:
existingClaim: ""
storageClass: "hostpath"
subPath: ""
existingClaim: ''
storageClass: 'hostpath'
subPath: ''
accessMode: ReadWriteOnce
size: 5Gi
size: 5Gi
imageChartStorage:
# s3 , filesystem
type: filesystem
......@@ -62,34 +62,34 @@ persistence:
encrypt: false
v4auth: true
chunksize: '5242880'
rootdirectory: /
rootdirectory: /
imagePullPolicy: IfNotPresent
logLevel: info
harborAdminPassword: "spaceIN511"
secretKey: "IpTIscRIgmerlare"
harborAdminPassword: 'spaceIN511'
secretKey: 'IpTIscRIgmerlare'
portal:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-portal
tag: v2.1.3
tag: v2.1.6
core:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core
tag: v2.1.3
tag: v2.1.6
jobservice:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice
tag: v2.1.3
tag: v2.1.6
registry:
registry:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/registry
tag: 2.7.1
tag: v2.7.1
resources:
limits:
memory: 4Gi
......@@ -98,12 +98,12 @@ registry:
controller:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl
tag: v2.1.3
tag: v2.1.6
chartmuseum:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-chartmuseum
tag: v2.1.3
repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum
tag: v2.1.6
nodeSelector: {}
# nodeSelector:
# harbor: enabled
......@@ -111,40 +111,40 @@ chartmuseum:
type: hostPath
emptyDir: {}
hostPath:
root: /data
root: /data
clair:
clair:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair
tag: v2.1.3
repository: registry.cn-qingdao.aliyuncs.com/wod/clair
tag: v2.1.6
adapter:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair-adapter
tag: v2.1.3
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-scanner-clair
tag: v2.1.6
trivy:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-trivy-adapter
tag: v2.1.3
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-scanner-trivy
tag: v2.1.6
notary:
server:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-server
tag: v2.1.3
repository: registry.cn-qingdao.aliyuncs.com/wod/notary-server
tag: v2.1.6
signer:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-signer
tag: v2.1.3
repository: registry.cn-qingdao.aliyuncs.com/wod/notary-signer
tag: v2.1.6
database:
type: internal
internal:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
tag: v2.1.3
password: "spaceIN511"
tag: v2.1.6
password: 'spaceIN511'
resources:
limits:
memory: 4Gi
......@@ -156,4 +156,4 @@ redis:
internal:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/redis
tag: 6.0.9
\ No newline at end of file
tag: 6.2.6
......@@ -7,7 +7,7 @@ expose:
core: hub.wodcloud.local
notary: notary.wodcloud.local
annotations:
ingress.kubernetes.io/proxy-body-size: "0"
ingress.kubernetes.io/proxy-body-size: '0'
externalURL: https://hub.wodcloud.local
......@@ -15,41 +15,41 @@ persistence:
enabled: true
persistentVolumeClaim:
registry:
existingClaim: ""
storageClass: "hostpath"
subPath: ""
existingClaim: ''
storageClass: 'hostpath'
subPath: ''
accessMode: ReadWriteOnce
size: 5Gi
chartmuseum:
existingClaim: ""
storageClass: "hostpath"
subPath: ""
existingClaim: ''
storageClass: 'hostpath'
subPath: ''
accessMode: ReadWriteOnce
size: 5Gi
jobservice:
existingClaim: ""
storageClass: "hostpath"
subPath: ""
existingClaim: ''
storageClass: 'hostpath'
subPath: ''
accessMode: ReadWriteOnce
size: 1Gi
database:
existingClaim: ""
storageClass: "hostpath"
subPath: ""
existingClaim: ''
storageClass: 'hostpath'
subPath: ''
accessMode: ReadWriteOnce
size: 1Gi
redis:
existingClaim: ""
storageClass: "hostpath"
subPath: ""
existingClaim: ''
storageClass: 'hostpath'
subPath: ''
accessMode: ReadWriteOnce
size: 1Gi
trivy:
existingClaim: ""
storageClass: "hostpath"
subPath: ""
existingClaim: ''
storageClass: 'hostpath'
subPath: ''
accessMode: ReadWriteOnce
size: 5Gi
size: 5Gi
imageChartStorage:
# s3 , filesystem
type: filesystem
......@@ -62,34 +62,34 @@ persistence:
encrypt: false
v4auth: true
chunksize: '5242880'
rootdirectory: /
rootdirectory: /
imagePullPolicy: IfNotPresent
logLevel: info
harborAdminPassword: "spaceIN511"
secretKey: "IpTIscRIgmerlare"
harborAdminPassword: 'spaceIN511'
secretKey: 'IpTIscRIgmerlare'
portal:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-portal
tag: v2.1.3-arm64
tag: v2.1.6-arm64
core:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core
tag: v2.1.3-arm64
tag: v2.1.6-arm64
jobservice:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice
tag: v2.1.3-arm64
tag: v2.1.6-arm64
registry:
registry:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/registry
tag: 2.7.1-arm64
tag: v2.7.1-arm64
resources:
limits:
memory: 4Gi
......@@ -98,12 +98,12 @@ registry:
controller:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl
tag: v2.1.3-arm64
tag: v2.1.6-arm64
chartmuseum:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-chartmuseum
tag: v2.1.3-arm64
repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum
tag: v2.1.6-arm64
nodeSelector: {}
# nodeSelector:
# harbor: enabled
......@@ -111,40 +111,40 @@ chartmuseum:
type: hostPath
emptyDir: {}
hostPath:
root: /data
root: /data
clair:
clair:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair
tag: v2.1.3-arm64
repository: registry.cn-qingdao.aliyuncs.com/wod/clair
tag: v2.1.6-arm64
adapter:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair-adapter
tag: v2.1.3-arm64
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-scanner-clair
tag: v2.1.6-arm64
trivy:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-trivy-adapter
tag: v2.1.3-arm64
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-scanner-trivy
tag: v2.1.6-arm64
notary:
server:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-server
tag: v2.1.3-arm64
repository: registry.cn-qingdao.aliyuncs.com/wod/notary-server
tag: v2.1.6-arm64
signer:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-signer
tag: v2.1.3-arm64
repository: registry.cn-qingdao.aliyuncs.com/wod/notary-signer
tag: v2.1.6-arm64
database:
type: internal
internal:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
tag: v2.1.3-arm64
password: "spaceIN511"
tag: v2.1.6-arm64
password: 'spaceIN511'
resources:
limits:
memory: 4Gi
......@@ -156,4 +156,4 @@ redis:
internal:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/redis
tag: 6.0.9-arm64
\ No newline at end of file
tag: 6.2.6-arm64
......@@ -7,7 +7,7 @@ expose:
core: hub.test.wodcloud.com
notary: notary.test.wodcloud.com
annotations:
ingress.kubernetes.io/proxy-body-size: "0"
ingress.kubernetes.io/proxy-body-size: '0'
externalURL: https://hub.test.wodcloud.com
......@@ -19,21 +19,21 @@ persistence:
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: /
# 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"
harborAdminPassword: 'spaceIN511'
secretKey: 'IpTIscRIgmerlare'
portal:
image:
......@@ -59,14 +59,14 @@ registry:
registry:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/registry
tag: 2.7.1
tag: v2.7.1
resources:
limits:
memory: 4Gi
requests:
memory: 256Mi
nodeSelector:
harbor: enabled
harbor: enabled
storageSpec:
# type: emptyDir , hostPath , volumeClaimTemplate
type: hostPath
......@@ -76,11 +76,11 @@ registry:
volumeClaimTemplate:
spec:
storageClassName: rook-ceph-block
accessModes: ["ReadWriteOnce"]
accessModes: ['ReadWriteOnce']
resources:
requests:
storage: 100Gi
selector: {}
selector: {}
controller:
image:
......@@ -95,12 +95,12 @@ chartmuseum:
tag: v0.9.0-v1.8.2
replicas: 1
nodeSelector:
harbor: enabled
harbor: enabled
storageSpec:
type: hostPath
emptyDir: {}
hostPath:
root: /data
root: /data
clair:
enabled: true
......@@ -128,7 +128,7 @@ database:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
tag: v1.8.2
password: "spaceIN511"
password: 'spaceIN511'
resources:
limits:
memory: 4Gi
......@@ -140,11 +140,11 @@ database:
type: hostPath
emptyDir: {}
hostPath:
root: /data
root: /data
volumeClaimTemplate:
spec:
storageClassName: rook-ceph-block
accessModes: ["ReadWriteOnce"]
accessModes: ['ReadWriteOnce']
resources:
requests:
storage: 20Gi
......@@ -155,4 +155,4 @@ redis:
internal:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/redis
tag: 4.0.14-alpine
\ No newline at end of file
tag: 4.0.14-alpine
......@@ -7,7 +7,7 @@ expose:
core: hub.wodcloud.local
notary: notary.wodcloud.local
annotations:
ingress.kubernetes.io/proxy-body-size: "0"
ingress.kubernetes.io/proxy-body-size: '0'
externalURL: https://hub.wodcloud.local
......@@ -15,41 +15,41 @@ persistence:
enabled: true
persistentVolumeClaim:
registry:
existingClaim: ""
storageClass: "hostpath"
subPath: ""
existingClaim: ''
storageClass: 'hostpath'
subPath: ''
accessMode: ReadWriteOnce
size: 5Gi
chartmuseum:
existingClaim: ""
storageClass: "hostpath"
subPath: ""
existingClaim: ''
storageClass: 'hostpath'
subPath: ''
accessMode: ReadWriteOnce
size: 5Gi
jobservice:
existingClaim: ""
storageClass: "hostpath"
subPath: ""
existingClaim: ''
storageClass: 'hostpath'
subPath: ''
accessMode: ReadWriteOnce
size: 1Gi
database:
existingClaim: ""
storageClass: "hostpath"
subPath: ""
existingClaim: ''
storageClass: 'hostpath'
subPath: ''
accessMode: ReadWriteOnce
size: 1Gi
redis:
existingClaim: ""
storageClass: "hostpath"
subPath: ""
existingClaim: ''
storageClass: 'hostpath'
subPath: ''
accessMode: ReadWriteOnce
size: 1Gi
trivy:
existingClaim: ""
storageClass: "hostpath"
subPath: ""
existingClaim: ''
storageClass: 'hostpath'
subPath: ''
accessMode: ReadWriteOnce
size: 5Gi
size: 5Gi
imageChartStorage:
# s3 , filesystem
type: filesystem
......@@ -62,34 +62,34 @@ persistence:
encrypt: false
v4auth: true
chunksize: '5242880'
rootdirectory: /
rootdirectory: /
imagePullPolicy: IfNotPresent
logLevel: info
harborAdminPassword: "spaceIN511"
secretKey: "IpTIscRIgmerlare"
harborAdminPassword: 'spaceIN511'
secretKey: 'IpTIscRIgmerlare'
portal:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-portal
tag: v2.1.3-ppc64le
tag: v2.1.6-ppc64le
core:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core
tag: v2.1.3-ppc64le
tag: v2.1.6-ppc64le
jobservice:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice
tag: v2.1.3-ppc64le
tag: v2.1.6-ppc64le
registry:
registry:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/registry
tag: 2.7.1-ppc64le
tag: v2.7.1-ppc64le
resources:
limits:
memory: 4Gi
......@@ -98,11 +98,11 @@ registry:
controller:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl
tag: v2.1.3-ppc64le
tag: v2.1.6-ppc64le
chartmuseum:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-chartmuseum
repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum
tag: v2.1.1-ppc64le
nodeSelector: {}
# nodeSelector:
......@@ -111,31 +111,31 @@ chartmuseum:
type: hostPath
emptyDir: {}
hostPath:
root: /data
root: /data
clair:
clair:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair
repository: registry.cn-qingdao.aliyuncs.com/wod/clair
tag: v2.1.1-ppc64le
adapter:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair-adapter
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-scanner-clair
tag: v2.1.1-ppc64le
trivy:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-trivy-adapter
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-scanner-trivy
tag: v2.1.1-ppc64le
notary:
server:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-server
repository: registry.cn-qingdao.aliyuncs.com/wod/notary-server
tag: v2.1.1-ppc64le
signer:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-signer
repository: registry.cn-qingdao.aliyuncs.com/wod/notary-signer
tag: v2.1.1-ppc64le
database:
......@@ -143,8 +143,8 @@ database:
internal:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
tag: v2.1.3-ppc64le
password: "spaceIN511"
tag: v2.1.6-ppc64le
password: 'spaceIN511'
resources:
limits:
memory: 4Gi
......@@ -156,4 +156,4 @@ redis:
internal:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/redis
tag: 6.0.9-ppc64le
\ No newline at end of file
tag: 6.2.6-ppc64le
......@@ -7,7 +7,7 @@ expose:
core: hub.test.wodcloud.com
notary: notary.test.wodcloud.com
annotations:
ingress.kubernetes.io/proxy-body-size: "0"
ingress.kubernetes.io/proxy-body-size: '0'
externalURL: https://hub.test.wodcloud.com
......@@ -19,21 +19,21 @@ persistence:
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: /
# 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"
harborAdminPassword: 'spaceIN511'
secretKey: 'IpTIscRIgmerlare'
portal:
image:
......@@ -59,14 +59,14 @@ registry:
registry:
image:
repository: registry.cn-qingdao.aliyuncs.com/wod/registry
tag: 2.7.1
tag: v2.7.1
resources:
limits:
memory: 4Gi
requests:
memory: 256Mi
nodeSelector:
harbor: enabled
harbor: enabled
storageSpec:
# type: emptyDir , hostPath , volumeClaimTemplate
type: hostPath
......@@ -76,11 +76,11 @@ registry:
volumeClaimTemplate:
spec:
storageClassName: rook-ceph-block
accessModes: ["ReadWriteOnce"]
accessModes: ['ReadWriteOnce']
resources:
requests:
storage: 100Gi
selector: {}
selector: {}
controller:
image:
......@@ -95,12 +95,12 @@ chartmuseum:
tag: v0.9.0-v1.8.2
replicas: 1
nodeSelector:
harbor: enabled
harbor: enabled
storageSpec:
type: hostPath
emptyDir: {}
hostPath:
root: /data
root: /data
clair:
enabled: true
......@@ -125,19 +125,19 @@ notary:
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"
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
tag: 4.0.14-alpine
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment