diff --git a/services/harbor/helmrelease.yaml b/services/harbor/helmrelease.yaml index ddb8dab..887e97f 100644 --- a/services/harbor/helmrelease.yaml +++ b/services/harbor/helmrelease.yaml @@ -17,6 +17,7 @@ spec: namespace: flux-system values: externalURL: https://registry.bstein.dev + imagePullPolicy: IfNotPresent expose: type: ingress tls: @@ -59,6 +60,9 @@ spec: existingSecret: harbor-db sslmode: disable redis: + image: + repository: registry.bstein.dev/infra/harbor-redis + tag: v2.14.1-arm64 type: internal internal: affinity: @@ -68,20 +72,20 @@ spec: - matchExpressions: - key: kubernetes.io/arch operator: In - values: [ "amd64" ] + values: [ "arm64" ] preferredDuringSchedulingIgnoredDuringExecution: - weight: 90 preference: matchExpressions: - - key: kubernetes.io/hostname + - key: hardware operator: In - values: [ "titan-22" ] - - weight: 10 + values: [ "rpi5" ] + - weight: 50 preference: matchExpressions: - - key: kubernetes.io/hostname + - key: hardware operator: In - values: [ "titan-24" ] + values: [ "rpi4" ] trivy: enabled: false metrics: @@ -92,6 +96,9 @@ spec: existingSecretAdminPasswordKey: harbor_admin_password existingSecretSecretKey: harbor-core core: + image: + repository: registry.bstein.dev/infra/harbor-core + tag: v2.14.1-arm64 existingSecret: harbor-core existingXsrfSecret: harbor-core existingXsrfSecretKey: CSRF_KEY @@ -102,21 +109,24 @@ spec: - matchExpressions: - key: kubernetes.io/arch operator: In - values: [ "amd64" ] + values: [ "arm64" ] preferredDuringSchedulingIgnoredDuringExecution: - weight: 90 preference: matchExpressions: - - key: kubernetes.io/hostname + - key: hardware operator: In - values: [ "titan-22" ] - - weight: 10 + values: [ "rpi5" ] + - weight: 50 preference: matchExpressions: - - key: kubernetes.io/hostname + - key: hardware operator: In - values: [ "titan-24" ] + values: [ "rpi4" ] jobservice: + image: + repository: registry.bstein.dev/infra/harbor-jobservice + tag: v2.14.1-arm64 affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: @@ -124,21 +134,24 @@ spec: - matchExpressions: - key: kubernetes.io/arch operator: In - values: [ "amd64" ] + values: [ "arm64" ] preferredDuringSchedulingIgnoredDuringExecution: - weight: 90 preference: matchExpressions: - - key: kubernetes.io/hostname + - key: hardware operator: In - values: [ "titan-22" ] - - weight: 10 + values: [ "rpi5" ] + - weight: 50 preference: matchExpressions: - - key: kubernetes.io/hostname + - key: hardware operator: In - values: [ "titan-24" ] + values: [ "rpi4" ] portal: + image: + repository: registry.bstein.dev/infra/harbor-portal + tag: v2.14.1-arm64 affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: @@ -146,21 +159,27 @@ spec: - matchExpressions: - key: kubernetes.io/arch operator: In - values: [ "amd64" ] + values: [ "arm64" ] preferredDuringSchedulingIgnoredDuringExecution: - weight: 90 preference: matchExpressions: - - key: kubernetes.io/hostname + - key: hardware operator: In - values: [ "titan-22" ] - - weight: 10 + values: [ "rpi5" ] + - weight: 50 preference: matchExpressions: - - key: kubernetes.io/hostname + - key: hardware operator: In - values: [ "titan-24" ] + values: [ "rpi4" ] registry: + image: + repository: registry.bstein.dev/infra/harbor-registry + tag: v2.14.1-arm64 + controllerImage: + repository: registry.bstein.dev/infra/harbor-registryctl + tag: v2.14.1-arm64 affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: @@ -168,19 +187,73 @@ spec: - matchExpressions: - key: kubernetes.io/arch operator: In - values: [ "amd64" ] + values: [ "arm64" ] preferredDuringSchedulingIgnoredDuringExecution: - weight: 90 preference: matchExpressions: - - key: kubernetes.io/hostname + - key: hardware operator: In - values: [ "titan-22" ] - - weight: 10 + values: [ "rpi5" ] + - weight: 50 preference: matchExpressions: - - key: kubernetes.io/hostname + - key: hardware operator: In - values: [ "titan-24" ] + values: [ "rpi4" ] + log: + image: + repository: registry.bstein.dev/infra/harbor-log + tag: v2.14.1-arm64 + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/arch + operator: In + values: [ "arm64" ] + preferredDuringSchedulingIgnoredDuringExecution: + - weight: 90 + preference: + matchExpressions: + - key: hardware + operator: In + values: [ "rpi5" ] + - weight: 50 + preference: + matchExpressions: + - key: hardware + operator: In + values: [ "rpi4" ] + nginx: + image: + repository: registry.bstein.dev/infra/harbor-nginx + tag: v2.14.1-arm64 + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/arch + operator: In + values: [ "arm64" ] + preferredDuringSchedulingIgnoredDuringExecution: + - weight: 90 + preference: + matchExpressions: + - key: hardware + operator: In + values: [ "rpi5" ] + - weight: 50 + preference: + matchExpressions: + - key: hardware + operator: In + values: [ "rpi4" ] + prepare: + image: + repository: registry.bstein.dev/infra/harbor-prepare + tag: v2.14.1-arm64 updateStrategy: type: Recreate