Simplify Harbor to standard deployment pattern
- ExternalSecret now pulls only HARBOR_ADMIN_PASSWORD from 1Password - Removed database, redis, core, jobservice, registry secret references - Harbor Helm chart auto-generates all internal secrets (standard pattern) - Reduces complexity and aligns with Harbor best practices This change removes dependency on 5 1Password fields that should be deleted: - database-password - redis-password - core-secret - jobservice-secret - registry-password Only harbor-admin-password field needed in 1Password item 'the-seas'
This commit is contained in:
@@ -1,11 +1,13 @@
|
|||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
# ExternalSecret — Harbor Credentials
|
# ExternalSecret — Harbor Credentials
|
||||||
# Pulled from 1Password via Connect Server, materialized as a K8s secret
|
# Pulled from 1Password via Connect Server, materialized as a K8s secret
|
||||||
# in the-seas namespace for use by Harbor components.
|
# in the harbor namespace for use by Harbor admin authentication.
|
||||||
#
|
#
|
||||||
# In 1Password, these are stored in the "the-seas" item in the "mk-labs" vault
|
# In 1Password, stored in the "the-seas" item in the "mk-labs" vault
|
||||||
# with fields: harbor-admin-password, database-password, redis-password,
|
# with field: harbor-admin-password
|
||||||
# core-secret, jobservice-secret, registry-password
|
#
|
||||||
|
# NOTE: All internal secrets (database, redis, registry, core, jobservice)
|
||||||
|
# are auto-generated by the Harbor Helm chart. This is the standard pattern.
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
apiVersion: external-secrets.io/v1beta1
|
apiVersion: external-secrets.io/v1beta1
|
||||||
kind: ExternalSecret
|
kind: ExternalSecret
|
||||||
@@ -25,29 +27,3 @@ spec:
|
|||||||
remoteRef:
|
remoteRef:
|
||||||
key: the-seas
|
key: the-seas
|
||||||
property: harbor-admin-password
|
property: harbor-admin-password
|
||||||
|
|
||||||
- secretKey: DATABASE_PASSWORD
|
|
||||||
remoteRef:
|
|
||||||
key: the-seas
|
|
||||||
property: database-password
|
|
||||||
|
|
||||||
- secretKey: REDIS_PASSWORD
|
|
||||||
remoteRef:
|
|
||||||
key: the-seas
|
|
||||||
property: redis-password
|
|
||||||
|
|
||||||
# Core secret - Harbor Helm chart expects key named 'secret' not 'CORE_SECRET'
|
|
||||||
- secretKey: secret
|
|
||||||
remoteRef:
|
|
||||||
key: the-seas
|
|
||||||
property: core-secret
|
|
||||||
|
|
||||||
- secretKey: JOBSERVICE_SECRET
|
|
||||||
remoteRef:
|
|
||||||
key: the-seas
|
|
||||||
property: jobservice-secret
|
|
||||||
|
|
||||||
- secretKey: REGISTRY_PASSWD
|
|
||||||
remoteRef:
|
|
||||||
key: the-seas
|
|
||||||
property: registry-password
|
|
||||||
|
|||||||
@@ -36,10 +36,7 @@ database:
|
|||||||
image:
|
image:
|
||||||
repository: docker.io/goharbor/harbor-db
|
repository: docker.io/goharbor/harbor-db
|
||||||
tag: "v2.15.1"
|
tag: "v2.15.1"
|
||||||
# Password from ExternalSecret
|
# Password auto-generated by Harbor Helm chart
|
||||||
password: ""
|
|
||||||
existingSecret: "harbor-credentials"
|
|
||||||
existingSecretKey: "DATABASE_PASSWORD"
|
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: 1Gi
|
memory: 1Gi
|
||||||
@@ -60,10 +57,7 @@ redis:
|
|||||||
image:
|
image:
|
||||||
repository: docker.io/goharbor/redis-photon
|
repository: docker.io/goharbor/redis-photon
|
||||||
tag: "v2.15.1"
|
tag: "v2.15.1"
|
||||||
# Password from ExternalSecret
|
# Password auto-generated by Harbor Helm chart
|
||||||
jobservicePassword: ""
|
|
||||||
existingSecret: "harbor-credentials"
|
|
||||||
existingSecretKey: "REDIS_PASSWORD"
|
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: 256Mi
|
memory: 256Mi
|
||||||
@@ -130,9 +124,7 @@ core:
|
|||||||
repository: docker.io/goharbor/harbor-core
|
repository: docker.io/goharbor/harbor-core
|
||||||
tag: "v2.15.1"
|
tag: "v2.15.1"
|
||||||
replicas: 1
|
replicas: 1
|
||||||
# Core secret from ExternalSecret
|
# Core secret auto-generated by Harbor Helm chart
|
||||||
secret: ""
|
|
||||||
existingSecret: "harbor-credentials"
|
|
||||||
# Enable HTTP/2 for better performance
|
# Enable HTTP/2 for better performance
|
||||||
configureUserSettings: |-
|
configureUserSettings: |-
|
||||||
http2_push_preload on;
|
http2_push_preload on;
|
||||||
@@ -152,10 +144,7 @@ jobservice:
|
|||||||
repository: docker.io/goharbor/harbor-jobservice
|
repository: docker.io/goharbor/harbor-jobservice
|
||||||
tag: "v2.15.1"
|
tag: "v2.15.1"
|
||||||
replicas: 1
|
replicas: 1
|
||||||
# Job service secret from ExternalSecret
|
# Job service secret auto-generated by Harbor Helm chart
|
||||||
secret: ""
|
|
||||||
existingSecret: "harbor-credentials"
|
|
||||||
existingSecretKey: "JOBSERVICE_SECRET"
|
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: 512Mi
|
memory: 512Mi
|
||||||
@@ -172,11 +161,7 @@ registry:
|
|||||||
repository: docker.io/goharbor/registry-photon
|
repository: docker.io/goharbor/registry-photon
|
||||||
tag: "v2.15.1"
|
tag: "v2.15.1"
|
||||||
replicas: 1
|
replicas: 1
|
||||||
# Registry credentials from ExternalSecret
|
# Registry credentials auto-generated by Harbor Helm chart
|
||||||
credentials:
|
|
||||||
username: "harbor_registry_user"
|
|
||||||
password: ""
|
|
||||||
existingSecret: "harbor-credentials"
|
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: 1Gi
|
memory: 1Gi
|
||||||
|
|||||||
Reference in New Issue
Block a user