diff --git a/apps/base/goharbor/database.yaml b/apps/base/goharbor/components/zalando-postgresql/database.yaml
similarity index 94%
rename from apps/base/goharbor/database.yaml
rename to apps/base/goharbor/components/zalando-postgresql/database.yaml
index 4fcae4ce963b85b7f94d44e708fb03383a42c64a..a5fb1952c963445b5e34b16da4735c61fd235343 100644
--- a/apps/base/goharbor/database.yaml
+++ b/apps/base/goharbor/components/zalando-postgresql/database.yaml
@@ -17,4 +17,4 @@ spec:
notary_server: harbor
notary_signer: harbor
postgresql:
- version: "14"
+ version: "15"
diff --git a/apps/base/goharbor/components/zalando-postgresql/kustomization.yaml b/apps/base/goharbor/components/zalando-postgresql/kustomization.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3a0fddefb0e3a9598247de987b4feb8430ee1986
--- /dev/null
+++ b/apps/base/goharbor/components/zalando-postgresql/kustomization.yaml
@@ -0,0 +1,13 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+resources:
+ - database.yaml
+ - ../../../../../shared/networkpolicies/allow-from-database.yaml
+
+patches:
+ - path: release-patch.yaml
+ target:
+ group: helm.toolkit.fluxcd.io
+ kind: HelmRelease
+ name: goharbor
\ No newline at end of file
diff --git a/apps/base/goharbor/components/zalando-postgresql/release-patch.yaml b/apps/base/goharbor/components/zalando-postgresql/release-patch.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6099fe5b5c61a92dc8863664a86e9614c095c727
--- /dev/null
+++ b/apps/base/goharbor/components/zalando-postgresql/release-patch.yaml
@@ -0,0 +1,22 @@
+- op: add
+ path: /spec/valuesFrom/-
+ value:
+ kind: Secret
+ name: harbor.goharbor-postgres.credentials.postgresql.acid.zalan.do
+ valuesKey: username
+ targetPath: database.external.username
+- op: add
+ path: /spec/valuesFrom/-
+ value:
+ kind: Secret
+ name: harbor.goharbor-postgres.credentials.postgresql.acid.zalan.do
+ valuesKey: password
+ targetPath: database.external.password
+- op: add
+ path: /spec/values/database
+ value:
+ type: external
+ external:
+ host: goharbor-postgres.goharbor.svc.cluster.local
+ post: 5432
+ sslmode: require
\ No newline at end of file
diff --git a/apps/base/goharbor/kustomization.yaml b/apps/base/goharbor/kustomization.yaml
index 2d75e3a416e58f2ea2cb040b0a1dc43e90aede14..8caab793207e426bd59e19e2b0fda04dfa122fe1 100644
--- a/apps/base/goharbor/kustomization.yaml
+++ b/apps/base/goharbor/kustomization.yaml
@@ -4,16 +4,19 @@ namespace: goharbor
resources:
- namespace.yaml
- repository.yaml
- - database.yaml
- redis.yaml
- release.yaml
- ../../../shared/networkpolicies/allow-from-same-namespace.yaml
- ../../../shared/networkpolicies/allow-from-ingress.yaml
- ../../../shared/networkpolicies/allow-from-monitoring.yaml
- - ../../../shared/networkpolicies/allow-from-database.yaml
- ../../../shared/networkpolicies/allow-from-redis.yaml
+
+components:
+ - ./components/zalando-postgresql
+
patchesStrategicMerge:
- networkpolicy.yaml
+
configMapGenerator:
- name: harbor
files:
diff --git a/apps/base/goharbor/namespace.yaml b/apps/base/goharbor/namespace.yaml
index 39f30e81b7f1b176fd4f01d98e764a8c2a449a14..408780ae29190a80ae586eb8d5d6c0232c1b7c8d 100644
--- a/apps/base/goharbor/namespace.yaml
+++ b/apps/base/goharbor/namespace.yaml
@@ -2,30 +2,4 @@ apiVersion: v1
kind: Namespace
metadata:
name: goharbor
- labels:
- pod-security.kubernetes.io/audit: restricted
- pod-security.kubernetes.io/enforce: baseline
- pod-security.kubernetes.io/warn: restricted
- pod-security.kubernetes.io/audit-version: v1.26
- pod-security.kubernetes.io/enforce-version: v1.23
- pod-security.kubernetes.io/warn-version: v1.26
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
- name: flux-reconciler
- namespace: goharbor
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
- name: flux-reconciler
- namespace: goharbor
-roleRef:
- apiGroup: rbac.authorization.k8s.io
- kind: ClusterRole
- name: admin
-subjects:
- - kind: ServiceAccount
- name: flux-reconciler
- namespace: goharbor
+ labels: {}
diff --git a/apps/base/goharbor/release.yaml b/apps/base/goharbor/release.yaml
index b46a07880dceb9d0a4bd7c70d8d7b51dec9f960e..e4c3f0a14a855593772827dda2f7f9c94f83999e 100644
--- a/apps/base/goharbor/release.yaml
+++ b/apps/base/goharbor/release.yaml
@@ -13,6 +13,7 @@ spec:
sourceRef:
kind: HelmRepository
name: goharbor
+ namespace: goharbor
version: 1.14.0
interval: 5m
install:
@@ -22,15 +23,21 @@ spec:
remediation:
retries: -1
valuesFrom:
+ - kind: ConfigMap
+ name: goharbor-base-values
+ valuesKey: values.yaml
- kind: Secret
- name: harbor.goharbor-postgres.credentials.postgresql.acid.zalan.do
- valuesKey: username
- targetPath: database.external.username
- - kind: Secret
- name: harbor.goharbor-postgres.credentials.postgresql.acid.zalan.do
- valuesKey: password
- targetPath: database.external.password
- values:
+ name: goharbor-override-values
+ valuesKey: values-overrides.yaml
+ optional: true
+ values: {}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: goharbor-base-values
+data:
+ values.yaml: |
metrics:
enabled: true
serviceMonitor:
@@ -121,11 +128,7 @@ spec:
limits:
memory: 128Mi
cpu: 100m
- database:
- type: external
- external:
- post: 5432
- sslmode: require
+ database: {}
redis:
type: external
external:
diff --git a/apps/k8s01/goharbor/goharbor-values.yaml b/apps/k8s01/goharbor/goharbor-values.yaml
index 910fcbd38dd66c9ee325ec3c25e3934c3c0c6275..0731529ad811971de953bad076a31d412e696d6e 100644
--- a/apps/k8s01/goharbor/goharbor-values.yaml
+++ b/apps/k8s01/goharbor/goharbor-values.yaml
@@ -1,106 +1,59 @@
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
-kind: HelmRelease
+apiVersion: v1
+kind: Secret
metadata:
- name: goharbor
- namespace: goharbor
-spec:
- values:
- database:
- external:
- host: ENC[AES256_GCM,data:1TPThVrpJDBegWvkXe4F3SAwRDZSOwR7uiTlCLprIk/nB/QFkfq7jrqU3g4=,iv:HgwUbVShqnKjbVQe7gzh3fmek2HwaEQjTKdttj9hicI=,tag:e+bWW8DZQkANjbF3zi2DtQ==,type:str]
- externalURL: ENC[AES256_GCM,data:mvKSE2Snv3r7SoNVmtvoapw+d2uowij5T1Mpa+schBS4Avvu,iv:VxKeqVRV384Bsckl8hgpQxY/EQoFr9tCmwPAkqivqCc=,tag:jznu2NsOfQAPuqOcCos+Jg==,type:str]
- expose:
- tls:
- certSource: secret
- secret:
- secretName: ingress-harbor-tls
- notarySecretName: ingress-harbor-tls
- ingress:
- annotations:
- forecastle.stakater.com/expose: "true"
- forecastle.stakater.com/appName: Harbor
- forecastle.stakater.com/icon: https://content-proxy.shivering-isles.com/0fca18d1ee1990cb8722bd03a2b0840543d7ba5f/68747470733a2f2f617661746172732e67697468756275736572636f6e74656e742e636f6d2f752f3430323735383136
- forecastle.stakater.com/group: Management
- forecastle.stakater.com/network-restricted: "true"
- nginx.ingress.kubernetes.io/app-root: /c/oidc/login?redirect_url=/harbor/projects
- nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,100.64.0.0/24
- hosts:
- core: ENC[AES256_GCM,data:XZQcRdMZuipxq8ZXYCZ9CoOVE6KFcO6OqGBx7w==,iv:Y+E1yMHN7OPVSSk7jcPH4UhcLqBSjRgevfkoc3Hlw1U=,tag:IQN1pTq0JhqvCiLV8/ytoQ==,type:str]
- notary: ENC[AES256_GCM,data:ojLU8tw8zh22Rmw5MsZMgAsfun7uF/1I+MErLKZTWDUS79k=,iv:hLku/snVK/vxyxeSfOFhZSlnv7zg3J5Z6vpmCNnssug=,tag:0EqjAjVm2fd9c7tKH5P5UQ==,type:str]
- persistence:
- persistentVolumeClaim:
- registry:
- accessMode: ReadWriteMany
- size: 90Gi
- chartmuseum:
- accessMode: ReadWriteMany
- jobservice:
- jobLog:
- accessMode: ReadWriteMany
- scanDataExports:
- accessMode: ReadWriteMany
- trivy:
- accessMode: ReadWriteMany
- size: 10Gi
- core:
- replicas: 2
- portal:
- replicas: 2
- registry:
- replicas: 2
- chartmuseum:
- enabled: false
- notary:
- enabled: false
+ name: goharbor-override-values
+type: Opaque
+stringData:
+ values-overrides.yaml: ENC[AES256_GCM,data:oDFdE27cm+bxECP3ueMntS/MM6qmTXAQbg2/lXXnrVvwqVBWuvX4kveuUVZffu4XE91iIxoWBzzIMQ1axELwe6TB2qOryc0Xsh9HArcd0GH0QAGmeJxSxYUWLgldU4+kRX5ovSyZU0cwqnxYGXdRgA6HmbMW9bnwlkz2lF54NX2fvt+u0LyF0UtUMzj4zEsCTwRqbQVjlV94V6+1j11uF+v2jY4sMQrHk/e5RXjm0oKcnaMRLCbL6G72XUv3wQFOKtzbSpG+K0cSezyQrdYdDWAfMRXruk8lz4CbmhDKcCJpEXGDL487YVuNnHT7/4ezjYg+isdESAqfHfMqyA+W4GQwlpWrgUdIW6s7x7ol0nVskPx3h2lHvb7UnkGoLUk1bU/og4cq8LOKPcohn0OYVh4X0RmYSKi/JFrkCBEuyJLVD8halluqApBaeF7oUXkOVJSJBmJrSCN1wQaMYx9sWWP5EY0scPT37GoIpSoAbpu/V2YcIKKisv2q1Tw3CnnKkeYNR1Z4kSC3dc+vXFGlqELXl22FdazKRy3aMhedFk+366zaSsldBagLWiz6UozZQ7sp81vaCkQc/Xb5GLlhOywVzhfWfY0HukIVCeM+AjV0MI4RFnlKAviQPWyh5OwicQ2AMqIjdXbvA20aTNIr4297FsDT7Pwo8kJkRREgubkweS1j8RQYQDqFBgvLNwJoNzIJCxGYw7ap+4SQNz5g5ER3JEhyVXfyRS4SslMevh61FWLMmu71ZKVfBnjIkzf2BtReMHixInCeeF7IDU0ze728sr5RTLDITztVriw+JJvE6Qung7Qbw4W3j23qATJrXzxjAjSnz6lTS/CLHQEktYn+JCyVaLvRraF4gZpbWrBBnvnLXtK79LaAuiWrhP66Zgcjxtz1Oi3Qs9qHovDwNbsyXAoD6wxaofOicK61xncRojyWrfg73lKBflpqHSS5LYny7SdMKivUmWitTt/MtECa2z1rsuulUC1lJLsip58WUSm2snCjuQm8a9qk43dzK2Q9crjygtVAMtp96xTVREgxsfhxTCmngiM4YJAKwveY2TQILG6vMb5528xLAeTsiQAJfbeP6zGWEUxB91K0w46arTQIyGdGgnnzSosr2LywsEMeBIrBdQ95rUY4l5Vj+Nk3ehaDQwityxZbEXtb44Rp2dcFcUTzqeoPAVqVIymUyNkJOwUYvqP0rO3kPjTgeJsawberX8dh9gTh7WW0YORdYc3t5swp8TXp/qOsMQcnZjv4w7tEDfPxnBWFN1X0jMzpPG9fTFt/SaUWdxkr0oIQKA864lYDeCWCw9cnw6Dk7LkJB2wB8DBZ6GQxuj00XPGQY4Y99Xs+I4Taybl/jnPux6uExMGstOoSPGRUDI1WPvZutY/Rh486Z2eBQ00Ijx95ELMAgst9uRYge5+THi0srilUBOcz4p16ESj6w5Ws93DkfMOmErN7uiN3nTrk6dOg6Hf1MsaLhhrGpblzUE4wHOsWiJZitQb0Xl2FinMfKluPokDSWi28OU6uOXrNfgpJzfbdWMkOddLyB2z91XhJnY/AVau+InlTmU2xV0NywQ4E5PkhZIrqp4cKByKrBmk0LZKE+1mN0cjAsf7gm01Gjh7jqMORzX6Ppbj+3WzgAQif71C+pVUmVdozJq1J+XjXFcBvSxQwNtT3O+UNkEkkQyj4OU3o4eTUjagmPfzYmGpSkS7x5u9jG5HmZ7m0ce7hdYqkX8tK2HBzyWtXOqhKWMo1n/1rtvmZUBj0h33LdEx+kbX1Wly8d5MbTd3y9AtrmcyQBTRmLov+am9a+p00IfuvkceruxYUAryFJQ3rqZHvgNLw81wjH+IjW5JdlAdk12mYIOUcOliwv20nhZuwI90EDK3Hp5tRnX3F6tvnbW2+e1uNZAhK7hBxI2s7joxl6Cna7T4=,iv:mhKmB3jl+eiHEEJhBzTZ1bySEd0JSXiMz+VTVKQpN6M=,tag:LxzvJGpGMhOgf5uc6RfBKw==,type:str]
sops:
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age: []
- lastmodified: "2023-10-20T18:39:07Z"
- mac: ENC[AES256_GCM,data:HGAmjeNj/LfuP22zmsKBJey9B38pIDDK1OH5pEddhdPKVu6Q47Mrhgl+K1Nd8IJn8K75CIcD95PSaf5dYypWd3FdTbTH4ygJIENNPttmLNJuFoZdmU8Hbfyhzyz4P453QN8SswurYpiOpWh6/zePs9HyQWUOBOC8zsv6FFImJkg=,iv:SayB187OWakcdv/JxbB1yso/QvTHOPazU/O80HCdvHo=,tag:a2AJQf1kU5h/6bzG8atjkA==,type:str]
+ lastmodified: "2024-02-06T18:43:42Z"
+ mac: ENC[AES256_GCM,data:mQnHqdZmtrUpn3x2LoZQ2gdgk1vJ8Ozn+JgY6tkrgZ/X6KpUaHzTyfzKvEK0A42z9kd306+ij+A2M9s3/WwDw3sPp9v4kEY4Ojq36OXInF9iZcndvfbpjcnoDtTeH0QZAMYPEfZPfTxtPsRW6AfLrLb2+/p4m/Bi8gbLXMJ60j4=,iv:Rgv5rMPNPvPpJq31oEImqWl0OBPexXooXMgM/hVSkSc=,tag:qqAMolWp/++5+2VWoSXtQw==,type:str]
pgp:
- - created_at: "2022-01-21T00:21:42Z"
- enc: |-
+ - created_at: "2024-02-06T18:43:42Z"
+ enc: |
-----BEGIN PGP MESSAGE-----
- wcFMA7kpg2bgzVHcARAAIowqC8OXUZWJCDmFa8k2EFvYwEVjCPRe8YCWBF+EJxcI
- 91w5Ji2ETRcp/KWD0UgpSxp9oB89UjRDLQAmRKn5PkzbiebRBTOeN3JWkwjMhCo1
- Axm9drrOMXXssQJYUhiA02IGadDyiBo9P6Gb7MZYsJhFJhSFfVRHb2XkbGuQX9R0
- RioxFh/pl24Ypw4sZZk68r5LQUa5QCsa6rusnOlZ10QIb4ubw+dQg6NcyQDqmb7f
- EOuWHj8MjMvfz3n+bsXWiozME1ciGrrZk7lvXxLNnS65CtAB0hqR67KLyG6uNjAX
- lyP433NjbtFsBPXIlOt8QI1y0ESs6jfIeq78+UlxfRtyqgia98objREsvsXYkUFF
- fTWquxKDy8lGe8iERxYgQdXOryv7a+bXiUF94TU3RVn0Y3p4IL4sMAIZAaaYiLpX
- 5BvjsuhjcMneyPMVrICAdFz7CkGCKww6ZaCuvl4R4rvDvI+86TLRFp/IYYT5L0h8
- 97QwFFgttNCl9NB05OttkFxEj/aOZvlZQhMA9LWbnF5K9L8fu4nA52NlCui8qGks
- uDDBI0v4qrd+jCuCCL0F7XTqWgWWzZFcipcCPAP1opOmHM7GUMbakvMp7XjFV+EC
- yLSI2tmBo68fdTffIO2pqGukZ7iqsDVNJuFaPqUvw3aqRvHeqAcyCCATexSlJjXS
- 5gHodc9mB9LnFHXd/pflOAWaidAzNLvAoTDCm0apYWdcNu3SSzp6QnZfaNzr8TC6
- M4FtxIXKCPmYySU7c7ELSX3kJh7XpcZo9dV+RB6BhXcYfeKEILjYAA==
- =yXAT
+ hQIMA7kpg2bgzVHcAQ/7BLvt0IlBGTtGuIF5sA5Jefi6Mw2jQoDmRMD8854wtMzb
+ zGT26uRacdDwFRYug2NIxbfZP07YwkuL87GjVyRYAWo/OVxP9CsdgohZWK1K6ont
+ VAjioeOX8oYCR3SFW/t9uPE9a46UF65xZk8voliuGkWruJcy7X6ZuLdCB/Eo2GDK
+ qHouO2otBy0AAcgH/O4cempxnb80Xi52Q/LiMTIwpEh+NjyHipYSNN1QHJshHupB
+ EQEEuNJmjPmSPXPbNJ9PgdP/j1GVdI0BrMvRepKEsb2LmJDsN50xyPKGidOROxc9
+ TH+kqbnW28HXR1QSLshFoXYqO0C4Yc0YeOCtPGs4Xb1FWxUcHhKZTPbLnuc6n7AJ
+ Xs/quu0VupPJdfsNFbAfmP3hTVFJoT95Pd18WmsYaAYT6WztNq0rCoKWPctcjPwm
+ bS++07xJ7Mm58QN2fd/KUHx+25udYtCw58kbaRFaR6mcdsCWtdvM7Lf6c3x3qEry
+ quZo5ShY7fF2viFGeYEsP32um98GUiYq+9VLuHJAya/di2Mmc6IAQASrSCXDyA6R
+ 9WAdSJtn3dmbMPnJvv1nChmhcHAi/8C9o8LjjiObEVwslBE3viDW3LJIUb2ouvRD
+ 9pm828kUwRDHhmtg99YPlKpVUbBRN918vGSs2ZSctrwTmg/GtkWY9AeA9sed5PXS
+ XgE582taLTN0+/HxFIjkyMPEPIdTcKDcHMZN3RR5cYnEK0NLt+QJigRRRg3Gf2eO
+ 0P76fa3NXXfCscOpHgF8T5VTm176o/uAVsXPfpzRRadQrtjEW1l2pgRoTy4Mub8=
+ =eLCL
-----END PGP MESSAGE-----
fp: 286791FB6648539775DB31B8FCB98C2A3EC6F601
- - created_at: "2022-01-21T00:21:42Z"
+ - created_at: "2024-02-06T18:43:42Z"
enc: |
-----BEGIN PGP MESSAGE-----
- hQIMA4oYbIHZIrAPAQ//a6c4178RnafGvEiP1mXjXDm3BwwpzVUuPV+iNdss5Hyv
- 09MEv3VcBnqg7rDsRZOq3J2P6U9PCVaAVoGxIwebL2dNSkA2T1fCowaElISpUZk7
- a2SbdqU1dE0l7LgnyEHHtHWl/R+B2yQ0C9taNEBYFEEdgvCC01so1NELOfwy99yt
- ATIg/flZNskP9lyux08N8MdFB6ISJCNo64/Qz7+cvyrTS6swLcBLOur9gh6agmPl
- hnie7HUSbpKzzWtHe8Py2J19/KzRqXp2H/6IbjD3IT08YcYFftBcKDPpCCP5a00N
- 2/s9xVH3wMfvyLnE4ZtPoG8Qnk38kcuWI5wC5Hj7cSai3LvDqSHA/gVZF+f07DW3
- FBx/7unAm6VEPFtmfK8sbyO0hyNzyFAQbe2N1kZb0B4HzfQr6LSo80gb+usq8TyD
- fLSsnNmFTB9v3fc6krECRdZHD4qA+CdJVlTPbmZNItauUUmdJ6K5tbSiWtag3EaP
- Jj8GFiBYlN31CKuY/Jm5QrMDY1CkOwaH9kMjLkvXsUTXyPFJHiNEiT4BhBH3Epmc
- KA3ymxFLzvYXD/5p3p4DMbM7uXeWAF4/aNG3lg9RMx2IKBPWIVGz8YaoiujhAHAa
- 1VWxHG3o+YeIaOKQsGH2ViDkte0J7rdY00k8PAxdtPh76jhhHZPKbUxeUGbdFNTU
- aAEJAhBeK6wKcyyCwb7oNLon6RahRMtGsCvVPIZ+yfMLeCnkT/zPvk1rjOQ3Gmbw
- ErnXFWUmFwyqpWCigGTB7lNwZGJT+VJRZiVryQ6UL5DrKTsswxWAuAZBGrii4ZOv
- k452MemknFsT
- =Uop7
+ hQIMA4oYbIHZIrAPAQ/9HphrwC9JlJNNqDyXh+ethdaVxl/L0Nt1LybCUrTDv8Vc
+ +Cm6TFygSHXO8jEYzMjsc5McH/4lrKmC8liMdGY2TgAnVL3WvFKdywTIO+4SrfoR
+ zULG7J6py5mBJvwvGaH9kg80aj9n2XXwpSe9hFsRFTKfAQECvilnLu/0JW8IteTF
+ 5Qd9l0Raf9zdGAp33COMmoUheHb69W23GrmCkkbqJY437PYS1AHE2C/VJFjYczao
+ UZPM0aXqYbIc8CUFOPKcwRZcCpUmQAeKkEW41053HjskHsmN4KkUr3D2z9Z2L391
+ yibQzffboGnsQ28zxR9ksx42mq12yGhmykaPoeVMD/I7CZpKeWmm/JAfFv3iFv/8
+ e03BBU3H1YaNoC2F1Kslb1j0T+P+Dlzn16LBvFMZxJWg43qzsLy6L3pO6IIDKopO
+ Wx/XPZ36ZAyRM7Rlnwztrmojkbu0oV+DaZQEZlPHwQnVsvGoE9a89NLUpFeFNsnZ
+ FaT5zwxU7FOPdVf13RxgivCmUMMoc3a26bBO/Y+POx8u78hToE7IvYhvTIBf2Frx
+ NPRzPQZv5j9e7MHnFsnlLAezowqY79Y2nsrhNTA1pFnx6sVssVvz9xs4cA4o8dsI
+ JowZvaoNzjNFqDG7UMhh0i/wKIMtr00bulYG/GKdbxddSQuLM+hqowCrm/BnMh3U
+ aAEJAhArC9rmk8KgtPmvBO19KdnXUo88+8KXtBut32XwZCIkwpuQ1RHU1n2Bnh6R
+ UneSQW4caV5f9phItiXRwa07V4iBbGVT0vM6N4HXivNq6WG5KqWXxTFywq6xWQu5
+ xVQ/haX4i+RW
+ =ChFf
-----END PGP MESSAGE-----
fp: B137EE1549DFAF960DD1E2B15147025FB9F09E07
- encrypted_regex: ^(data|stringData|email|dnsZones?|dnsNames?|hosts?|tang|externalURL)$
+ encrypted_regex: ^(data|stringData|email|dnsZones?|dnsNames?|.*(H|h)osts?|tang|externalURL|.*-secret|.*Secrets?|.*-domain|password|subjects|node|apiURL|.*(S|s)erverNames?|.*SecretKey|externalName)$
version: 3.7.3
diff --git a/apps/k8s01/goharbor/kustomization.yaml b/apps/k8s01/goharbor/kustomization.yaml
index 8bc1ab027f7621488c24d8e55a8e57765079ebc0..f844781465bc1fc089f7f12f4a537491f46b13af 100644
--- a/apps/k8s01/goharbor/kustomization.yaml
+++ b/apps/k8s01/goharbor/kustomization.yaml
@@ -5,8 +5,11 @@ resources:
- ../../base/goharbor
- certificate.yaml
- poddisruptionbudget.yaml
+ - goharbor-values.yaml
- ../../../shared/resourcequotas/default.yaml
patchesStrategicMerge:
- - goharbor-values.yaml
- database-override.yaml
+components:
+ - ../../../shared/components/namespace-baseline
+ - ../../../shared/components/flux-namespace-admin
\ No newline at end of file