From dfc9431534d73c3f88108c51e4fdbc4438c03d4a Mon Sep 17 00:00:00 2001
From: DQ <dengq@vmware.com>
Date: Fri, 9 Jul 2021 17:02:09 +0800
Subject: [PATCH] Bump up OSS Harbor to v2.1.6

Signed-off-by: DQ <dengq@vmware.com>
---
 .github/workflows/integration.yaml | 14 +++++++-------
 Chart.yaml                         |  4 ++--
 values.yaml                        | 28 ++++++++++++++--------------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index 10d3aa104..23319d5a3 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -9,22 +9,22 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        k8s_version: [v1.18.2, v1.17.5, v1.16.9]
+        k8s_version: [v1.20.0, v1.19.4, v1.18.8]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
       - name: Setup Docker
-        uses: docker-practice/actions-setup-docker@0.0.1
+        uses: docker-practice/actions-setup-docker@v1
         with:
-          docker_version: 18.09
+          docker_version: "20.10"
           docker_channel: stable
           docker_daemon_json: '{"insecure-registries":["0.0.0.0/0"]}'
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.0.0-rc.1
+        uses: helm/kind-action@v1.1.0
         with:
-          version: v0.8.1
+          version: v0.11.1
           node_image: kindest/node:${{ matrix.k8s_version }}
           cluster_name: kind-cluster-${{ matrix.k8s_version }}
           config: test/integration/kind-cluster.yaml
@@ -37,7 +37,7 @@ jobs:
       - name: Set up Go 1.13
         uses: actions/setup-go@v2
         with:
-          go-version: 1.13
+          go-version: "1.13"
 
       - name: Cache go mod
         uses: actions/cache@v2
@@ -55,4 +55,4 @@ jobs:
       - name: Run integration tests
         working-directory: ./test
         run:
-          go test -v -timeout 30m github.com/goharbor/harbor-helm/integration
\ No newline at end of file
+          go test -v -timeout 30m github.com/goharbor/harbor-helm/integration
diff --git a/Chart.yaml b/Chart.yaml
index 6c77c100a..e67cacd05 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: harbor
-version: 1.5.5
-appVersion: 2.1.5
+version: 1.5.6
+appVersion: 2.1.6
 description: An open source trusted cloud native registry that stores, signs, and scans content
 keywords:
 - docker
diff --git a/values.yaml b/values.yaml
index bb453c3a7..6708ca787 100644
--- a/values.yaml
+++ b/values.yaml
@@ -375,7 +375,7 @@ proxy:
 nginx:
   image:
     repository: goharbor/nginx-photon
-    tag: v2.1.5
+    tag: v2.1.6
   # set the service account to be used, default if left empty
   serviceAccountName: ""
   replicas: 1
@@ -392,7 +392,7 @@ nginx:
 portal:
   image:
     repository: goharbor/harbor-portal
-    tag: v2.1.5
+    tag: v2.1.6
   # set the service account to be used, default if left empty
   serviceAccountName: ""
   replicas: 1
@@ -409,7 +409,7 @@ portal:
 core:
   image:
     repository: goharbor/harbor-core
-    tag: v2.1.5
+    tag: v2.1.6
   # set the service account to be used, default if left empty
   serviceAccountName: ""
   replicas: 1
@@ -443,7 +443,7 @@ core:
 jobservice:
   image:
     repository: goharbor/harbor-jobservice
-    tag: v2.1.5
+    tag: v2.1.6
   replicas: 1
   # set the service account to be used, default if left empty
   serviceAccountName: ""
@@ -470,7 +470,7 @@ registry:
   registry:
     image:
       repository: goharbor/registry-photon
-      tag: v2.1.5
+      tag: v2.1.6
     # resources:
     #  requests:
     #    memory: 256Mi
@@ -478,7 +478,7 @@ registry:
   controller:
     image:
       repository: goharbor/harbor-registryctl
-      tag: v2.1.5
+      tag: v2.1.6
 
     # resources:
     #  requests:
@@ -525,7 +525,7 @@ chartmuseum:
   absoluteUrl: false
   image:
     repository: goharbor/chartmuseum-photon
-    tag: v2.1.5
+    tag: v2.1.6
   replicas: 1
   # resources:
   #  requests:
@@ -544,7 +544,7 @@ clair:
   clair:
     image:
       repository: goharbor/clair-photon
-      tag: v2.1.5
+      tag: v2.1.6
     # resources:
     #  requests:
     #    memory: 256Mi
@@ -552,7 +552,7 @@ clair:
   adapter:
     image:
       repository: goharbor/clair-adapter-photon
-      tag: v2.1.5
+      tag: v2.1.6
     # resources:
     #  requests:
     #    memory: 256Mi
@@ -574,7 +574,7 @@ trivy:
     # repository the repository for Trivy adapter image
     repository: goharbor/trivy-adapter-photon
     # tag the tag for Trivy adapter image
-    tag: v2.1.5
+    tag: v2.1.6
   # set the service account to be used, default if left empty
   serviceAccountName: ""
   # replicas the number of Pod replicas
@@ -631,7 +631,7 @@ notary:
     serviceAccountName: ""
     image:
       repository: goharbor/notary-server-photon
-      tag: v2.1.5
+      tag: v2.1.6
     replicas: 1
     # resources:
     #  requests:
@@ -642,7 +642,7 @@ notary:
     serviceAccountName: ""
     image:
       repository: goharbor/notary-signer-photon
-      tag: v2.1.5
+      tag: v2.1.6
     replicas: 1
     # resources:
     #  requests:
@@ -670,7 +670,7 @@ database:
     serviceAccountName: ""
     image:
       repository: goharbor/harbor-db
-      tag: v2.1.5
+      tag: v2.1.6
     # The initial superuser password for internal database
     password: "changeit"
     # resources:
@@ -716,7 +716,7 @@ redis:
     serviceAccountName: ""
     image:
       repository: goharbor/redis-photon
-      tag: v2.1.5
+      tag: v2.1.6
     # resources:
     #  requests:
     #    memory: 256Mi