Skip to content

Commit

Permalink
fix(ci) support certmanager 1.4 (#697)
Browse files Browse the repository at this point in the history
Signed-off-by: Ziming Zhang <zziming@vmware.com>
  • Loading branch information
bitsf committed Jul 13, 2021
1 parent c173de0 commit 599e7a1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ jobs:
certManager:
- "1.1.1"
# - "1.2.0"
- "1.3.1"
- "1.4.0"

# https://snapcraft.io/microk8s
k8sVersion:
Expand Down Expand Up @@ -221,6 +221,8 @@ jobs:
exit 1
fi
sleep 10
- name: install harbor
run: |
set -ex
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ Harbor operator supports two extra Kubernetes versions besides the current lates

Harbor operator relies on cert manager to manage kinds of certificates used by Harbor cluster components. Table shown below lists the compatibilities of cert manager versions:

| Versions | 1.0.4 | 1.2.0 | 1.3.1 |
|---------------|--------------------|--------------------|----------------------|
| Compatibility | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
| Versions | 1.1.1 | 1.2.0 | 1.3.1 | 1.4.0 |
|---------------|--------------------|--------------------|----------------------|----------------------|
| Compatibility | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |

### Ingress controller types

Expand Down
2 changes: 1 addition & 1 deletion controllers/goharbor/harbor/notarysigner.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func (r *Reconciler) GetNotarySignerCertificateAuthority(ctx context.Context, ha
Duration: &metav1.Duration{
Duration: duration,
},
CommonName: r.NormalizeName(ctx, harbor.GetName(), controllers.NotarySigner.String()),
CommonName: r.NormalizeName(ctx, harbor.GetName(), controllers.NotarySigner.String(), "CA"),
IsCA: true,
Usages: []certv1.KeyUsage{
certv1.UsageClientAuth,
Expand Down

0 comments on commit 599e7a1

Please sign in to comment.