harbor: restore internal arm64 image refs for recovery bootstrap
This commit is contained in:
parent
99bd68f61b
commit
aa447e6996
@ -76,8 +76,8 @@ spec:
|
|||||||
type: internal
|
type: internal
|
||||||
internal:
|
internal:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/redis-photon
|
repository: registry.bstein.dev/infra/harbor-redis
|
||||||
tag: v2.14.1 # {"$imagepolicy": "harbor:harbor-redis:tag"}
|
tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-redis:tag"}
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
kubernetes.io/hostname: titan-05
|
kubernetes.io/hostname: titan-05
|
||||||
affinity:
|
affinity:
|
||||||
@ -112,8 +112,8 @@ spec:
|
|||||||
existingSecretSecretKey: harbor-core
|
existingSecretSecretKey: harbor-core
|
||||||
core:
|
core:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/harbor-core
|
repository: registry.bstein.dev/infra/harbor-core
|
||||||
tag: v2.14.1 # {"$imagepolicy": "harbor:harbor-core:tag"}
|
tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-core:tag"}
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
kubernetes.io/hostname: titan-05
|
kubernetes.io/hostname: titan-05
|
||||||
serviceAccountName: harbor-vault-sync
|
serviceAccountName: harbor-vault-sync
|
||||||
@ -173,8 +173,8 @@ spec:
|
|||||||
values: ["rpi4"]
|
values: ["rpi4"]
|
||||||
jobservice:
|
jobservice:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/harbor-jobservice
|
repository: registry.bstein.dev/infra/harbor-jobservice
|
||||||
tag: v2.14.1 # {"$imagepolicy": "harbor:harbor-jobservice:tag"}
|
tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-jobservice:tag"}
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
kubernetes.io/hostname: titan-05
|
kubernetes.io/hostname: titan-05
|
||||||
serviceAccountName: harbor-vault-sync
|
serviceAccountName: harbor-vault-sync
|
||||||
@ -215,8 +215,8 @@ spec:
|
|||||||
values: ["rpi4"]
|
values: ["rpi4"]
|
||||||
portal:
|
portal:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/harbor-portal
|
repository: registry.bstein.dev/infra/harbor-portal
|
||||||
tag: v2.14.1 # {"$imagepolicy": "harbor:harbor-portal:tag"}
|
tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-portal:tag"}
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
kubernetes.io/hostname: titan-05
|
kubernetes.io/hostname: titan-05
|
||||||
affinity:
|
affinity:
|
||||||
@ -243,8 +243,8 @@ spec:
|
|||||||
registry:
|
registry:
|
||||||
registry:
|
registry:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/registry-photon
|
repository: registry.bstein.dev/infra/harbor-registry
|
||||||
tag: v2.14.1 # {"$imagepolicy": "harbor:harbor-registry:tag"}
|
tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-registry:tag"}
|
||||||
extraEnvVars:
|
extraEnvVars:
|
||||||
- name: REGISTRY_NOTIFICATIONS_ENDPOINTS_0_NAME
|
- name: REGISTRY_NOTIFICATIONS_ENDPOINTS_0_NAME
|
||||||
value: harbor-core
|
value: harbor-core
|
||||||
@ -258,8 +258,8 @@ spec:
|
|||||||
value: 1s
|
value: 1s
|
||||||
controller:
|
controller:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/harbor-registryctl
|
repository: registry.bstein.dev/infra/harbor-registryctl
|
||||||
tag: v2.14.1 # {"$imagepolicy": "harbor:harbor-registryctl:tag"}
|
tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-registryctl:tag"}
|
||||||
serviceAccountName: harbor-vault-sync
|
serviceAccountName: harbor-vault-sync
|
||||||
automountServiceAccountToken: true
|
automountServiceAccountToken: true
|
||||||
existingSecret: harbor-registry
|
existingSecret: harbor-registry
|
||||||
@ -320,8 +320,8 @@ spec:
|
|||||||
values: ["rpi4"]
|
values: ["rpi4"]
|
||||||
nginx:
|
nginx:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/nginx-photon
|
repository: registry.bstein.dev/infra/harbor-nginx
|
||||||
tag: v2.14.1 # {"$imagepolicy": "harbor:harbor-nginx:tag"}
|
tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-nginx:tag"}
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
kubernetes.io/hostname: titan-05
|
kubernetes.io/hostname: titan-05
|
||||||
affinity:
|
affinity:
|
||||||
@ -347,8 +347,8 @@ spec:
|
|||||||
values: ["rpi4"]
|
values: ["rpi4"]
|
||||||
prepare:
|
prepare:
|
||||||
image:
|
image:
|
||||||
repository: goharbor/prepare
|
repository: registry.bstein.dev/infra/harbor-prepare
|
||||||
tag: v2.14.1 # {"$imagepolicy": "harbor:harbor-prepare:tag"}
|
tag: v2.14.1-arm64 # {"$imagepolicy": "harbor:harbor-prepare:tag"}
|
||||||
updateStrategy:
|
updateStrategy:
|
||||||
type: Recreate
|
type: Recreate
|
||||||
postRenderers:
|
postRenderers:
|
||||||
|
|||||||
@ -5,7 +5,7 @@ metadata:
|
|||||||
name: harbor-core
|
name: harbor-core
|
||||||
namespace: harbor
|
namespace: harbor
|
||||||
spec:
|
spec:
|
||||||
image: goharbor/harbor-core
|
image: registry.bstein.dev/infra/harbor-core
|
||||||
interval: 5m0s
|
interval: 5m0s
|
||||||
---
|
---
|
||||||
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
||||||
@ -17,11 +17,11 @@ spec:
|
|||||||
imageRepositoryRef:
|
imageRepositoryRef:
|
||||||
name: harbor-core
|
name: harbor-core
|
||||||
filterTags:
|
filterTags:
|
||||||
pattern: '^v(?P<version>\d+\.\d+\.\d+)$'
|
pattern: '^v(?P<version>\d+\.\d+\.\d+-arm64(\.\d+)?)$'
|
||||||
extract: '$version'
|
extract: '$version'
|
||||||
policy:
|
policy:
|
||||||
semver:
|
semver:
|
||||||
range: ">=2.14.0 <2.15.0"
|
range: ">=2.14.0-0 <2.15.0-0"
|
||||||
---
|
---
|
||||||
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
||||||
kind: ImageRepository
|
kind: ImageRepository
|
||||||
@ -29,7 +29,7 @@ metadata:
|
|||||||
name: harbor-jobservice
|
name: harbor-jobservice
|
||||||
namespace: harbor
|
namespace: harbor
|
||||||
spec:
|
spec:
|
||||||
image: goharbor/harbor-jobservice
|
image: registry.bstein.dev/infra/harbor-jobservice
|
||||||
interval: 5m0s
|
interval: 5m0s
|
||||||
---
|
---
|
||||||
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
||||||
@ -41,11 +41,11 @@ spec:
|
|||||||
imageRepositoryRef:
|
imageRepositoryRef:
|
||||||
name: harbor-jobservice
|
name: harbor-jobservice
|
||||||
filterTags:
|
filterTags:
|
||||||
pattern: '^v(?P<version>\d+\.\d+\.\d+)$'
|
pattern: '^v(?P<version>\d+\.\d+\.\d+-arm64(\.\d+)?)$'
|
||||||
extract: '$version'
|
extract: '$version'
|
||||||
policy:
|
policy:
|
||||||
semver:
|
semver:
|
||||||
range: ">=2.14.0 <2.15.0"
|
range: ">=2.14.0-0 <2.15.0-0"
|
||||||
---
|
---
|
||||||
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
||||||
kind: ImageRepository
|
kind: ImageRepository
|
||||||
@ -53,7 +53,7 @@ metadata:
|
|||||||
name: harbor-portal
|
name: harbor-portal
|
||||||
namespace: harbor
|
namespace: harbor
|
||||||
spec:
|
spec:
|
||||||
image: goharbor/harbor-portal
|
image: registry.bstein.dev/infra/harbor-portal
|
||||||
interval: 5m0s
|
interval: 5m0s
|
||||||
---
|
---
|
||||||
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
||||||
@ -65,11 +65,11 @@ spec:
|
|||||||
imageRepositoryRef:
|
imageRepositoryRef:
|
||||||
name: harbor-portal
|
name: harbor-portal
|
||||||
filterTags:
|
filterTags:
|
||||||
pattern: '^v(?P<version>\d+\.\d+\.\d+)$'
|
pattern: '^v(?P<version>\d+\.\d+\.\d+-arm64(\.\d+)?)$'
|
||||||
extract: '$version'
|
extract: '$version'
|
||||||
policy:
|
policy:
|
||||||
semver:
|
semver:
|
||||||
range: ">=2.14.0 <2.15.0"
|
range: ">=2.14.0-0 <2.15.0-0"
|
||||||
---
|
---
|
||||||
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
||||||
kind: ImageRepository
|
kind: ImageRepository
|
||||||
@ -77,7 +77,7 @@ metadata:
|
|||||||
name: harbor-registry
|
name: harbor-registry
|
||||||
namespace: harbor
|
namespace: harbor
|
||||||
spec:
|
spec:
|
||||||
image: goharbor/registry-photon
|
image: registry.bstein.dev/infra/harbor-registry
|
||||||
interval: 5m0s
|
interval: 5m0s
|
||||||
---
|
---
|
||||||
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
||||||
@ -89,11 +89,11 @@ spec:
|
|||||||
imageRepositoryRef:
|
imageRepositoryRef:
|
||||||
name: harbor-registry
|
name: harbor-registry
|
||||||
filterTags:
|
filterTags:
|
||||||
pattern: '^v(?P<version>\d+\.\d+\.\d+)$'
|
pattern: '^v(?P<version>\d+\.\d+\.\d+-arm64(\.\d+)?)$'
|
||||||
extract: '$version'
|
extract: '$version'
|
||||||
policy:
|
policy:
|
||||||
semver:
|
semver:
|
||||||
range: ">=2.14.0 <2.15.0"
|
range: ">=2.14.0-0 <2.15.0-0"
|
||||||
---
|
---
|
||||||
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
||||||
kind: ImageRepository
|
kind: ImageRepository
|
||||||
@ -101,7 +101,7 @@ metadata:
|
|||||||
name: harbor-registryctl
|
name: harbor-registryctl
|
||||||
namespace: harbor
|
namespace: harbor
|
||||||
spec:
|
spec:
|
||||||
image: goharbor/harbor-registryctl
|
image: registry.bstein.dev/infra/harbor-registryctl
|
||||||
interval: 5m0s
|
interval: 5m0s
|
||||||
---
|
---
|
||||||
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
||||||
@ -113,11 +113,11 @@ spec:
|
|||||||
imageRepositoryRef:
|
imageRepositoryRef:
|
||||||
name: harbor-registryctl
|
name: harbor-registryctl
|
||||||
filterTags:
|
filterTags:
|
||||||
pattern: '^v(?P<version>\d+\.\d+\.\d+)$'
|
pattern: '^v(?P<version>\d+\.\d+\.\d+-arm64(\.\d+)?)$'
|
||||||
extract: '$version'
|
extract: '$version'
|
||||||
policy:
|
policy:
|
||||||
semver:
|
semver:
|
||||||
range: ">=2.14.0 <2.15.0"
|
range: ">=2.14.0-0 <2.15.0-0"
|
||||||
---
|
---
|
||||||
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
||||||
kind: ImageRepository
|
kind: ImageRepository
|
||||||
@ -125,7 +125,7 @@ metadata:
|
|||||||
name: harbor-redis
|
name: harbor-redis
|
||||||
namespace: harbor
|
namespace: harbor
|
||||||
spec:
|
spec:
|
||||||
image: goharbor/redis-photon
|
image: registry.bstein.dev/infra/harbor-redis
|
||||||
interval: 5m0s
|
interval: 5m0s
|
||||||
---
|
---
|
||||||
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
||||||
@ -137,11 +137,11 @@ spec:
|
|||||||
imageRepositoryRef:
|
imageRepositoryRef:
|
||||||
name: harbor-redis
|
name: harbor-redis
|
||||||
filterTags:
|
filterTags:
|
||||||
pattern: '^v(?P<version>\d+\.\d+\.\d+)$'
|
pattern: '^v(?P<version>\d+\.\d+\.\d+-arm64(\.\d+)?)$'
|
||||||
extract: '$version'
|
extract: '$version'
|
||||||
policy:
|
policy:
|
||||||
semver:
|
semver:
|
||||||
range: ">=2.14.0 <2.15.0"
|
range: ">=2.14.0-0 <2.15.0-0"
|
||||||
---
|
---
|
||||||
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
||||||
kind: ImageRepository
|
kind: ImageRepository
|
||||||
@ -149,7 +149,7 @@ metadata:
|
|||||||
name: harbor-nginx
|
name: harbor-nginx
|
||||||
namespace: harbor
|
namespace: harbor
|
||||||
spec:
|
spec:
|
||||||
image: goharbor/nginx-photon
|
image: registry.bstein.dev/infra/harbor-nginx
|
||||||
interval: 5m0s
|
interval: 5m0s
|
||||||
---
|
---
|
||||||
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
||||||
@ -161,11 +161,11 @@ spec:
|
|||||||
imageRepositoryRef:
|
imageRepositoryRef:
|
||||||
name: harbor-nginx
|
name: harbor-nginx
|
||||||
filterTags:
|
filterTags:
|
||||||
pattern: '^v(?P<version>\d+\.\d+\.\d+)$'
|
pattern: '^v(?P<version>\d+\.\d+\.\d+-arm64(\.\d+)?)$'
|
||||||
extract: '$version'
|
extract: '$version'
|
||||||
policy:
|
policy:
|
||||||
semver:
|
semver:
|
||||||
range: ">=2.14.0 <2.15.0"
|
range: ">=2.14.0-0 <2.15.0-0"
|
||||||
---
|
---
|
||||||
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
||||||
kind: ImageRepository
|
kind: ImageRepository
|
||||||
@ -173,7 +173,7 @@ metadata:
|
|||||||
name: harbor-prepare
|
name: harbor-prepare
|
||||||
namespace: harbor
|
namespace: harbor
|
||||||
spec:
|
spec:
|
||||||
image: goharbor/prepare
|
image: registry.bstein.dev/infra/harbor-prepare
|
||||||
interval: 5m0s
|
interval: 5m0s
|
||||||
---
|
---
|
||||||
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
apiVersion: image.toolkit.fluxcd.io/v1beta2
|
||||||
@ -185,8 +185,8 @@ spec:
|
|||||||
imageRepositoryRef:
|
imageRepositoryRef:
|
||||||
name: harbor-prepare
|
name: harbor-prepare
|
||||||
filterTags:
|
filterTags:
|
||||||
pattern: '^v(?P<version>\d+\.\d+\.\d+)$'
|
pattern: '^v(?P<version>\d+\.\d+\.\d+-arm64(\.\d+)?)$'
|
||||||
extract: '$version'
|
extract: '$version'
|
||||||
policy:
|
policy:
|
||||||
semver:
|
semver:
|
||||||
range: ">=2.14.0 <2.15.0"
|
range: ">=2.14.0-0 <2.15.0-0"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user