Compare commits

..

No commits in common. "main" and "15_openproject_prod" have entirely different histories.

12 changed files with 131 additions and 208 deletions

View file

@ -1,13 +1,11 @@
---
keys:
- &argo-aaron age14uxgmvw26e7f82gkvxl0zwnfc5l75rdn5sms4zj0xrtrnlgn4qlsqh3kkt
- &argo age14uxgmvw26e7f82gkvxl0zwnfc5l75rdn5sms4zj0xrtrnlgn4qlsqh3kkt
- &aaron age1z5wtjmk0jw0j9qz9k5rrnp30nzqxrl3v6wgl7eryvqus28zekp4qpx9jc2
- &argo age1mraede6gqxkh2rkeq5fjrcflp7emenl2qn885asxvtx5erga2pdqujuexz
creation_rules:
- path_regex: .*
encrypted_regex: ^(data|stringData)$
key_groups:
- age:
- *argo-aaron
- *aaron
- *argo
- *aaron

View file

@ -2,7 +2,7 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: aaron-k8s-deployments-self
name: k8s-deployments-self
namespace: argocd
spec:
project: default
@ -17,41 +17,41 @@ spec:
automated:
prune: false
---
#apiVersion: argoproj.io/v1alpha1
#kind: Application
#metadata:
# name: argocd
# namespace: argocd
#spec:
# project: default
# sources:
# - repoURL: https://argoproj.github.io/argo-helm
# chart: argo-cd
# targetRevision: 7.8.2
# helm:
# releaseName: argo
# valueFiles:
# - $values/argocd/values.yaml
# - repoURL: https://git.ar21.de/aaron/k8s-deployments.git
# targetRevision: HEAD
# ref: values
# - repoURL: https://git.ar21.de/aaron/k8s-deployments.git
# targetRevision: HEAD
# path: argocd
# destination:
# server: https://kubernetes.default.svc
# namespace: argocd
# syncPolicy:
# syncOptions:
# - CreateNamespace=true
# automated:
# selfHeal: true
# prune: false
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: argocd
namespace: argocd
spec:
project: default
sources:
- repoURL: https://argoproj.github.io/argo-helm
chart: argo-cd
targetRevision: 7.7.7
helm:
releaseName: argo
valueFiles:
- $values/argocd/values.yaml
- repoURL: https://git.ar21.de/aaron/k8s-deployments.git
targetRevision: HEAD
ref: values
- repoURL: https://git.ar21.de/aaron/k8s-deployments.git
targetRevision: HEAD
path: argocd
destination:
server: https://kubernetes.default.svc
namespace: argocd
syncPolicy:
syncOptions:
- CreateNamespace=true
automated:
selfHeal: true
prune: false
---
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: aaron-drone-runner
name: drone-runner
namespace: argocd
spec:
project: default
@ -66,7 +66,7 @@ spec:
- drone-secrets
rbac:
buildNamespaces:
- aaron-drone
- drone
env:
DRONE_RPC_HOST: drone.ar21.de
DRONE_RPC_PROTO: https
@ -76,7 +76,7 @@ spec:
path: drone
destination:
server: https://kubernetes.default.svc
namespace: aaron-drone
namespace: drone
syncPolicy:
syncOptions:
- CreateNamespace=true
@ -86,7 +86,7 @@ spec:
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: aaron-hoylogo
name: hoylogo
namespace: argocd
spec:
project: default
@ -96,7 +96,7 @@ spec:
path: hoylogo/overlays/prod
destination:
server: https://kubernetes.default.svc
namespace: aaron-hoylogo
namespace: hoylogo
syncPolicy:
syncOptions:
- CreateNamespace=true
@ -106,7 +106,7 @@ spec:
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: aaron-hoylogo-staging
name: hoylogo-staging
namespace: argocd
spec:
project: default
@ -116,7 +116,7 @@ spec:
path: hoylogo/overlays/staging
destination:
server: https://kubernetes.default.svc
namespace: aaron-hoylogo-staging
namespace: hoylogo-staging
syncPolicy:
syncOptions:
- CreateNamespace=true
@ -126,7 +126,7 @@ spec:
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: aaron-surveybot
name: surveybot
namespace: argocd
spec:
project: default
@ -136,7 +136,7 @@ spec:
path: surveybot
destination:
server: https://kubernetes.default.svc
namespace: aaron-surveybot
namespace: surveybot
syncPolicy:
syncOptions:
- CreateNamespace=true
@ -146,19 +146,19 @@ spec:
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: aaron-cloudnative-pg
name: cloudnative-pg
namespace: argocd
spec:
project: default
sources:
- chart: cloudnative-pg
repoURL: https://cloudnative-pg.io/charts
targetRevision: 0.23.2
targetRevision: 0.22.1
helm:
releaseName: cloudnative-pg
destination:
server: https://kubernetes.default.svc
namespace: aaron-cnpg
namespace: cnpg
syncPolicy:
syncOptions:
- CreateNamespace=true
@ -168,14 +168,14 @@ spec:
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: aaron-openproject
name: openproject
namespace: argocd
spec:
project: default
sources:
- repoURL: https://charts.openproject.org
chart: openproject
targetRevision: 9.7.2
targetRevision: 8.3.2
helm:
releaseName: openproject
valueFiles:
@ -188,7 +188,7 @@ spec:
path: openproject
destination:
server: https://kubernetes.default.svc
namespace: aaron-openproject
namespace: openproject
syncPolicy:
syncOptions:
- CreateNamespace=true

View file

@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/name: argocd-secret
app.kubernetes.io/part-of: argocd
stringData:
oidc.aaronid.clientSecret: ENC[AES256_GCM,data:3Gy2J1vkqD4gpuEx9LmFDf95OnC7X3g4zYKEvKUL9JaNiK6uJapDX6a37nv3ORnnqhCgcrEdEhybNgJcNgK8vNO033QO92KbIF4rYCkxyulyGHcv4h43qvnDgoR+ac8Wr7fPlUUhltLMXnIXU3XJN8mMNlaNeuMSHgj0wCrAxnc=,iv:gWIkcidScnnQHIK2uWgj8oqexj/VV32/Frki3M+mzok=,tag:fAIgWIt3WQKAOsavEkwDGw==,type:str]
oidc.aaronid.clientSecret: ENC[AES256_GCM,data:ZrhSXPm+p9iD5tvJA3hyqiGw2czrO3YLbWPe7WvQf2Rok28f3V0a2DkFR336+5x4YTF6Khw1qYtQH6Kgc1HS7RbY7RDpynAwO2JHrxApfUir31UZ2oNsbTqv7nyNSrMFR4vgLEx9WSTaM66c43sgevdaCodDbzfiSe+Zjwrdcfw=,iv:Bzf8U16ZlkflMFM6BlfBbiJfaM6YzxkUXPTXnfjbApU=,tag:7T5e75XFm//aoTLTtQR3mA==,type:str]
type: Opaque
sops:
kms: []
@ -18,32 +18,23 @@ sops:
- recipient: age14uxgmvw26e7f82gkvxl0zwnfc5l75rdn5sms4zj0xrtrnlgn4qlsqh3kkt
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBudHU0M0lkWkhtK3VoMW11
MElWeGNQbHV4VkZJdjVtZjVES0habHNSNlNnCk9CenFSczRzNnh3VE1sY0RORWlK
cDVhNlpCVmRqd1A3SFFRak5rZ1diQ1UKLS0tIEpJTUI3aHdCa1c1TEs4VHAwNk5s
ZjJ3SWhLOEFiTFBLUzJ5dnlIWDJockEKyDE0oWagwADB5HpdiafTu+BD10SbIacv
PchR/y5EOfFShzQ+7AEal2c78ztJO4D2Hd900RIpkoMkmHOyzq2bAA==
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlaUIvZmc3cFcxSExFcjhC
cXVNaU5TdVpGR09jTkIzWHNrTHhkSWV6ZXlvClArWGFwNlhtbzJVWUNIQXlCNlEr
aWtqMHdyNHJNTjM5dFQxN1J0QWtHTW8KLS0tIFBnWmI2NFhERWRISmVuVjhTK1E0
TmpCTWY5T1QxWnFlZG1TRUNuN1RTNmMKpadrE3scJFXK7qc5WADHtAJ4LCSvzsd9
j3Ew0vCLEVTjxON6rBD6k3KqZdIzQEJnDNJWUiPUaoPP+1FIl2cxvg==
-----END AGE ENCRYPTED FILE-----
- recipient: age1z5wtjmk0jw0j9qz9k5rrnp30nzqxrl3v6wgl7eryvqus28zekp4qpx9jc2
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwUngvcHBmekpsSGxac2d4
NmtPZ1p1aldacXVoZGFQNUZJZTZsL1NEVkNZCkRyMmtxelcrQ3FTRGk5OWltQWxp
VndydWNXWTc0d3c5MlVDeEIyUVRLUm8KLS0tIDZFcSs2MVJHQ1NmWXp2L2hkRTFE
RFdxZlBNekpkY1paeEVnTjk2SVk3S2sK+gftlDHXbLhHfDt+TiNlcz8xTgkhpiuX
8FPvMfpK0/JPjnNG2ueofYhLmiPW/2h8GAMa3yjc/mdp+jnXkHuRdQ==
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnVnBnRlZlanI5MGFvQlpO
TEdldzQ1RkV3N3VwcUo1WXNBaGlSRFVqS1Y0CkU3RzUzSzBtU0dkZ1M5YXN6eXpL
OE5sTmc2Q2I2VnBna1lHYjQ3ak4zZ2sKLS0tIHVvelVTU29GWkVNeFdOLzJMdEY5
UDFQL2pGNTRlcURqcFZkTG12YjRmQUkKDe7jb3TtIJXIQfDs+VuIHFZjtnKfC6Sc
caPhCC6KBejq5hyJXSOHXh6n+xYshNkzEkHp90gLY41XFiAPHU6Sfg==
-----END AGE ENCRYPTED FILE-----
- recipient: age1mraede6gqxkh2rkeq5fjrcflp7emenl2qn885asxvtx5erga2pdqujuexz
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHMGZPQVBrV3ZWWm9oME11
NFgvTkh2REpBNldFamJCVWF4UW9qcEtMeUJVCm1mUGJKdXAxRlZPd0YzL1hvQVVK
SVBDcU5mS1VGZmxhTlJPM0xra2l6NXMKLS0tIE5KLzlXREF1Z3crekdNeTZJWWEv
L1dPa3VILytUa2xuVnVKdldoMllxRGsKi1QnyfIeFMxaFYf12akgUi73NyLxME7S
7u5ORruhUILOZTvpX7tzwdn5aUajtxeBsaPdlJdzY4mRsa1NMIOx5g==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2025-02-13T20:19:15Z"
mac: ENC[AES256_GCM,data:S34dLDOUeKFdUX08bpZ8kfrR8AmUpJPElBuQz7Mo8OmYZAWJkMJa+7Wi2v8rY3iEl5Y0n2hWpuvUVFfuBlYQeiLzsaPpJ4WTZkMXctohs+QPronFCeDbNUwdRG82gPvsSxoybVlVzF3N43Aov7Wr7Eff897o/5Blky5eLmGb2bA=,iv:d8YQN11RaSrDvLD08Bw2130HaDxrpA+wIOu03x+MRqA=,tag:tY+9MSeNI/JfGOB6oHxTaQ==,type:str]
lastmodified: "2024-11-04T19:32:15Z"
mac: ENC[AES256_GCM,data:pzukaPYOzoo3vsXpwMiIpXCuOGy2MlWAsAuPvjsDimKb5kvYeZiVKhiT2BID6TtEcGL0FpX6pyrwl6c+lwK+5fcsKRGWPLowZ47RAQxnctieRH+QneMTnmIHI6Ex0PmDPasnG1EMoXyitGDNO7ouEk1ie0AK9z9+xVeyXCtUCRg=,iv:CzUiJmvUBjpwVmf0QW1X7b1CsQlSMX2fwnBHoqlRbo0=,tag:5yxJZOzuQ720YEQAbaHY8A==,type:str]
pgp: []
encrypted_regex: ^(data|stringData)$
version: 3.9.1
version: 3.9.0

View file

@ -5,7 +5,7 @@ metadata:
namespace: argocd
type: Opaque
data:
keys.txt: ENC[AES256_GCM,data:wYdwuaySM50djWshzIpbD/6GaNtQTJsqyB2naldo63EzHAUknZrQ/TpuUD8uXQWsxoaeAmEE76moj8lVEZ4tn2CuYreKYQOKWGWrMvggfx9hzeVz+vkUpZsStiFwQN5hvwNsHKcokY4Tlt6/F9+J3wDzTA8qtFgbmntf1T0NJE7MrcCm8ayzC0UHrZQTsSPa5x4NP0N+hHxSdizgA0arSRid50GFgj7aEeUNHPwMMayt1rd0rDGj8wrAEMn8/q0EJyjTK2MltSWjGJb8qyZ99kzG1k/44FwuP7MUB67n+J0cLoVreO4I7aJmQb1E+3bHxUSG7B5PRUIUwAlE,iv:io8SCnrwfzmQGrjD+oH1ZrI809bEgPlhOwBEzF4V7jI=,tag:pXCWvlszalTwDL9oKxOBcg==,type:str]
keys.txt: ENC[AES256_GCM,data:ywffPwk3i+622egcKEB3QmBdnRmcaYhtaF3niX9YzOAutQUuCAaKMjEZWbl5+S9/CVfUg+iVaBoUCSUsjzaFrf22upS45ayMnzS8F9JzvAz8L2IEecEhwDvbUtsupbpciOGYZlA+XPdRb6ab+VEnuTnrv7hIA0agdRdje/qlRZwJ8Vsfozq1xuvPFWKdtORcB6mA3pZaTMheOqEwPbosT+WD7Hn1m8rK1DG+pDQsRHb8TwBXK+YfyWnvScRa04jcvhPg8nyg3lZS6PjRLGKXZ5g0MytVDXJWzrGOfU3cUmt3XUM46Vl1t8gF/Y1P+jvFeNjK8tRdze1nUpee,iv:jUOFyM/KB4b3h9UZAyM64c6IDyL+Vw9kA6qDRRD7/uw=,tag:FF3F8R4cf/59ncGy4sbkHA==,type:str]
sops:
kms: []
gcp_kms: []
@ -15,32 +15,23 @@ sops:
- recipient: age14uxgmvw26e7f82gkvxl0zwnfc5l75rdn5sms4zj0xrtrnlgn4qlsqh3kkt
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvZXFwN015MnVIUXNncHo0
cUNRYUxacHpQZXR6MlhyRTBIMmxLZzRiTlhrClUyeHgwbVR3TDVTTkxFMkNiZjFV
RlpqZVQwTTI2NXZ0V2Z3Wm8reXVxNjAKLS0tIGRtSndTK0NMZkNFUzZiM3BpQkFh
NmlOMEFaN1N6RzA2YmQ5dW1vc0pkaDAKNHam03rJ6NeWRVyesa0NB4NmCi8uKTvd
wamq0vOCtgsUEo/MnHwe2yTtdnEB8OdoHs6SjPErhpUAQQfbXZ+llw==
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkenl5TnBHSWtXTU51TnZa
Z1pReHZlV0pPRzRsQ0RxUmsvWVI1b2RMeGljCmdSWDllRnBMSnlVSksycDI3cVVZ
TmExeEtuWStYSi9Ub0VCZS90MzZFZjgKLS0tIHEvSm5vTVVWdkRyOWNuRlhINzZY
RnRLR1grWm02UVE3TFhid3p3RHVSNlEK1fzRPAgFJmV3zEgX5FNNdV1zfd/Tv1q3
g8HEyBgyfBAm6SXIB4Z3uTGJh9rJ9mPuTecFkiThn6WtSJJHRgQ7lQ==
-----END AGE ENCRYPTED FILE-----
- recipient: age1z5wtjmk0jw0j9qz9k5rrnp30nzqxrl3v6wgl7eryvqus28zekp4qpx9jc2
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3OGc4ZG92eHZ5N1B5UUlV
aExPak4xT1dvTGlFd1NoM3gycDNGeEhONEhJCnVpek0vZTRXaWc3Q3ViV2pPb2tF
VFUweDNsUmxGK01BQlBlTlJwdStGaEUKLS0tIHc3cjFNb1Z5cGpFUHR0MXloT21V
ZDJnQVNwYnYzR3lmdm8zTnJuaWlmek0KG1FMz2q6WWW5ZYzS0U0Uj5KPnXfJZH7n
8DeQ0+mCFX8fYQXKFL0u/NsnPVAlEb96nAsg90K7h0cXMmk7rMNLJg==
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwSDV6VU92dXM5QTNSdmps
S3JCL2xZVERBOTZHZmlwVFptczZWMmpkZlIwCkp1TW42NWJveHdZOHp4cXY3eEpM
UkIzUWloNDJLQXRWM0g0ZzhHTmVyczQKLS0tIEE0d082L3g5MENlOTZFYkNtOGFB
NnRtdyttNjNWaGlOd09SdGhXZnZ2VE0K3bKDIJO2RQPY+1/p7nlwzZraPVnW+8L+
wY1MoIdwygMcH5tmo0Jy3sLWMupUHQXQM9CX933wTATRPJtojLS4HA==
-----END AGE ENCRYPTED FILE-----
- recipient: age1mraede6gqxkh2rkeq5fjrcflp7emenl2qn885asxvtx5erga2pdqujuexz
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEVWs0TnlOR280U2V0WnZY
QXBLbTZtZU5aOXFNK2VUT0dnOExHYit3bUhrCnJKQm9LSzJsTk9SMGNML0xVOUQr
d2RSQmtHYnpxcXg4UFVtY3krRXIzYTAKLS0tIHJVMkNpd3BEOW9GY0NpYnc4Q3RM
WDdJZk9BaFVLR0Vxb0d3RmZFUFBvZVkKfPZ2KcflJ2Dz+HrSCpzQ77lkN0WbavAC
vP0mNZpg95Vpeg17oSHwl6KysYf8c+iPOHPVzNFLT5/mFyDB4DfStA==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2025-02-13T20:19:15Z"
mac: ENC[AES256_GCM,data:PVQpcs86R6/AAkiEio0bbN0OSPS6Tmj8s0S7McjJ/KSGPnFxnA5WxDXlu2AdK/5Dqp1Q5QGn+sHjNMeW9/GnxGEkUdhI+am15IV3pUU+IK41QgTEh7FTmBMJaSgdZWeNFSJEQuTUC2jKORl+jeFssCjoT3h1b7u/oQMvTOidCjo=,iv:RgPjRpRFrBssoSts14Yrnf+kuyuVUhg+JNrLSsgRmpg=,tag:0EyIz8OJw86ELFYO6zB3lw==,type:str]
lastmodified: "2024-11-04T19:39:31Z"
mac: ENC[AES256_GCM,data:OEeKuRW4Wvkqd/aafrvhNQxCQmuose5b/PfzxGh5a0+cN5ORib819ksjpLu78AL2rOhc0qRff8hi8TgWpoyBP7BiihpmCxZGFabITTAbH8x0Nacn3fef30K4Yw8AB7gLXrN1fwA9PLxfFoqmzsPnMh7xpEKMEKq1T0/ijqvmGJM=,iv:BM5gC/Vi4COBSFC/BHxV+bv8WXDwF+6eEx64ROIqpd4=,tag:WxwbtnYxa2okLdWUxWI7Yw==,type:str]
pgp: []
encrypted_regex: ^(data|stringData)$
version: 3.9.1
version: 3.9.0

View file

@ -2,9 +2,10 @@ apiVersion: v1
kind: Secret
metadata:
name: drone-secrets
namespace: drone
type: Opaque
data:
DRONE_RPC_SECRET: ENC[AES256_GCM,data:jrF3Y4c6HVYse2h8MhzPMTfLhD2VLmAGyr4yxjf0gFspTAVLcYwNtoJbjnI=,iv:7xGbWm5exOTDYJc3Uwj++9HWheyJI+F0SypeAmK7HcI=,tag:ksWv+zzc8fH9a193cNwYXA==,type:str]
DRONE_RPC_SECRET: ENC[AES256_GCM,data:9wEps0DmvV8Qqx2dARB6M1stwAdf547n5rbVBEiaa4lL5GPAbHMgOI7bYIo=,iv:3SAA0PNJT1ajUx1SJWNpX2AiJnmcFf8tJCrvOW3fJqk=,tag:Z3yuE/jfyAldVjrdIcPlFg==,type:str]
sops:
kms: []
gcp_kms: []
@ -14,32 +15,23 @@ sops:
- recipient: age14uxgmvw26e7f82gkvxl0zwnfc5l75rdn5sms4zj0xrtrnlgn4qlsqh3kkt
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4cWRBQzFHTzR0WUNhc0Rl
dWlaTE9BTUFBb250c1ZaVjRrVUY3MjBXcDNjCmgwMjRzcFlmc3NhRUhkdHJHa3BV
bis5VWNCY1JFZ0ZpcjhJUWcxZXluZ0kKLS0tIFk1NnhSMWxvZ0JuSTFTV1lwY1Na
UW1YSVplRWNZc0o2UjNDUG5CUncvbk0KR/UDgABlTT4wA7CcE31LkPOMk7sXM6jr
rccWRqlgEyvD3AgRPQNUEZ/3nJbORhFLDt8jxsT4POFsDtZvxH1f2g==
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBycHkzcHNDOVdBYjJLRGpz
MkZ5T1UwOEEwTG44aGVuWk5zcnV2NlFPK0NRCkh0VVIzOVh2dWlaWG1hVmJQRE1p
VmhrNERFMHBpS2RTM3EySXdTSExmY3cKLS0tIFpWK3hMUG1TS0dTcTU2VUlkemNt
WlNZY0JmbVFWaVgxaUFlUU55THlRb0UK+P9mB8LDRFlnvYn0CXxzLSa8rB+ms2WF
INPTca+SW4sC37wc3zoIrdzrGuNai6FZbKRwrUtt40eDwgU2n/TANA==
-----END AGE ENCRYPTED FILE-----
- recipient: age1z5wtjmk0jw0j9qz9k5rrnp30nzqxrl3v6wgl7eryvqus28zekp4qpx9jc2
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTYkljMUlGZmtnNTU4dnR2
dXFyMkNUeFVHMENZa3d0a3MxNGpyYlhSS0VBClVXaXBVTU9GWkNjWk9OakNxakJK
a29VNzZ1UGFqNFhWclRONUw5dFo0WVUKLS0tIEQzS2ZxeldzZFY0cWlvRzIvVkl1
MGJpczFOcThtTlVrSUROMytRNVVkc0kK0iO5dHZA/PhRGczCqFa1frXGMfJE30Cq
ZVfX5HcndP/87F5dv8FO2A9EJz4riz/TjuOpxIUhinDul7JI0T4KQw==
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3YmJiQ2RvQ2pKN0xQbHdQ
bDM3SWFPM0pUQXB4eW1tbEJEbWdSWjVTeXg0CjE3cVNEM2Y1UHBLbStrRnpsQUM4
cUh6aWROY0wzYnljdTJRZUtKODVBU2MKLS0tIGFybkhLUFF2ajdiZlQySENRc1lu
OXlPbmxsbDJQSlloSmtQb2ZQMDduUEUKnwnwWe3/oovkPlyZtUpoJVWAiW0rPFl+
PHbo0vrkCkvkKjtXSBP9RPE0sgdPHaYDez9Ea7Q3qdKyYsCKTebapg==
-----END AGE ENCRYPTED FILE-----
- recipient: age1mraede6gqxkh2rkeq5fjrcflp7emenl2qn885asxvtx5erga2pdqujuexz
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBUXREYjJEUmVwZ1ZTTmZh
cnp4K3dYdmczQ3o5RWFzMlF3NTRrOHFaSzA4CnBFbXk2MXVpVUxudXBMRWJwQ0JW
S2M3UEp1Qys3L0J1KzNsV1R3d05zamcKLS0tIDhMaDFmeG1vZWkzWDBKWGVoNWJS
REFDWXpDUkVkSnkzSmNiMzd6a2ZsbUEKFoDTBpjI/VCPCeqE+hVNk0zswNEWbnNw
TTwVfQ1xOXD5FeH8B+9zHo14UTi/Cp9T4OIcYNduKar7K0rQLlgz6A==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2025-02-13T20:19:15Z"
mac: ENC[AES256_GCM,data:kCdPeuBOut4sXFYcp5uStaERQL8steUy1MZ51hWlP7sDfHpoKIV2oEEbRDlVy/2+no58WfH161J8gy5dw+B+ambwkcBShUA3D8yR8akX3ZlCSPR+Xp/KsUrtM5CtBmWpCiaI+0RZUnEXcRRWYPzHA4g2Hmrlg5mMmcD63zmV100=,iv:nXWlCN+DNLovf26fyCMDc0GmVtCaKB18pZUVpbqfjzw=,tag:QNT0A0SN8Vt992WAukNpmA==,type:str]
lastmodified: "2024-11-04T20:00:35Z"
mac: ENC[AES256_GCM,data:8gPH1/iWNTkUcCcW5A/+QBSHIOphnCFz7PDc7muwOfgdS7CRfpUrMbsT7smZzsC5TXuy6n/tzYajNqOkuJNzAXeHTAulD5wD/HqwLrFjhO+2zo4m35l8eN9q+AYjTvMXCvK3Yo929gAJa65PXnMmx1kjjSC061KjPrF/Ka0o87w=,iv:Mtn8rx6Lwm9nXh+9km4JyWUr6xFkr+wk2w04QTLdLac=,tag:fL1mFqS9d/HOvZZfPP625A==,type:str]
pgp: []
encrypted_regex: ^(data|stringData)$
version: 3.9.1
version: 3.9.0

View file

@ -6,7 +6,7 @@ images:
- name: git.ar21.de/aaron/hoylogo
newName: git.ar21.de/aaron/hoylogo
newTag: "4"
namespace: aaron-hoylogo
namespace: hoylogo
patches:
- patch: |-
- op: replace

View file

@ -6,7 +6,7 @@ images:
- name: git.ar21.de/aaron/hoylogo
newName: git.ar21.de/aaron/hoylogo
newTag: staging-1
namespace: aaron-hoylogo-staging
namespace: hoylogo-staging
patches:
- patch: |-
- op: replace

View file

@ -2,22 +2,15 @@ apiVersion: postgresql.cnpg.io/v1
kind: Cluster
metadata:
name: openproject
annotations:
cnpg.io/skipEmptyWalArchiveCheck: enabled
namespace: openproject
spec:
instances: 3
storage:
size: 1Gi
bootstrap:
recovery:
source: clusterBackup
#recoveryTarget:
# targetTime: "2025-02-12 21:00:00.00000+00"
backup:
barmanObjectStore:
destinationPath: "s3://openproject/backups"
endpointURL: "https://fsn1.your-objectstorage.com"
serverName: "db" # in case of restore change this
s3Credentials:
accessKeyId:
name: openproject-secret
@ -27,31 +20,4 @@ spec:
key: OPENPROJECT_FOG_CREDENTIALS_AWS__SECRET__ACCESS__KEY
wal:
compression: gzip
retentionPolicy: "30d"
externalClusters:
- name: clusterBackup
barmanObjectStore:
destinationPath: "s3://openproject/backups"
endpointURL: "https://fsn1.your-objectstorage.com"
serverName: "db"
s3Credentials:
accessKeyId:
name: openproject-secret
key: OPENPROJECT_FOG_CREDENTIALS_AWS__ACCESS__KEY__ID
secretAccessKey:
name: openproject-secret
key: OPENPROJECT_FOG_CREDENTIALS_AWS__SECRET__ACCESS__KEY
wal:
maxParallel: 8
compression: gzip
---
apiVersion: postgresql.cnpg.io/v1
kind: ScheduledBackup
metadata:
name: backup-openproject
spec:
immediate: true
schedule: "0 0 0 * * *"
backupOwnerReference: self
cluster:
name: openproject
retentionPolicy: "30d"

View file

@ -2,14 +2,15 @@ apiVersion: v1
kind: Secret
metadata:
name: openproject-secret
namespace: openproject
labels:
app.kubernetes.io/name: openproject-secret
app.kubernetes.io/part-of: openproject
stringData:
OPENPROJECT_OPENID__CONNECT_AUTHENTIK_IDENTIFIER: ENC[AES256_GCM,data:u0EqZSaIBVEavmNVevNcO1ZtlMHZfdXDi4s0Rfjo9NyeIIsN3rHWuQ==,iv:mvhGi5w/kCOQGcTaQz8FOeGBvaP0NSH4DRzFhA5IwQg=,tag:P9CYCymCpWPZ0+0Ujc0rrQ==,type:str]
OPENPROJECT_OPENID__CONNECT_AUTHENTIK_SECRET: ENC[AES256_GCM,data:z17lplltjJd+LnmceX9Hdak6BHVaZ1nSHWt4FMiSbCtl02igdA5i3jozUyagwy4y+B5TMrla+BmK5KMFoZsalpThJZjWFcOZyo8BtQOeAEODXnwNg6Sznmhvya4BTEzdzkqbeOIYp/38rkcSUeTDPwo1ca+M9tb2udfvTmIg6FA=,iv:XEOCc5uUu4s5DQTnClCv1W89x4T+TS4zQS/G6V9UedI=,tag:GjY97MANIMAKEOgelbeprQ==,type:str]
OPENPROJECT_FOG_CREDENTIALS_AWS__ACCESS__KEY__ID: ENC[AES256_GCM,data:0vVJDBN9yl+K+LAAfvtMMQPX2YM=,iv:7PXtPZsYlOffhJMu4l6MRgBKkC8sI4R+6DFWIGK3rJ8=,tag:4XEdO10j8VXMCDst86KYFw==,type:str]
OPENPROJECT_FOG_CREDENTIALS_AWS__SECRET__ACCESS__KEY: ENC[AES256_GCM,data:OAZ1embfVUQBorMd69mBaGy0fAI4TEjuwDzCyriWQwtlSr/xsi1ypQ==,iv:eOu/LwYxsoCKbx61gmioLm8Zn1rfIVd2Qsil03r6Kro=,tag:/hRprgV+c9Qpwsbpkdj1xg==,type:str]
OPENPROJECT_OPENID__CONNECT_AUTHENTIK_IDENTIFIER: ENC[AES256_GCM,data:YRSk6WbIi03tMl5PE+jVeWUjiEsMogGSjcd71DWmdhrs9hx0gHz/6Q==,iv:9a5cATFe+sGFVvIcIq702XZpWbwCpkEgbHL04WC73RU=,tag:t/TAeA5lkVS4V5EWZjP96w==,type:str]
OPENPROJECT_OPENID__CONNECT_AUTHENTIK_SECRET: ENC[AES256_GCM,data:iP1vQTVCS9iB5qBvsT4HCpXg/7vEaqEvMBG8pkjapx7fwdzUvPnumqT/4kjT2A0G0B8hvbNbLXlBx3u3bznUjFCyQXizDmsP7y5IewtQD9x1Gjcc/3PyijUauXTIYt3DjjhJqStiDsc855LGbdBukowdQNZwTdHGYkEmZmlyNnw=,iv:msO6nSphjMFwnRZ+bzyPJDOMfAVMpYzf6bXq6m5OYJU=,tag:zxYWhn3zXHKdGNwyAoOq6g==,type:str]
OPENPROJECT_FOG_CREDENTIALS_AWS__ACCESS__KEY__ID: ENC[AES256_GCM,data:d4kh/eBE35VT5dE3oIAQiIIaC54=,iv:0/Tvwi5zWHetytYPWsSTEcVX8cc7MjwQQpgD2j/2blg=,tag:WTuGgku1aQYcChf1dTShBw==,type:str]
OPENPROJECT_FOG_CREDENTIALS_AWS__SECRET__ACCESS__KEY: ENC[AES256_GCM,data:MrOc+zr6qkv+55vjuCciijW1bnjKyjxr0mbbH/IajNjMvDIVqq7GDg==,iv:0+GBZuWA6t5Pp5gKeIczrFKdTYMznV2fTSuJxS/y6Do=,tag:zq9QtqFANlUFJL737Sa8jw==,type:str]
type: Opaque
sops:
kms: []
@ -20,32 +21,23 @@ sops:
- recipient: age14uxgmvw26e7f82gkvxl0zwnfc5l75rdn5sms4zj0xrtrnlgn4qlsqh3kkt
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6U3ZOaHd3Q21ZbVZudjZp
Y1BKMUdhU2ZQU1M2ZVlpNnVLMlRhNnZyTlJvCnI2TWZGR04yTWhUTllwUDI4aVlF
d24veFJwSmV0Y2NjL3l5ZW44a0F0d2cKLS0tIDdTMndsTk53Y3Q5WEpiQUFCRHZt
QXY5NTYyNldCSnFaQmE1QklTUURETDQKNlWFVA6qHmKDazv48PVygwV4/4cgBtKK
IYPcP2N0/T0rDw2ngw4lNdHJ90doTTmlUjiPYDmmfopGOi1XpoG2dQ==
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByT0xDY1ZMNUtydlZqNyt4
RGZhYTJCaTdoaUNDcUU3c2djUFFrb1NPWmdBClM4ZXZ6aUU0WU1NdmFLYWlHUVBy
VlU0VlZnRnQwenJPdGRSTFBac1ZlSTgKLS0tIGowNGZBZjgyMGxJbTZvOWRLS2Jr
ZTczeDVvYytjK0dzUDY0QXdaUlVyN3cKM+tC9agxFrnjpfPXoNXxCinTNXJ2gHyO
xmkLs958EAJZ8LuFfne01Sak/7ojRny+PzKb9TudIggCUoxAW8S0+w==
-----END AGE ENCRYPTED FILE-----
- recipient: age1z5wtjmk0jw0j9qz9k5rrnp30nzqxrl3v6wgl7eryvqus28zekp4qpx9jc2
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlbDlvVldrL2lCMzhsMjg4
aHo5aExVWVBDTGl0RGtqUEZQS1JyWGRvZFFnCkNyMzc2WS9aS1doa1Y2R09JM0NJ
eWZRbEtNdTN1YWE4N3hqVDRRekZ0cDQKLS0tIE5oT1FCQlY2TDRlM3JSM2p4ckM4
bHBpKzUvVi9YbHNNcjZEanVOeXB4SDQKFAV1upJgJzRlXzEB9FEW2sSeebC8dGt8
xdfRIMKXn1pnf64N69ZnJ+hbcDvuMPnoSBsZ7W95nF0lItYfDIyHFw==
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxU2dyTnc3eCtSNFVBeFQ3
bTFndGdUYXVTdnpnRTJVQjI3Z0RRZ0FkQzJ3CjZ6ZHBpU2w1MDRFUzJQL1FKS1Ex
N011MUcyY0hlV0lYREo3Tmhhc1NXZG8KLS0tIGZpa3IyU244OXRGZ1hQdVlJbzZr
cEk2ZEp3UzArK1NEL0E2Zkwzd1dnMW8KWWQ861ukoDUh7l1iFBnnrsInQWfeYgD9
d1y8yHr1kLZX66xg9erbaQbA+xtRRD+5sctypxJWPNkDO+rW+pfrAQ==
-----END AGE ENCRYPTED FILE-----
- recipient: age1mraede6gqxkh2rkeq5fjrcflp7emenl2qn885asxvtx5erga2pdqujuexz
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUdDEyanpERGpaMFV2cE5n
dmg3QjYzNkk3R2c0Yk1OTHlpRlZLRkYrNXlBCjJYdWRNeVVCR1FEVXBoZlJwU0Fn
aDFpbG1nbXRUOHBZcG9jMGZqeFM1OUkKLS0tIHZkYkQ0dlN1UDBZajRhVWZXUHVR
ci9LK2JjSlVvaDR2UFpwWGZmMDhQbDgKxcvqSMhGzpxoP2OSdjs2KsA9cd36j+xO
JYBFmTQnb4oTTzMQZxMAowaiqDt4fLsD6fXcwBnclq2SwAGsOlzvJw==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2025-02-13T20:19:15Z"
mac: ENC[AES256_GCM,data:qloZYbT1ht2wTzTVD5O57C/VVHy80yT0bIpB+mSjF9yvvDF38rpUS3FuZFoXoDeyaniCml3IUV3Bww/lHXoHI/nPr70Vsl+Q2n9FdUnD1JKfI/kLqvk+XM5HB8qqY4XFXhjwZOGrbN3v5Stgi+CWb2s8518g8OCSdR8pyaWDSqc=,iv:4v77gZzMfjMYyF4K4BOBCdYbxk0wa3zrruy7VD7Tux0=,tag:50/uxJDqgvaEItqMepWwoA==,type:str]
lastmodified: "2024-11-06T20:53:34Z"
mac: ENC[AES256_GCM,data:3LaUkQy4IViYIjKHOJ71pIcPipv3p44ENAd31270uGsZNmOAlGqPcylF7Dlc475UfKrHXAZaagGKF80VkTaE6xca+Uq9ihUg0U5ovLyVbxBXMEjmycCBJXaKry17kju3eQec5dinqEBQ7+uU39lSKdhGPPvbZDYxu3WeZBWzrSQ=,iv:VN+W6S8t9RW06DnSoo+AY630bo4PVF027qtanv2YRh8=,tag:urMNwqclobcL7bxCJY5NbA==,type:str]
pgp: []
encrypted_regex: ^(data|stringData)$
version: 3.9.1
version: 3.9.0

View file

@ -1,7 +1,7 @@
image:
registry: git.ar21.de
repository: aaron/openproject
tag: '36'
tag: '15'
appInit:
resources:
limits:
@ -51,7 +51,7 @@ s3:
postgresql:
bundled: false
connection:
host: openproject-rw.aaron-openproject.svc.cluster.local
host: openproject-rw.openproject.svc.cluster.local
port: 5432
auth:
existingSecret: openproject-app

View file

@ -2,9 +2,10 @@ apiVersion: v1
kind: Secret
metadata:
name: surveybot-token
namespace: surveybot
type: Opaque
data:
TOKEN: ENC[AES256_GCM,data:WZam3tkyfl+fkpCqegB2kiBmuOMeEP73vnb0o7AlJi9iv7Y2zGvvIQ/oJfB0kCw7w7s+8mVMGG+iTyDVZeQdjPv1j4FRPd7GMMSo4qWVBSs=,iv:4CFd+2gvroLuG0IqzNWVR7s3XVlbvrXg3no5TBZmFVM=,tag:0zCH6nRw9Vt7YJ0jnDFx2A==,type:str]
TOKEN: ENC[AES256_GCM,data:HZpvxzlqgtHIXstqo+wH5h1SVfBBS7aV7fPEIGO3gq0Hu8wbqMDq8nzBnGHQik+5jR0AoYQvRKLqD+VyIPgHQX8Nc/15er+pyCxa2kLXXPg=,iv:3dcWIVEU7HzkBCA8IT6lHPzsywmW3nCM0HK3Wr8r5eA=,tag:QplCTrlD08dpZvZjBdvlbQ==,type:str]
sops:
kms: []
gcp_kms: []
@ -14,32 +15,23 @@ sops:
- recipient: age14uxgmvw26e7f82gkvxl0zwnfc5l75rdn5sms4zj0xrtrnlgn4qlsqh3kkt
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWTnJ3RDVMa2tGOE5TU09E
dkI0czh1TUNiQWlYUHE1bmVYSlIyVDE4b0F3CjR4ZFRYSDZqL2ptVHZwaDBvMDcr
cjBaai95MjJRLy9iSVBQdEFTdWxObFkKLS0tIDhCMnRzNHNYWnBRZTNFUUZMTU9C
YXlPeWVSS0pvTExiZ3lHM200VDk3dDAKOgPg5+uUivaV4sYLjdZ8QGAEGWs4VNC7
DK1SqXemv6Kod8Jcn2Q/5Bs8SrN4mZyI4rmZ16c5iTjmHjmNBq5A6w==
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrd1ZReHRHazZzN1VKZVFK
eXo1OVhhL1hjeW5WMG5GNzUyWmFMUXFoa0dvCnhvaDNSNFRnMUJVMkxGRlVtRTR4
WERLanJPbEs0ZTlGSEhudTQ0ckFDbG8KLS0tIDlQTDc2NGxDelMvZXk4WHJ2cTZS
dzkycGRVTW1FRDAwYk5OSFhoSkVPVG8Kvuhx+kEUCLwVlTxVWq2HXzszM4nJE09r
4nOrW4ytSsC6BM4DR1WR/hbqY+cz/xaHEbCfQBaH4NYQUuaONLICxg==
-----END AGE ENCRYPTED FILE-----
- recipient: age1z5wtjmk0jw0j9qz9k5rrnp30nzqxrl3v6wgl7eryvqus28zekp4qpx9jc2
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0ODVuZi9lN1d6SW9rRWlT
OUlmWEtlR3orMzVhNWd6TlN6bVR5dGFpbkJ3ClFuVnFYSTJhVE5zVlgyR2d6SU4x
OXNWMzJvUkNiUXpnWUpZTFI1dFE4UGcKLS0tIHVWbk9wUnNQT1ZsNm54Yzh6bGxK
MktuVHlwcjRrdHVLZ1ZucmNORnZ0a2sKFKIJKNf0n7FBeVNevO34/F4hPc/jxve6
4zvgzzz8m1cug6NSWYuek+/4tf5SxKeEufWqxkFXPrE5c0LJD4Nt4A==
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCN3pEOFZCSm90eDFBOEhS
T3RSVWh1ZVI1WS9pZTRkbnJMR0E0S04wdUhVCitFdk5hWjhWNGNqenp3c0dCZGNk
S2NrSk1Ocmx5WDkzeFRFMk5id3VheGMKLS0tIDU3a2Rvb2VKUHEwWVJFY2k4UHNl
dGdSTmkrRmVNWlovVC9JbTRROFgvbUEKEDg6EIYvD2xbVwMxWirkDA9lLOPt64zb
dhgGwbvL8ijAKVPKXLJ73IOWrwk5dCLv7oe8RDhkNDtuSus9HOqD9Q==
-----END AGE ENCRYPTED FILE-----
- recipient: age1mraede6gqxkh2rkeq5fjrcflp7emenl2qn885asxvtx5erga2pdqujuexz
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3ZGJ0TW5QbkNqbmY2ckdX
dUwyT3A5RnBSNzJKVDcrb1RPZ2hPVjhNU0ZnCk9aWE5EcFErL1ZkajZXc2JqdGRD
TTJ2b3ZYVThoOUVGY3RqSE5FZjZJQjQKLS0tIHNSVTg3eXVIa25oOHRCcUhKNnkz
cUlpdC8vaVFoS09mU09tbzZWMU9HVEEKdum87k1RQN8uA6i32hYbFxfkqKYks4Ne
R+6wY+uzTvskB8nNcUNgUPFgXbm2wq1uJykO+D++LB9apMmV62JtCQ==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2025-02-13T20:19:15Z"
mac: ENC[AES256_GCM,data:of9bxJ+sXhv1wzlES7otXjV12Qst9HdGt0CqYy7FjLNbFwUBJ88bS3zZzigB9rzuppN4TMSTG+xiQhD7G6W/yU0TIF5FDiVoXiJndt9IccaDLREizmasfeL/0pjNNPTgNU8b2fxXX3k/yhhhR4ZyZYOiEAlTpa9NzVAkUuO2jMI=,iv:BXLPw6EGCr7X9nIK63w8UrnAg6h67HPK8Lr6aZz8/WE=,tag:/qYwcx8uJtz/iwqoRMnblQ==,type:str]
lastmodified: "2024-11-04T20:00:41Z"
mac: ENC[AES256_GCM,data:dIghUTmsUH2deQGDv9Jykicf+kV4A2XYHqxOHq0TcR7G5V329U25tm4ID07kQKmJjSgPwTx/6Vadxu/Bo3ADrvMj5+bOCUENP5FcJEp8htkJHNlzn1syQ9VXu+Vbka0e0PpPJ4AlxM3toPdmRX4k7tP5FzVlMkxSwAjMsVivHYo=,iv:1094lyciqTvwdmJjCI761sRi42AXxyiFyPw2CSUqfA4=,tag:0LlLhMOn7l4NrFzmbcfPcQ==,type:str]
pgp: []
encrypted_regex: ^(data|stringData)$
version: 3.9.1
version: 3.9.0

View file

@ -7,6 +7,7 @@ apiVersion: batch/v1
kind: CronJob
metadata:
name: surveybot
namespace: surveybot
spec:
schedule: "00 16 * * 5"
successfulJobsHistoryLimit: 1