Skip to content

H
harbor
Commit 0970b3e0 authored by 舒成's avatar 舒成
Browse files
Options

2.1.6

parent 7d41e5ec
Pipeline #62897 passed with stage
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 498 additions and 462 deletions
    .beagle.yml
    View file @ 0970b3e0
    ...@@ -35,7 +35,7 @@ steps: ...@@ -35,7 +35,7 @@ steps:
    "REGISTRY_DATA_PATH": "/data/downloads/k8s/registry/{{ TARGET_ARCH }}", "REGISTRY_DATA_PATH": "/data/downloads/k8s/registry/{{ TARGET_ARCH }}",
    "REGISTRY_DATA_FILE": "images-harbor-{{ TARGET_VERSION }}.tar.gz", "REGISTRY_DATA_FILE": "images-harbor-{{ TARGET_VERSION }}.tar.gz",
    "TARGET_ARCH":"amd64", "TARGET_ARCH":"amd64",
    "TARGET_VERSION":"v2.1.3" "TARGET_VERSION":"v2.1.6"
    }' }'
    --extra-vars "@ansible/images.yaml" --extra-vars "@ansible/images.yaml"
    ...@@ -49,7 +49,7 @@ steps: ...@@ -49,7 +49,7 @@ steps:
    "REGISTRY_DATA_PATH": "/data/downloads/k8s/registry/{{ TARGET_ARCH }}", "REGISTRY_DATA_PATH": "/data/downloads/k8s/registry/{{ TARGET_ARCH }}",
    "REGISTRY_DATA_FILE": "images-harbor-{{ TARGET_VERSION }}.tar.gz", "REGISTRY_DATA_FILE": "images-harbor-{{ TARGET_VERSION }}.tar.gz",
    "TARGET_ARCH":"arm64", "TARGET_ARCH":"arm64",
    "TARGET_VERSION":"v2.1.3" "TARGET_VERSION":"v2.1.6"
    }' }'
    --extra-vars "@ansible/images.yaml" --extra-vars "@ansible/images.yaml"
    ...@@ -63,7 +63,21 @@ steps: ...@@ -63,7 +63,21 @@ steps:
    "REGISTRY_DATA_PATH": "/data/downloads/k8s/registry/{{ TARGET_ARCH }}", "REGISTRY_DATA_PATH": "/data/downloads/k8s/registry/{{ TARGET_ARCH }}",
    "REGISTRY_DATA_FILE": "images-harbor-{{ TARGET_VERSION }}.tar.gz", "REGISTRY_DATA_FILE": "images-harbor-{{ TARGET_VERSION }}.tar.gz",
    "TARGET_ARCH":"ppc64le", "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" --extra-vars "@ansible/images.yaml"
    ......
    .gitignore
    View file @ 0970b3e0
    charts/* charts/*
    requirements.lock requirements.lock
    \ No newline at end of file
    beagle-*.tgz
    \ No newline at end of file
    Chart.yaml
    View file @ 0970b3e0
    apiVersion: v1 apiVersion: v1
    name: beagle-harbor name: beagle-harbor
    version: 2.1.3 version: 2.1.6
    appVersion: 2.1.3 appVersion: 2.1.6
    description: An open source trusted cloud native registry that stores, signs, and scans content description: An open source trusted cloud native registry that stores, signs, and scans content
    keywords: keywords:
    - docker - docker
    ......
    Deploy.md
    View file @ 0970b3e0
    ...@@ -31,76 +31,96 @@ harbor \ ...@@ -31,76 +31,96 @@ harbor \
    /etc/kubernetes/helm/beagle-harbor \ /etc/kubernetes/helm/beagle-harbor \
    -f /etc/kubernetes/helm/beagle-harbor/values-overrides.yaml > /etc/kubernetes/helm/beagle-harbor/dist.yaml -f /etc/kubernetes/helm/beagle-harbor/values-overrides.yaml > /etc/kubernetes/helm/beagle-harbor/dist.yaml
    # package # 5. Package
    helm package . -d C:/Tmp/Charts ## 打包项目
    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 ## images x86_64
    ```bash ```bash
    # gitlab.wodcloud.com/cloud/awecloud-goharbor-harbor # 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-portal:v2.1.6
    registry.cn-qingdao.aliyuncs.com/wod/harbor-core:v2.1.3 registry.cn-qingdao.aliyuncs.com/wod/harbor-core:v2.1.6
    registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v2.1.3 registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v2.1.6
    registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl:v2.1.3 registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl:v2.1.6
    # gitlab.wodcloud.com/cloud/awecloud-goharbor-harbor-db # 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
    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 # 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 # 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 # 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 # 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 # gitlab.wodcloud.com/cloud/notary
    registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-server:v2.1.3 registry.cn-qingdao.aliyuncs.com/wod/notary-server:v0.6.1
    registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-signer:v2.1.3 registry.cn-qingdao.aliyuncs.com/wod/notary-signer:v0.6.1
    # redis # redis
    registry.cn-qingdao.aliyuncs.com/wod/redis:6.0.9 registry.cn-qingdao.aliyuncs.com/wod/redis:6.2.6
    ``` ```
    ## images arm64 ## images arm64
    ```bash ```bash
    # gitlab.wodcloud.com/cloud/awecloud-goharbor-harbor # 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-portal:v2.1.6-arm64
    registry.cn-qingdao.aliyuncs.com/wod/harbor-core:v2.1.3-arm64 registry.cn-qingdao.aliyuncs.com/wod/harbor-core:v2.1.6-arm64
    registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v2.1.3-arm64 registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice:v2.1.6-arm64
    registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl:v2.1.3-arm64 registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl:v2.1.6-arm64
    # gitlab.wodcloud.com/cloud/awecloud-goharbor-harbor-db # 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
    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 # 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 # 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 # 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 # 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 # gitlab.wodcloud.com/cloud/notary
    registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-server:v2.1.3-arm64 registry.cn-qingdao.aliyuncs.com/wod/notary-server:v0.6.1-arm64
    registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-signer:v2.1.3-arm64 registry.cn-qingdao.aliyuncs.com/wod/notary-signer:v0.6.1-arm64
    # redis # redis
    registry.cn-qingdao.aliyuncs.com/wod/redis:6.0.9-arm64 registry.cn-qingdao.aliyuncs.com/wod/redis:6.2.6-arm64
    ``` ```
    REAME.md
    View file @ 0970b3e0
    ...@@ -271,7 +271,7 @@ The following table lists the configurable parameters of the Harbor chart and th ...@@ -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.repository` | Repository for clair image | `goharbor/clair-photon` |
    | `clair.clair.image.tag` | Tag for clair image | `dev` | | `clair.clair.image.tag` | Tag for clair image | `dev` |
    | `clair.clair.resources` | The [resources] to allocate for clair container | | | `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.image.tag` | Tag for clair adapter image | `dev` |
    | `clair.adapter.resources` | The [resources] to allocate for clair adapter container | | | `clair.adapter.resources` | The [resources] to allocate for clair adapter container | |
    | `clair.replicas` | The replica count | `1` | | `clair.replicas` | The replica count | `1` |
    ......
    ansible/images.yaml
    View file @ 0970b3e0
    IMAGES: IMAGES:
    - repo: harbor-portal - repo: harbor-portal
    tag: "v2.1.3" tag: 'v2.1.6'
    - repo: harbor-core - repo: harbor-core
    tag: "v2.1.3" tag: 'v2.1.6'
    - repo: harbor-jobservice - repo: harbor-jobservice
    tag: "v2.1.3" tag: 'v2.1.6'
    - repo: harbor-db - repo: harbor-db
    tag: "v2.1.3" tag: 'v2.1.6'
    - repo: harbor-registryctl - repo: harbor-registryctl
    tag: "v2.1.3" tag: 'v2.1.6'
    - repo: harbor-chartmuseum - repo: chartmuseum
    tag: "v2.1.3" tag: 'v0.12.0'
    - repo: harbor-clair - repo: clair
    tag: "v2.1.3" tag: 'v2.1.7'
    - repo: harbor-clair-adapter - repo: harbor-scanner-clair
    tag: "v2.1.3" tag: 'v1.1.1'
    - repo: harbor-trivy-adapter - repo: harbor-scanner-trivy
    tag: "v2.1.3" tag: v0.17.0
    - repo: harbor-notary-server - repo: notary-server
    tag: "v2.1.3" tag: v0.6.1
    - repo: harbor-notary-signer - repo: notary-signer
    tag: "v2.1.3" tag: v0.6.1
    - repo: registry - repo: registry
    tag: "2.7.1" tag: 'v2.7.1'
    - repo: redis - repo: redis
    tag: "6.0.9" tag: '6.2.6'
    \ No newline at end of file
    raws/values-aliyun.yaml
    View file @ 0970b3e0
    ...@@ -7,7 +7,7 @@ expose: ...@@ -7,7 +7,7 @@ expose:
    core: hub.wodcloud.local core: hub.wodcloud.local
    notary: notary.wodcloud.local notary: notary.wodcloud.local
    annotations: annotations:
    ingress.kubernetes.io/proxy-body-size: "0" ingress.kubernetes.io/proxy-body-size: '0'
    externalURL: https://hub.wodcloud.local externalURL: https://hub.wodcloud.local
    ...@@ -15,41 +15,41 @@ persistence: ...@@ -15,41 +15,41 @@ persistence:
    enabled: true enabled: true
    persistentVolumeClaim: persistentVolumeClaim:
    registry: registry:
    existingClaim: "" existingClaim: ''
    storageClass: "hostpath" storageClass: 'hostpath'
    subPath: "" subPath: ''
    accessMode: ReadWriteOnce accessMode: ReadWriteOnce
    size: 5Gi size: 5Gi
    chartmuseum: chartmuseum:
    existingClaim: "" existingClaim: ''
    storageClass: "hostpath" storageClass: 'hostpath'
    subPath: "" subPath: ''
    accessMode: ReadWriteOnce accessMode: ReadWriteOnce
    size: 5Gi size: 5Gi
    jobservice: jobservice:
    existingClaim: "" existingClaim: ''
    storageClass: "hostpath" storageClass: 'hostpath'
    subPath: "" subPath: ''
    accessMode: ReadWriteOnce accessMode: ReadWriteOnce
    size: 1Gi size: 1Gi
    database: database:
    existingClaim: "" existingClaim: ''
    storageClass: "hostpath" storageClass: 'hostpath'
    subPath: "" subPath: ''
    accessMode: ReadWriteOnce accessMode: ReadWriteOnce
    size: 1Gi size: 1Gi
    redis: redis:
    existingClaim: "" existingClaim: ''
    storageClass: "hostpath" storageClass: 'hostpath'
    subPath: "" subPath: ''
    accessMode: ReadWriteOnce accessMode: ReadWriteOnce
    size: 1Gi size: 1Gi
    trivy: trivy:
    existingClaim: "" existingClaim: ''
    storageClass: "hostpath" storageClass: 'hostpath'
    subPath: "" subPath: ''
    accessMode: ReadWriteOnce accessMode: ReadWriteOnce
    size: 5Gi size: 5Gi
    imageChartStorage: imageChartStorage:
    # s3 , filesystem # s3 , filesystem
    type: filesystem type: filesystem
    ...@@ -62,34 +62,34 @@ persistence: ...@@ -62,34 +62,34 @@ persistence:
    encrypt: false encrypt: false
    v4auth: true v4auth: true
    chunksize: '5242880' chunksize: '5242880'
    rootdirectory: / rootdirectory: /
    imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
    logLevel: info logLevel: info
    harborAdminPassword: "spaceIN511" harborAdminPassword: 'spaceIN511'
    secretKey: "IpTIscRIgmerlare" secretKey: 'IpTIscRIgmerlare'
    portal: portal:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-portal repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-portal
    tag: v2.1.3 tag: v2.1.6
    core: core:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core
    tag: v2.1.3 tag: v2.1.6
    jobservice: jobservice:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice
    tag: v2.1.3 tag: v2.1.6
    registry: registry:
    registry: registry:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/registry repository: registry.cn-qingdao.aliyuncs.com/wod/registry
    tag: 2.7.1 tag: v2.7.1
    resources: resources:
    limits: limits:
    memory: 4Gi memory: 4Gi
    ...@@ -98,12 +98,12 @@ registry: ...@@ -98,12 +98,12 @@ registry:
    controller: controller:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl
    tag: v2.1.3 tag: v2.1.6
    chartmuseum: chartmuseum:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-chartmuseum repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum
    tag: v2.1.3 tag: v2.1.6
    nodeSelector: {} nodeSelector: {}
    # nodeSelector: # nodeSelector:
    # harbor: enabled # harbor: enabled
    ...@@ -111,40 +111,40 @@ chartmuseum: ...@@ -111,40 +111,40 @@ chartmuseum:
    type: hostPath type: hostPath
    emptyDir: {} emptyDir: {}
    hostPath: hostPath:
    root: /data root: /data
    clair: clair:
    clair: clair:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair repository: registry.cn-qingdao.aliyuncs.com/wod/clair
    tag: v2.1.3 tag: v2.1.6
    adapter: adapter:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair-adapter repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-scanner-clair
    tag: v2.1.3 tag: v2.1.6
    trivy: trivy:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-trivy-adapter repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-scanner-trivy
    tag: v2.1.3 tag: v2.1.6
    notary: notary:
    server: server:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-server repository: registry.cn-qingdao.aliyuncs.com/wod/notary-server
    tag: v2.1.3 tag: v2.1.6
    signer: signer:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-signer repository: registry.cn-qingdao.aliyuncs.com/wod/notary-signer
    tag: v2.1.3 tag: v2.1.6
    database: database:
    type: internal type: internal
    internal: internal:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
    tag: v2.1.3 tag: v2.1.6
    password: "spaceIN511" password: 'spaceIN511'
    resources: resources:
    limits: limits:
    memory: 4Gi memory: 4Gi
    ...@@ -156,4 +156,4 @@ redis: ...@@ -156,4 +156,4 @@ redis:
    internal: internal:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/redis repository: registry.cn-qingdao.aliyuncs.com/wod/redis
    tag: 6.0.9 tag: 6.2.6
    \ No newline at end of file
    raws/values-arm.yaml
    View file @ 0970b3e0
    ...@@ -7,7 +7,7 @@ expose: ...@@ -7,7 +7,7 @@ expose:
    core: hub.wodcloud.local core: hub.wodcloud.local
    notary: notary.wodcloud.local notary: notary.wodcloud.local
    annotations: annotations:
    ingress.kubernetes.io/proxy-body-size: "0" ingress.kubernetes.io/proxy-body-size: '0'
    externalURL: https://hub.wodcloud.local externalURL: https://hub.wodcloud.local
    ...@@ -15,41 +15,41 @@ persistence: ...@@ -15,41 +15,41 @@ persistence:
    enabled: true enabled: true
    persistentVolumeClaim: persistentVolumeClaim:
    registry: registry:
    existingClaim: "" existingClaim: ''
    storageClass: "hostpath" storageClass: 'hostpath'
    subPath: "" subPath: ''
    accessMode: ReadWriteOnce accessMode: ReadWriteOnce
    size: 5Gi size: 5Gi
    chartmuseum: chartmuseum:
    existingClaim: "" existingClaim: ''
    storageClass: "hostpath" storageClass: 'hostpath'
    subPath: "" subPath: ''
    accessMode: ReadWriteOnce accessMode: ReadWriteOnce
    size: 5Gi size: 5Gi
    jobservice: jobservice:
    existingClaim: "" existingClaim: ''
    storageClass: "hostpath" storageClass: 'hostpath'
    subPath: "" subPath: ''
    accessMode: ReadWriteOnce accessMode: ReadWriteOnce
    size: 1Gi size: 1Gi
    database: database:
    existingClaim: "" existingClaim: ''
    storageClass: "hostpath" storageClass: 'hostpath'
    subPath: "" subPath: ''
    accessMode: ReadWriteOnce accessMode: ReadWriteOnce
    size: 1Gi size: 1Gi
    redis: redis:
    existingClaim: "" existingClaim: ''
    storageClass: "hostpath" storageClass: 'hostpath'
    subPath: "" subPath: ''
    accessMode: ReadWriteOnce accessMode: ReadWriteOnce
    size: 1Gi size: 1Gi
    trivy: trivy:
    existingClaim: "" existingClaim: ''
    storageClass: "hostpath" storageClass: 'hostpath'
    subPath: "" subPath: ''
    accessMode: ReadWriteOnce accessMode: ReadWriteOnce
    size: 5Gi size: 5Gi
    imageChartStorage: imageChartStorage:
    # s3 , filesystem # s3 , filesystem
    type: filesystem type: filesystem
    ...@@ -62,34 +62,34 @@ persistence: ...@@ -62,34 +62,34 @@ persistence:
    encrypt: false encrypt: false
    v4auth: true v4auth: true
    chunksize: '5242880' chunksize: '5242880'
    rootdirectory: / rootdirectory: /
    imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
    logLevel: info logLevel: info
    harborAdminPassword: "spaceIN511" harborAdminPassword: 'spaceIN511'
    secretKey: "IpTIscRIgmerlare" secretKey: 'IpTIscRIgmerlare'
    portal: portal:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-portal repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-portal
    tag: v2.1.3-arm64 tag: v2.1.6-arm64
    core: core:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core
    tag: v2.1.3-arm64 tag: v2.1.6-arm64
    jobservice: jobservice:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice
    tag: v2.1.3-arm64 tag: v2.1.6-arm64
    registry: registry:
    registry: registry:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/registry repository: registry.cn-qingdao.aliyuncs.com/wod/registry
    tag: 2.7.1-arm64 tag: v2.7.1-arm64
    resources: resources:
    limits: limits:
    memory: 4Gi memory: 4Gi
    ...@@ -98,12 +98,12 @@ registry: ...@@ -98,12 +98,12 @@ registry:
    controller: controller:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl
    tag: v2.1.3-arm64 tag: v2.1.6-arm64
    chartmuseum: chartmuseum:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-chartmuseum repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum
    tag: v2.1.3-arm64 tag: v2.1.6-arm64
    nodeSelector: {} nodeSelector: {}
    # nodeSelector: # nodeSelector:
    # harbor: enabled # harbor: enabled
    ...@@ -111,40 +111,40 @@ chartmuseum: ...@@ -111,40 +111,40 @@ chartmuseum:
    type: hostPath type: hostPath
    emptyDir: {} emptyDir: {}
    hostPath: hostPath:
    root: /data root: /data
    clair: clair:
    clair: clair:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair repository: registry.cn-qingdao.aliyuncs.com/wod/clair
    tag: v2.1.3-arm64 tag: v2.1.6-arm64
    adapter: adapter:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair-adapter repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-scanner-clair
    tag: v2.1.3-arm64 tag: v2.1.6-arm64
    trivy: trivy:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-trivy-adapter repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-scanner-trivy
    tag: v2.1.3-arm64 tag: v2.1.6-arm64
    notary: notary:
    server: server:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-server repository: registry.cn-qingdao.aliyuncs.com/wod/notary-server
    tag: v2.1.3-arm64 tag: v2.1.6-arm64
    signer: signer:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-notary-signer repository: registry.cn-qingdao.aliyuncs.com/wod/notary-signer
    tag: v2.1.3-arm64 tag: v2.1.6-arm64
    database: database:
    type: internal type: internal
    internal: internal:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
    tag: v2.1.3-arm64 tag: v2.1.6-arm64
    password: "spaceIN511" password: 'spaceIN511'
    resources: resources:
    limits: limits:
    memory: 4Gi memory: 4Gi
    ...@@ -156,4 +156,4 @@ redis: ...@@ -156,4 +156,4 @@ redis:
    internal: internal:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/redis repository: registry.cn-qingdao.aliyuncs.com/wod/redis
    tag: 6.0.9-arm64 tag: 6.2.6-arm64
    \ No newline at end of file
    raws/values-pg.yaml
    View file @ 0970b3e0
    ...@@ -7,7 +7,7 @@ expose: ...@@ -7,7 +7,7 @@ expose:
    core: hub.test.wodcloud.com core: hub.test.wodcloud.com
    notary: notary.test.wodcloud.com notary: notary.test.wodcloud.com
    annotations: annotations:
    ingress.kubernetes.io/proxy-body-size: "0" ingress.kubernetes.io/proxy-body-size: '0'
    externalURL: https://hub.test.wodcloud.com externalURL: https://hub.test.wodcloud.com
    ...@@ -19,21 +19,21 @@ persistence: ...@@ -19,21 +19,21 @@ persistence:
    filesystem: filesystem:
    rootdirectory: /data rootdirectory: /data
    #s3: #s3:
    # accesskey: AKIAIOSFODNN7EXAMPLE # accesskey: AKIAIOSFODNN7EXAMPLE
    # secretkey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY # secretkey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
    # region: us-east-1 # region: us-east-1
    # regionendpoint: https://minio.sxwh.local # regionendpoint: https://minio.sxwh.local
    # bucket: registry # bucket: registry
    # encrypt: false # encrypt: false
    # v4auth: true # v4auth: true
    # chunksize: '5242880' # chunksize: '5242880'
    # rootdirectory: / # rootdirectory: /
    imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
    logLevel: info logLevel: info
    harborAdminPassword: "spaceIN511" harborAdminPassword: 'spaceIN511'
    secretKey: "IpTIscRIgmerlare" secretKey: 'IpTIscRIgmerlare'
    portal: portal:
    image: image:
    ...@@ -59,14 +59,14 @@ registry: ...@@ -59,14 +59,14 @@ registry:
    registry: registry:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/registry repository: registry.cn-qingdao.aliyuncs.com/wod/registry
    tag: 2.7.1 tag: v2.7.1
    resources: resources:
    limits: limits:
    memory: 4Gi memory: 4Gi
    requests: requests:
    memory: 256Mi memory: 256Mi
    nodeSelector: nodeSelector:
    harbor: enabled harbor: enabled
    storageSpec: storageSpec:
    # type: emptyDir , hostPath , volumeClaimTemplate # type: emptyDir , hostPath , volumeClaimTemplate
    type: hostPath type: hostPath
    ...@@ -76,11 +76,11 @@ registry: ...@@ -76,11 +76,11 @@ registry:
    volumeClaimTemplate: volumeClaimTemplate:
    spec: spec:
    storageClassName: rook-ceph-block storageClassName: rook-ceph-block
    accessModes: ["ReadWriteOnce"] accessModes: ['ReadWriteOnce']
    resources: resources:
    requests: requests:
    storage: 100Gi storage: 100Gi
    selector: {} selector: {}
    controller: controller:
    image: image:
    ...@@ -95,12 +95,12 @@ chartmuseum: ...@@ -95,12 +95,12 @@ chartmuseum:
    tag: v0.9.0-v1.8.2 tag: v0.9.0-v1.8.2
    replicas: 1 replicas: 1
    nodeSelector: nodeSelector:
    harbor: enabled harbor: enabled
    storageSpec: storageSpec:
    type: hostPath type: hostPath
    emptyDir: {} emptyDir: {}
    hostPath: hostPath:
    root: /data root: /data
    clair: clair:
    enabled: true enabled: true
    ...@@ -128,7 +128,7 @@ database: ...@@ -128,7 +128,7 @@ database:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
    tag: v1.8.2 tag: v1.8.2
    password: "spaceIN511" password: 'spaceIN511'
    resources: resources:
    limits: limits:
    memory: 4Gi memory: 4Gi
    ...@@ -140,11 +140,11 @@ database: ...@@ -140,11 +140,11 @@ database:
    type: hostPath type: hostPath
    emptyDir: {} emptyDir: {}
    hostPath: hostPath:
    root: /data root: /data
    volumeClaimTemplate: volumeClaimTemplate:
    spec: spec:
    storageClassName: rook-ceph-block storageClassName: rook-ceph-block
    accessModes: ["ReadWriteOnce"] accessModes: ['ReadWriteOnce']
    resources: resources:
    requests: requests:
    storage: 20Gi storage: 20Gi
    ...@@ -155,4 +155,4 @@ redis: ...@@ -155,4 +155,4 @@ redis:
    internal: internal:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/redis repository: registry.cn-qingdao.aliyuncs.com/wod/redis
    tag: 4.0.14-alpine tag: 4.0.14-alpine
    \ No newline at end of file
    raws/values-ppc64le.yaml
    View file @ 0970b3e0
    ...@@ -7,7 +7,7 @@ expose: ...@@ -7,7 +7,7 @@ expose:
    core: hub.wodcloud.local core: hub.wodcloud.local
    notary: notary.wodcloud.local notary: notary.wodcloud.local
    annotations: annotations:
    ingress.kubernetes.io/proxy-body-size: "0" ingress.kubernetes.io/proxy-body-size: '0'
    externalURL: https://hub.wodcloud.local externalURL: https://hub.wodcloud.local
    ...@@ -15,41 +15,41 @@ persistence: ...@@ -15,41 +15,41 @@ persistence:
    enabled: true enabled: true
    persistentVolumeClaim: persistentVolumeClaim:
    registry: registry:
    existingClaim: "" existingClaim: ''
    storageClass: "hostpath" storageClass: 'hostpath'
    subPath: "" subPath: ''
    accessMode: ReadWriteOnce accessMode: ReadWriteOnce
    size: 5Gi size: 5Gi
    chartmuseum: chartmuseum:
    existingClaim: "" existingClaim: ''
    storageClass: "hostpath" storageClass: 'hostpath'
    subPath: "" subPath: ''
    accessMode: ReadWriteOnce accessMode: ReadWriteOnce
    size: 5Gi size: 5Gi
    jobservice: jobservice:
    existingClaim: "" existingClaim: ''
    storageClass: "hostpath" storageClass: 'hostpath'
    subPath: "" subPath: ''
    accessMode: ReadWriteOnce accessMode: ReadWriteOnce
    size: 1Gi size: 1Gi
    database: database:
    existingClaim: "" existingClaim: ''
    storageClass: "hostpath" storageClass: 'hostpath'
    subPath: "" subPath: ''
    accessMode: ReadWriteOnce accessMode: ReadWriteOnce
    size: 1Gi size: 1Gi
    redis: redis:
    existingClaim: "" existingClaim: ''
    storageClass: "hostpath" storageClass: 'hostpath'
    subPath: "" subPath: ''
    accessMode: ReadWriteOnce accessMode: ReadWriteOnce
    size: 1Gi size: 1Gi
    trivy: trivy:
    existingClaim: "" existingClaim: ''
    storageClass: "hostpath" storageClass: 'hostpath'
    subPath: "" subPath: ''
    accessMode: ReadWriteOnce accessMode: ReadWriteOnce
    size: 5Gi size: 5Gi
    imageChartStorage: imageChartStorage:
    # s3 , filesystem # s3 , filesystem
    type: filesystem type: filesystem
    ...@@ -62,34 +62,34 @@ persistence: ...@@ -62,34 +62,34 @@ persistence:
    encrypt: false encrypt: false
    v4auth: true v4auth: true
    chunksize: '5242880' chunksize: '5242880'
    rootdirectory: / rootdirectory: /
    imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
    logLevel: info logLevel: info
    harborAdminPassword: "spaceIN511" harborAdminPassword: 'spaceIN511'
    secretKey: "IpTIscRIgmerlare" secretKey: 'IpTIscRIgmerlare'
    portal: portal:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-portal repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-portal
    tag: v2.1.3-ppc64le tag: v2.1.6-ppc64le
    core: core:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-core
    tag: v2.1.3-ppc64le tag: v2.1.6-ppc64le
    jobservice: jobservice:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-jobservice
    tag: v2.1.3-ppc64le tag: v2.1.6-ppc64le
    registry: registry:
    registry: registry:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/registry repository: registry.cn-qingdao.aliyuncs.com/wod/registry
    tag: 2.7.1-ppc64le tag: v2.7.1-ppc64le
    resources: resources:
    limits: limits:
    memory: 4Gi memory: 4Gi
    ...@@ -98,11 +98,11 @@ registry: ...@@ -98,11 +98,11 @@ registry:
    controller: controller:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-registryctl
    tag: v2.1.3-ppc64le tag: v2.1.6-ppc64le
    chartmuseum: chartmuseum:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-chartmuseum repository: registry.cn-qingdao.aliyuncs.com/wod/chartmuseum
    tag: v2.1.1-ppc64le tag: v2.1.1-ppc64le
    nodeSelector: {} nodeSelector: {}
    # nodeSelector: # nodeSelector:
    ...@@ -111,31 +111,31 @@ chartmuseum: ...@@ -111,31 +111,31 @@ chartmuseum:
    type: hostPath type: hostPath
    emptyDir: {} emptyDir: {}
    hostPath: hostPath:
    root: /data root: /data
    clair: clair:
    clair: clair:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-clair repository: registry.cn-qingdao.aliyuncs.com/wod/clair
    tag: v2.1.1-ppc64le tag: v2.1.1-ppc64le
    adapter: adapter:
    image: 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 tag: v2.1.1-ppc64le
    trivy: trivy:
    image: 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 tag: v2.1.1-ppc64le
    notary: notary:
    server: server:
    image: 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 tag: v2.1.1-ppc64le
    signer: signer:
    image: 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 tag: v2.1.1-ppc64le
    database: database:
    ...@@ -143,8 +143,8 @@ database: ...@@ -143,8 +143,8 @@ database:
    internal: internal:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db repository: registry.cn-qingdao.aliyuncs.com/wod/harbor-db
    tag: v2.1.3-ppc64le tag: v2.1.6-ppc64le
    password: "spaceIN511" password: 'spaceIN511'
    resources: resources:
    limits: limits:
    memory: 4Gi memory: 4Gi
    ...@@ -156,4 +156,4 @@ redis: ...@@ -156,4 +156,4 @@ redis:
    internal: internal:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/redis repository: registry.cn-qingdao.aliyuncs.com/wod/redis
    tag: 6.0.9-ppc64le tag: 6.2.6-ppc64le
    \ No newline at end of file
    raws/values-stolon.yaml
    View file @ 0970b3e0
    ...@@ -7,7 +7,7 @@ expose: ...@@ -7,7 +7,7 @@ expose:
    core: hub.test.wodcloud.com core: hub.test.wodcloud.com
    notary: notary.test.wodcloud.com notary: notary.test.wodcloud.com
    annotations: annotations:
    ingress.kubernetes.io/proxy-body-size: "0" ingress.kubernetes.io/proxy-body-size: '0'
    externalURL: https://hub.test.wodcloud.com externalURL: https://hub.test.wodcloud.com
    ...@@ -19,21 +19,21 @@ persistence: ...@@ -19,21 +19,21 @@ persistence:
    filesystem: filesystem:
    rootdirectory: /data rootdirectory: /data
    #s3: #s3:
    # accesskey: AKIAIOSFODNN7EXAMPLE # accesskey: AKIAIOSFODNN7EXAMPLE
    # secretkey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY # secretkey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
    # region: us-east-1 # region: us-east-1
    # regionendpoint: https://minio.sxwh.local # regionendpoint: https://minio.sxwh.local
    # bucket: registry # bucket: registry
    # encrypt: false # encrypt: false
    # v4auth: true # v4auth: true
    # chunksize: '5242880' # chunksize: '5242880'
    # rootdirectory: / # rootdirectory: /
    imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
    logLevel: info logLevel: info
    harborAdminPassword: "spaceIN511" harborAdminPassword: 'spaceIN511'
    secretKey: "IpTIscRIgmerlare" secretKey: 'IpTIscRIgmerlare'
    portal: portal:
    image: image:
    ...@@ -59,14 +59,14 @@ registry: ...@@ -59,14 +59,14 @@ registry:
    registry: registry:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/registry repository: registry.cn-qingdao.aliyuncs.com/wod/registry
    tag: 2.7.1 tag: v2.7.1
    resources: resources:
    limits: limits:
    memory: 4Gi memory: 4Gi
    requests: requests:
    memory: 256Mi memory: 256Mi
    nodeSelector: nodeSelector:
    harbor: enabled harbor: enabled
    storageSpec: storageSpec:
    # type: emptyDir , hostPath , volumeClaimTemplate # type: emptyDir , hostPath , volumeClaimTemplate
    type: hostPath type: hostPath
    ...@@ -76,11 +76,11 @@ registry: ...@@ -76,11 +76,11 @@ registry:
    volumeClaimTemplate: volumeClaimTemplate:
    spec: spec:
    storageClassName: rook-ceph-block storageClassName: rook-ceph-block
    accessModes: ["ReadWriteOnce"] accessModes: ['ReadWriteOnce']
    resources: resources:
    requests: requests:
    storage: 100Gi storage: 100Gi
    selector: {} selector: {}
    controller: controller:
    image: image:
    ...@@ -95,12 +95,12 @@ chartmuseum: ...@@ -95,12 +95,12 @@ chartmuseum:
    tag: v0.9.0-v1.8.2 tag: v0.9.0-v1.8.2
    replicas: 1 replicas: 1
    nodeSelector: nodeSelector:
    harbor: enabled harbor: enabled
    storageSpec: storageSpec:
    type: hostPath type: hostPath
    emptyDir: {} emptyDir: {}
    hostPath: hostPath:
    root: /data root: /data
    clair: clair:
    enabled: true enabled: true
    ...@@ -125,19 +125,19 @@ notary: ...@@ -125,19 +125,19 @@ notary:
    database: database:
    type: external type: external
    external: external:
    host: "stolon-proxy.devops" host: 'stolon-proxy.devops'
    port: "5432" port: '5432'
    username: "postgres" username: 'postgres'
    password: "spaceIN511" password: 'spaceIN511'
    coreDatabase: "hub_registry" coreDatabase: 'hub_registry'
    clairDatabase: "hub_clair" clairDatabase: 'hub_clair'
    notaryServerDatabase: "hub_notary_server" notaryServerDatabase: 'hub_notary_server'
    notarySignerDatabase: "hub_notary_signer" notarySignerDatabase: 'hub_notary_signer'
    sslmode: "disable" sslmode: 'disable'
    redis: redis:
    type: internal type: internal
    internal: internal:
    image: image:
    repository: registry.cn-qingdao.aliyuncs.com/wod/redis repository: registry.cn-qingdao.aliyuncs.com/wod/redis
    tag: 4.0.14-alpine tag: 4.0.14-alpine
    \ No newline at end of file
    raws/values.yaml
    View file @ 0970b3e0
    This diff is collapsed.
    values.yaml
    View file @ 0970b3e0
    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