From aa447e69969f1a8a30666920a00fc8411c154e41 Mon Sep 17 00:00:00 2001 From: Brad Stein Date: Mon, 6 Apr 2026 00:50:29 -0300 Subject: [PATCH] harbor: restore internal arm64 image refs for recovery bootstrap --- services/harbor/helmrelease.yaml | 32 ++++++++++----------- services/harbor/image.yaml | 48 ++++++++++++++++---------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/services/harbor/helmrelease.yaml b/services/harbor/helmrelease.yaml index cd4106ac..f1bfc176 100644 --- a/services/harbor/helmrelease.yaml +++ b/services/harbor/helmrelease.yaml @@ -76,8 +76,8 @@ spec: type: internal internal: image: - repository: goharbor/redis-photon - tag: v2.14.1 # {"$imagepolicy": "harbor:harbor-redis:tag"} + repository: registry.bstein.dev/infra/harbor-redis + tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-redis:tag"} nodeSelector: kubernetes.io/hostname: titan-05 affinity: @@ -112,8 +112,8 @@ spec: existingSecretSecretKey: harbor-core core: image: - repository: goharbor/harbor-core - tag: v2.14.1 # {"$imagepolicy": "harbor:harbor-core:tag"} + repository: registry.bstein.dev/infra/harbor-core + tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-core:tag"} nodeSelector: kubernetes.io/hostname: titan-05 serviceAccountName: harbor-vault-sync @@ -173,8 +173,8 @@ spec: values: ["rpi4"] jobservice: image: - repository: goharbor/harbor-jobservice - tag: v2.14.1 # {"$imagepolicy": "harbor:harbor-jobservice:tag"} + repository: registry.bstein.dev/infra/harbor-jobservice + tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-jobservice:tag"} nodeSelector: kubernetes.io/hostname: titan-05 serviceAccountName: harbor-vault-sync @@ -215,8 +215,8 @@ spec: values: ["rpi4"] portal: image: - repository: goharbor/harbor-portal - tag: v2.14.1 # {"$imagepolicy": "harbor:harbor-portal:tag"} + repository: registry.bstein.dev/infra/harbor-portal + tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-portal:tag"} nodeSelector: kubernetes.io/hostname: titan-05 affinity: @@ -243,8 +243,8 @@ spec: registry: registry: image: - repository: goharbor/registry-photon - tag: v2.14.1 # {"$imagepolicy": "harbor:harbor-registry:tag"} + repository: registry.bstein.dev/infra/harbor-registry + tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-registry:tag"} extraEnvVars: - name: REGISTRY_NOTIFICATIONS_ENDPOINTS_0_NAME value: harbor-core @@ -258,8 +258,8 @@ spec: value: 1s controller: image: - repository: goharbor/harbor-registryctl - tag: v2.14.1 # {"$imagepolicy": "harbor:harbor-registryctl:tag"} + repository: registry.bstein.dev/infra/harbor-registryctl + tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-registryctl:tag"} serviceAccountName: harbor-vault-sync automountServiceAccountToken: true existingSecret: harbor-registry @@ -320,8 +320,8 @@ spec: values: ["rpi4"] nginx: image: - repository: goharbor/nginx-photon - tag: v2.14.1 # {"$imagepolicy": "harbor:harbor-nginx:tag"} + repository: registry.bstein.dev/infra/harbor-nginx + tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-nginx:tag"} nodeSelector: kubernetes.io/hostname: titan-05 affinity: @@ -347,8 +347,8 @@ spec: values: ["rpi4"] prepare: image: - repository: goharbor/prepare - tag: v2.14.1 # {"$imagepolicy": "harbor:harbor-prepare:tag"} + repository: registry.bstein.dev/infra/harbor-prepare + tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-prepare:tag"} updateStrategy: type: Recreate postRenderers: diff --git a/services/harbor/image.yaml b/services/harbor/image.yaml index 9b026b5a..2b258757 100644 --- a/services/harbor/image.yaml +++ b/services/harbor/image.yaml @@ -5,7 +5,7 @@ metadata: name: harbor-core namespace: harbor spec: - image: goharbor/harbor-core + image: registry.bstein.dev/infra/harbor-core interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1beta2 @@ -17,11 +17,11 @@ spec: imageRepositoryRef: name: harbor-core filterTags: - pattern: '^v(?P\d+\.\d+\.\d+)$' + pattern: '^v(?P\d+\.\d+\.\d+-arm64(\.\d+)?)$' extract: '$version' policy: semver: - range: ">=2.14.0 <2.15.0" + range: ">=2.14.0-0 <2.15.0-0" --- apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository @@ -29,7 +29,7 @@ metadata: name: harbor-jobservice namespace: harbor spec: - image: goharbor/harbor-jobservice + image: registry.bstein.dev/infra/harbor-jobservice interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1beta2 @@ -41,11 +41,11 @@ spec: imageRepositoryRef: name: harbor-jobservice filterTags: - pattern: '^v(?P\d+\.\d+\.\d+)$' + pattern: '^v(?P\d+\.\d+\.\d+-arm64(\.\d+)?)$' extract: '$version' policy: semver: - range: ">=2.14.0 <2.15.0" + range: ">=2.14.0-0 <2.15.0-0" --- apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository @@ -53,7 +53,7 @@ metadata: name: harbor-portal namespace: harbor spec: - image: goharbor/harbor-portal + image: registry.bstein.dev/infra/harbor-portal interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1beta2 @@ -65,11 +65,11 @@ spec: imageRepositoryRef: name: harbor-portal filterTags: - pattern: '^v(?P\d+\.\d+\.\d+)$' + pattern: '^v(?P\d+\.\d+\.\d+-arm64(\.\d+)?)$' extract: '$version' policy: semver: - range: ">=2.14.0 <2.15.0" + range: ">=2.14.0-0 <2.15.0-0" --- apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository @@ -77,7 +77,7 @@ metadata: name: harbor-registry namespace: harbor spec: - image: goharbor/registry-photon + image: registry.bstein.dev/infra/harbor-registry interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1beta2 @@ -89,11 +89,11 @@ spec: imageRepositoryRef: name: harbor-registry filterTags: - pattern: '^v(?P\d+\.\d+\.\d+)$' + pattern: '^v(?P\d+\.\d+\.\d+-arm64(\.\d+)?)$' extract: '$version' policy: semver: - range: ">=2.14.0 <2.15.0" + range: ">=2.14.0-0 <2.15.0-0" --- apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository @@ -101,7 +101,7 @@ metadata: name: harbor-registryctl namespace: harbor spec: - image: goharbor/harbor-registryctl + image: registry.bstein.dev/infra/harbor-registryctl interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1beta2 @@ -113,11 +113,11 @@ spec: imageRepositoryRef: name: harbor-registryctl filterTags: - pattern: '^v(?P\d+\.\d+\.\d+)$' + pattern: '^v(?P\d+\.\d+\.\d+-arm64(\.\d+)?)$' extract: '$version' policy: semver: - range: ">=2.14.0 <2.15.0" + range: ">=2.14.0-0 <2.15.0-0" --- apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository @@ -125,7 +125,7 @@ metadata: name: harbor-redis namespace: harbor spec: - image: goharbor/redis-photon + image: registry.bstein.dev/infra/harbor-redis interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1beta2 @@ -137,11 +137,11 @@ spec: imageRepositoryRef: name: harbor-redis filterTags: - pattern: '^v(?P\d+\.\d+\.\d+)$' + pattern: '^v(?P\d+\.\d+\.\d+-arm64(\.\d+)?)$' extract: '$version' policy: semver: - range: ">=2.14.0 <2.15.0" + range: ">=2.14.0-0 <2.15.0-0" --- apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository @@ -149,7 +149,7 @@ metadata: name: harbor-nginx namespace: harbor spec: - image: goharbor/nginx-photon + image: registry.bstein.dev/infra/harbor-nginx interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1beta2 @@ -161,11 +161,11 @@ spec: imageRepositoryRef: name: harbor-nginx filterTags: - pattern: '^v(?P\d+\.\d+\.\d+)$' + pattern: '^v(?P\d+\.\d+\.\d+-arm64(\.\d+)?)$' extract: '$version' policy: semver: - range: ">=2.14.0 <2.15.0" + range: ">=2.14.0-0 <2.15.0-0" --- apiVersion: image.toolkit.fluxcd.io/v1beta2 kind: ImageRepository @@ -173,7 +173,7 @@ metadata: name: harbor-prepare namespace: harbor spec: - image: goharbor/prepare + image: registry.bstein.dev/infra/harbor-prepare interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1beta2 @@ -185,8 +185,8 @@ spec: imageRepositoryRef: name: harbor-prepare filterTags: - pattern: '^v(?P\d+\.\d+\.\d+)$' + pattern: '^v(?P\d+\.\d+\.\d+-arm64(\.\d+)?)$' extract: '$version' policy: semver: - range: ">=2.14.0 <2.15.0" + range: ">=2.14.0-0 <2.15.0-0"