Skip to content

Commit

Permalink
Merge pull request #1005 from ninjadq/1.5.0
Browse files Browse the repository at this point in the history
Bump up OSS Harbor to v2.1.6
  • Loading branch information
ninjadq authored Jul 14, 2021
2 parents d638e84 + dfc9431 commit 7741fbf
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -55,4 +55,4 @@ jobs:
- name: Run integration tests
working-directory: ./test
run:
go test -v -timeout 30m github.com/goharbor/harbor-helm/integration
go test -v -timeout 30m github.com/goharbor/harbor-helm/integration
4 changes: 2 additions & 2 deletions Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
28 changes: 14 additions & 14 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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: ""
Expand All @@ -470,15 +470,15 @@ registry:
registry:
image:
repository: goharbor/registry-photon
tag: v2.1.5
tag: v2.1.6
# resources:
# requests:
# memory: 256Mi
# cpu: 100m
controller:
image:
repository: goharbor/harbor-registryctl
tag: v2.1.5
tag: v2.1.6

# resources:
# requests:
Expand Down Expand Up @@ -525,7 +525,7 @@ chartmuseum:
absoluteUrl: false
image:
repository: goharbor/chartmuseum-photon
tag: v2.1.5
tag: v2.1.6
replicas: 1
# resources:
# requests:
Expand All @@ -544,15 +544,15 @@ clair:
clair:
image:
repository: goharbor/clair-photon
tag: v2.1.5
tag: v2.1.6
# resources:
# requests:
# memory: 256Mi
# cpu: 100m
adapter:
image:
repository: goharbor/clair-adapter-photon
tag: v2.1.5
tag: v2.1.6
# resources:
# requests:
# memory: 256Mi
Expand All @@ -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
Expand Down Expand Up @@ -631,7 +631,7 @@ notary:
serviceAccountName: ""
image:
repository: goharbor/notary-server-photon
tag: v2.1.5
tag: v2.1.6
replicas: 1
# resources:
# requests:
Expand All @@ -642,7 +642,7 @@ notary:
serviceAccountName: ""
image:
repository: goharbor/notary-signer-photon
tag: v2.1.5
tag: v2.1.6
replicas: 1
# resources:
# requests:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -716,7 +716,7 @@ redis:
serviceAccountName: ""
image:
repository: goharbor/redis-photon
tag: v2.1.5
tag: v2.1.6
# resources:
# requests:
# memory: 256Mi
Expand Down

0 comments on commit 7741fbf

Please sign in to comment.