diff --git a/services/harbor/helmrelease.yaml b/services/harbor/helmrelease.yaml index 0ccf82c..d6d4042 100644 --- a/services/harbor/helmrelease.yaml +++ b/services/harbor/helmrelease.yaml @@ -76,14 +76,13 @@ spec: image: repository: registry.bstein.dev/infra/harbor-redis tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-redis"} + nodeSelector: + kubernetes.io/hostname: titan-05 affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: hardware - operator: In - values: [ "rpi4", "rpi5" ] - key: kubernetes.io/arch operator: In values: [ "arm64" ] @@ -93,13 +92,13 @@ spec: matchExpressions: - key: hardware operator: In - values: [ "rpi4" ] + values: [ "rpi5" ] - weight: 50 preference: matchExpressions: - key: hardware operator: In - values: [ "rpi5" ] + values: [ "rpi4" ] trivy: enabled: false metrics: @@ -113,6 +112,8 @@ spec: image: repository: registry.bstein.dev/infra/harbor-core tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-core"} + nodeSelector: + kubernetes.io/hostname: titan-05 existingSecret: harbor-core existingXsrfSecret: harbor-core existingXsrfSecretKey: CSRF_KEY @@ -121,9 +122,6 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: hardware - operator: In - values: [ "rpi4", "rpi5" ] - key: kubernetes.io/arch operator: In values: [ "arm64" ] @@ -133,25 +131,24 @@ spec: matchExpressions: - key: hardware operator: In - values: [ "rpi4" ] + values: [ "rpi5" ] - weight: 50 preference: matchExpressions: - key: hardware operator: In - values: [ "rpi5" ] + values: [ "rpi4" ] jobservice: image: repository: registry.bstein.dev/infra/harbor-jobservice tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-jobservice"} + nodeSelector: + kubernetes.io/hostname: titan-05 affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: hardware - operator: In - values: [ "rpi4", "rpi5" ] - key: kubernetes.io/arch operator: In values: [ "arm64" ] @@ -161,25 +158,24 @@ spec: matchExpressions: - key: hardware operator: In - values: [ "rpi4" ] + values: [ "rpi5" ] - weight: 50 preference: matchExpressions: - key: hardware operator: In - values: [ "rpi5" ] + values: [ "rpi4" ] portal: image: repository: registry.bstein.dev/infra/harbor-portal tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-portal"} + nodeSelector: + kubernetes.io/hostname: titan-05 affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: hardware - operator: In - values: [ "rpi4", "rpi5" ] - key: kubernetes.io/arch operator: In values: [ "arm64" ] @@ -189,13 +185,13 @@ spec: matchExpressions: - key: hardware operator: In - values: [ "rpi4" ] + values: [ "rpi5" ] - weight: 50 preference: matchExpressions: - key: hardware operator: In - values: [ "rpi5" ] + values: [ "rpi4" ] registry: registry: image: @@ -205,14 +201,13 @@ spec: image: repository: registry.bstein.dev/infra/harbor-registryctl tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-registryctl"} + nodeSelector: + kubernetes.io/hostname: titan-05 affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: hardware - operator: In - values: [ "rpi4", "rpi5" ] - key: kubernetes.io/arch operator: In values: [ "arm64" ] @@ -222,25 +217,24 @@ spec: matchExpressions: - key: hardware operator: In - values: [ "rpi4" ] + values: [ "rpi5" ] - weight: 50 preference: matchExpressions: - key: hardware operator: In - values: [ "rpi5" ] + values: [ "rpi4" ] nginx: image: repository: registry.bstein.dev/infra/harbor-nginx tag: v2.14.1-arm64 + nodeSelector: + kubernetes.io/hostname: titan-05 affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: hardware - operator: In - values: [ "rpi4", "rpi5" ] - key: kubernetes.io/arch operator: In values: [ "arm64" ] @@ -250,13 +244,13 @@ spec: matchExpressions: - key: hardware operator: In - values: [ "rpi4" ] + values: [ "rpi5" ] - weight: 50 preference: matchExpressions: - key: hardware operator: In - values: [ "rpi5" ] + values: [ "rpi4" ] prepare: image: repository: registry.bstein.dev/infra/harbor-prepare