Skip to content

Commit 4becbeb

Browse files
author
Maurice Faber
committed
fix: harbor tasks updated to new version
1 parent 9f6720b commit 4becbeb

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

values/harbor/harbor.gotmpl

+2
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ internalTLS:
122122
enabled: false
123123

124124
jobservice:
125+
jobLoggers:
126+
- stdout
125127
podAnnotations:
126128
policy.otomi.io/ignore: psp-allowed-users
127129
resources:

values/jobs/harbor.gotmpl

+9-11
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@
88
{{- $hasKeycloak := $k | get "enabled" true }}
99
{{- $realm := $k | get "realm" "master" }}
1010
{{- $keycloakIssuer := printf "https://keycloak.%s/realms/%s" $v.cluster.domainSuffix $realm }}
11-
{{- $hasHarbor := $h | get "enabled" false -}}
11+
{{- $harborRepo := printf "harbor.%s" $v.cluster.domainSuffix }}
1212
{{- $teams := keys $v.teamConfig.teams }}
13-
{{- $teamNames := list -}}
14-
{{- range $teams -}}
15-
{{- $teamNames = print "team-" . | append $teamNames -}}
16-
{{- end -}}
1713

1814
type: Job
1915
enabled: true
@@ -22,20 +18,22 @@ description: Configure OIDC as a primary auhentication method and populate teams
2218
name: harbor
2319
image:
2420
repository: otomi/tasks
25-
tag: v0.2.6
21+
tag: v0.2.7
2622
pullPolicy: IfNotPresent
2723
nativeSecrets:
2824
HARBOR_PASSWORD: {{ $h | get "adminPassword" $v.otomi.adminPassword }}
2925
HARBOR_USER: admin
3026
OIDC_CLIENT_ID: {{ $hasKeycloak | ternary $k.idp.clientID $o.clientID }}
3127
OIDC_CLIENT_SECRET: {{ $hasKeycloak | ternary $k.idp.clientSecret $o.clientSecret }}
3228
env:
33-
HARBOR_BASE_URL: "http://harbor-core.harbor/api/v2.0"
34-
TEAM_NAMES: '{{ $teamNames | sortAlpha | toJson }}'
29+
DEBUG: '*'
30+
HARBOR_BASE_URL: http://harbor-core.harbor/api/v2.0
31+
HARBOR_BASE_REPO_URL: {{ $harborRepo }}
32+
TEAM_IDS: '{{ $teams | sortAlpha | toJson }}'
3533
OIDC_ENDPOINT: '{{ $hasKeycloak | ternary $keycloakIssuer $o.issuer }}'
36-
OIDC_GROUPS_CLAIM: 'groups'
37-
OIDC_NAME: 'keycloak'
38-
OIDC_SCOPE: 'openid'
34+
OIDC_GROUPS_CLAIM: groups
35+
OIDC_NAME: keycloak
36+
OIDC_SCOPE: openid
3937
OIDC_VERIFY_CERT: '{{ not $skipVerify }}'
4038
script: {{ if $skipVerify }}NODE_TLS_REJECT_UNAUTHORIZED=0 {{ end }}npm run tasks:harbor
4139
runPolicy: OnSpecChange

0 commit comments

Comments
 (0)