[pull] master from goharbor:master

.github/workflows/integration.yaml

@@ -9,22 +9,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        k8s_version: [v1.22.0, v1.21.1, v1.20.7]
+        k8s_version: [v1.25.3, v1.24.7, v1.23.13]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Setup Docker
-        uses: docker-practice/actions-setup-docker@v1
-        with:
-          docker_version: "20.10"
-          docker_channel: stable
-          docker_daemon_json: '{"insecure-registries":["0.0.0.0/0"]}'
-
       - name: Create kind cluster
         uses: helm/[email protected]
         with:
-          version: v0.11.1
+          version: v0.17.0
           node_image: kindest/node:${{ matrix.k8s_version }}
           cluster_name: kind-cluster-${{ matrix.k8s_version }}
           config: test/integration/kind-cluster.yaml
@@ -34,10 +27,10 @@ jobs:
           kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.0.3/deploy/static/provider/kind/deploy.yaml
           kubectl wait --namespace ingress-nginx --for=condition=ready pod --selector=app.kubernetes.io/component=controller --timeout=120s
 
-      - name: Set up Go 1.13
+      - name: Set up Go 1.19
         uses: actions/setup-go@v2
         with:
-          go-version: "1.13"
+          go-version: "1.19"
 
       - name: Cache go mod
         uses: actions/cache@v2
@@ -50,7 +43,6 @@ jobs:
       - name: Set /etc/hosts
         run: |
          sudo -- sh -c "echo '127.0.0.1 harbor.local' >> /etc/hosts"
-         sudo -- sh -c "echo '127.0.0.1 notary.harbor.local' >> /etc/hosts"
 
       - name: Run integration tests
         working-directory: ./test
@@ -63,7 +55,7 @@ jobs:
           df -h
           free -m
           mkdir -p /tmp/harbor
-          for name in core jobservice registry registryctl trivy chartmuseum notaryserver notarysigner portal redis database; do \
+          for name in core jobservice registry registryctl trivy portal redis database; do \
             kubectl -n default logs -l "component=$name" --all-containers > /tmp/harbor/$name.log ; \
           done
 

.github/workflows/lint.yaml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        helm_version: [3.2.3]
+        helm_version: [3.11.1]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.github/workflows/unittest.yaml

@@ -11,15 +11,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Set up Helm 3.2.3
+      - name: Set up Helm 3.11.1
         uses: azure/setup-helm@v1
         with:
-          version: '3.2.3'
+          version: '3.11.1'
 
-      - name: Set up Go 1.13
+      - name: Set up Go 1.19
         uses: actions/setup-go@v2
         with:
-          go-version: 1.13
+          go-version: 1.19
 
       - name: Cache go mod
         uses: actions/cache@v2

Chart.yaml

@@ -8,7 +8,7 @@ keywords:
 - registry
 - harbor
 home: https://goharbor.io
-icon: https://raw.githubusercontent.com/goharbor/website/master/static/img/logos/harbor-icon-color.png
+icon: https://raw.githubusercontent.com/goharbor/website/main/static/img/logos/harbor-icon-color.png
 sources:
 - https://github.com/goharbor/harbor
 - https://github.com/goharbor/harbor-helm

docs/High Availability.md

@@ -39,29 +39,29 @@ helm fetch harbor/harbor --untar
 Configure the following items in `values.yaml`, you can also set them as parameters via `--set` flag during running `helm install`:
 
 - **Ingress rule**
-   Configure the `expose.ingress.hosts.core` and `expose.ingress.hosts.notary`.
+   Configure the `expose.ingress.hosts.core`.
 - **External URL**
    Configure the `externalURL`.
 - **External PostgreSQL**
    Set the `database.type` to `external` and fill the information in `database.external` section.
 
-   Four empty databases should be created manually for `Harbor core`, `Notary server` and `Notary signer` and configure them in the section. Harbor will create tables automatically when starting up.
+   Four empty databases should be created manually for `Harbor core`, and configure them in the section. Harbor will create tables automatically when starting up.
 - **External Redis**
    Set the `redis.type` to `external` and fill the information in `redis.external` section.
    Redis sentinel is supported after v1.9.0, configure the `redis.external.sentinelMasterSet` and `redis.external.addr` to enable it.
 - **Storage**
    By default, a default `StorageClass` is needed in the K8S cluster to provision volumes to store images, charts and job logs.
 
-   If you want to specify the `StorageClass`, set `persistence.persistentVolumeClaim.registry.storageClass`, `persistence.persistentVolumeClaim.chartmuseum.storageClass` and `persistence.persistentVolumeClaim.jobservice.storageClass`.
+   If you want to specify the `StorageClass`, set `persistence.persistentVolumeClaim.registry.storageClass` and `persistence.persistentVolumeClaim.jobservice.storageClass`.
 
-   If you use `StorageClass`, for both default or specified one, set `persistence.persistentVolumeClaim.registry.accessMode`, `persistence.persistentVolumeClaim.chartmuseum.accessMode` and `persistence.persistentVolumeClaim.jobservice.accessMode` as `ReadWriteMany`, and make sure that the persistent volumes must can be shared cross different nodes.
+   If you use `StorageClass`, for both default or specified one, set `persistence.persistentVolumeClaim.registry.accessMode` and `persistence.persistentVolumeClaim.jobservice.accessMode` as `ReadWriteMany`, and make sure that the persistent volumes must can be shared cross different nodes.
 
-   You can also use the existing PVCs to store data, set `persistence.persistentVolumeClaim.registry.existingClaim`, `persistence.persistentVolumeClaim.chartmuseum.existingClaim` and `persistence.persistentVolumeClaim.jobservice.existingClaim`.
+   You can also use the existing PVCs to store data, set `persistence.persistentVolumeClaim.registry.existingClaim` and `persistence.persistentVolumeClaim.jobservice.existingClaim`.
 
    If you have no PVCs that can be shared across nodes, you can use external object storage to store images and charts and store the job logs in database. Set the `persistence.imageChartStorage.type` to the value you want to use and fill the corresponding section and set `jobservice.jobLoggers` to `database`.
 
 - **Replica**
-   Set `portal.replicas`, `core.replicas`, `jobservice.replicas`, `registry.replicas`, `chartmuseum.replicas`, `notary.server.replicas` and `notary.signer.replicas` to `n`(`n`>=2).
+   Set `portal.replicas`, `core.replicas`, `jobservice.replicas`, `registry.replicas` to `n`(`n`>=2).
 
 ### Installation