commit b852389c537bdfe004d11e093c3a0bfad2051b1e
parent 7efea63455d28bb6116a32098f0ca825dc5dabe2
Author: MTRNord <mtrnord1@gmail.com>
Date: Sun, 6 Oct 2024 18:54:12 +0200
Fix cert-manager
Diffstat:
4 files changed, 51 insertions(+), 37 deletions(-)
diff --git a/apps/2024_cluster/secrets/cloudflare.yaml b/apps/2024_cluster/secrets/cloudflare.yaml
@@ -5,7 +5,7 @@ metadata:
namespace: cert-manager
type: Opaque
stringData:
- api-token: ENC[AES256_GCM,data:Znr0SNTKDJo9VTXBUxP/QHLEZ/Q3iBT6zRiTDa0bKZGfpTyX5nqmhA==,iv:n3WHuX7pPjPBuDJe8wcp1l2NnRcc1o6X2r3TW1VN2V8=,tag:29JQLb7FPhMym36bgsEaJQ==,type:str]
+ api-token: ENC[AES256_GCM,data:gFWcWKLhEYSe6RQLSdrVmuABSKXF/l8OIotjsWX/ZULuxhOoIyNVSg==,iv:EsDnSXn90EXSFjcGoz1/RhMxxwZRtbbPpC8BqXIInP4=,tag:ZxBXJpuhWIm5hwpv3ahEiw==,type:str]
sops:
kms: []
gcp_kms: []
@@ -15,14 +15,43 @@ sops:
- recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsTGxLUU53SmFseTFSTExt
- SVJyMEE1c0RLaG1Yc3dNNk5aRUZIekpiOFc4CnZRMHlZMklBS0IyWTBXbWp2cXo1
- czdiV1p3YmVMUlNvTUhBOEZ0OEtHNkkKLS0tIGRvcDl6eVBueGJGY1g5RkplUFdm
- MHVTcjFnVzZtSGVJdVNGTkRzLzJ5SzgK8urj4OT+FwuKbOLYljiGIzrj7oYSa+yi
- vOk5z8E4v7fu+PhZZoN03SRnShdP0+WtRLGiBR4bM912Y2WQx0XZfw==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIQ2RRdGNXRGRHZkZMRUEv
+ aVhMWjVpVERMamxubDl6QWdQWUlPUDAwWmdvCnlhYzROMWVTSXN5SkpwVk1KMmRz
+ WThJUit2SVRBK0s2bzA2RWI0bDMrOVEKLS0tIFJ0VXRTMGlpaC90Rjh4S2s2ejhL
+ K0pYN1RWWVBpak92ZmEzWWlINUZqaEkKFv1ukkrR3zZJbXPpxRj2IpO9Imj4IYzi
+ XfQBreQjr7csM7ojhX2LIrjPD0AB+svjaryDwUpJDuZKgx9QTquHdQ==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2024-10-06T16:46:43Z"
- mac: ENC[AES256_GCM,data:6n1HBUfHAPxu7xjpzWm9olGCs9yhDPa5SsJtNwj2D5cIG1D+5Htxzqt+DPMPL5/gP1iSLmoga+CjQTDSWxZtGniK+g+q8PtyTPNnYfOcQivbxi3iIHD+ACFYC9EHMAl66/9PJNBLnJk8n5YfDaVW8Xbj4HCn2pSCyppw2/eIgdQ=,iv:+uxU8z4QTK4N0X3rkyblg0ZLZvrfZQVTEpgvax52J5Q=,tag:F8nDBJtdFVkinuTCaLhkkQ==,type:str]
+ lastmodified: "2024-10-06T16:49:14Z"
+ mac: ENC[AES256_GCM,data:o1A0rCctrvrT+fC/kCbvAwXoKWrTkmAHS/HGpki1/DL3Em/Npp64NH+rsMU7l+8ZyjjTOoOE28jA8o6zKl6NHHdDdZv2ACkMNmvlbZTHd6oDwhJexzoPaph9BV6vhbPcuDNw7RrJK4bjzKLNvJSKu2iqsTyoWJbRX4pdJqegEfA=,iv:42d9sGNIfk/5xFxbA9iMddVeAqPOAgM+88TQn3I/BrI=,tag:PakxKlcMBJ+fSPn5/B0xQQ==,type:str]
+ pgp: []
+ encrypted_regex: ^(admin_password|extraCommands|key|clickhouseDatabaseURL|databaseURL|client_id|client_secret|secret_key_base|otp_secret|private_key|public_key|primaryKey|deterministicKey|keyDerivationSalt|token|clientId|secretKey|installationId|installationKey|uriOverride|adminToken.value|password.value|sql_password|erlangCookie|AUTHENTICATION_PASSWORD|ROOM_API_SECRET_KEY|adminPassword|configPassword|adminUser|configUser|MAIL_PASSWORD|APP_KEY|api_key|api_secret|keys|livekit_key|livekit_secret|secret_key|admin_pass|admin_email|mariadbPassword|mariadbRootPassword|privateKey|data|stringData|PASSWD|password|pass|postgresPassword|postgresqlPassword|redminePassword|smtpPassword|registration_shared_secret|shared_secret|secret|admin_token|integrationKey|rootPassword)$
+ version: 3.8.1
+---
+apiVersion: v1
+kind: Secret
+metadata:
+ name: cloudflare-api-token-secret
+ namespace: kube-system
+type: Opaque
+stringData:
+ api-token: ENC[AES256_GCM,data:EQ07PwjP3mX3vbGN4OBn+kBYkI16FLrU2SacAMCBtSy3glonidpagA==,iv:IMHsQFO1Nks4CMYKgGSefqcmVyavKzHPkZ0Tqen9MR8=,tag:Unj0skR4LWr2OHNw6TN9gA==,type:str]
+sops:
+ kms: []
+ gcp_kms: []
+ azure_kv: []
+ hc_vault: []
+ age:
+ - recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh
+ enc: |
+ -----BEGIN AGE ENCRYPTED FILE-----
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIQ2RRdGNXRGRHZkZMRUEv
+ aVhMWjVpVERMamxubDl6QWdQWUlPUDAwWmdvCnlhYzROMWVTSXN5SkpwVk1KMmRz
+ WThJUit2SVRBK0s2bzA2RWI0bDMrOVEKLS0tIFJ0VXRTMGlpaC90Rjh4S2s2ejhL
+ K0pYN1RWWVBpak92ZmEzWWlINUZqaEkKFv1ukkrR3zZJbXPpxRj2IpO9Imj4IYzi
+ XfQBreQjr7csM7ojhX2LIrjPD0AB+svjaryDwUpJDuZKgx9QTquHdQ==
+ -----END AGE ENCRYPTED FILE-----
+ lastmodified: "2024-10-06T16:49:14Z"
+ mac: ENC[AES256_GCM,data:o1A0rCctrvrT+fC/kCbvAwXoKWrTkmAHS/HGpki1/DL3Em/Npp64NH+rsMU7l+8ZyjjTOoOE28jA8o6zKl6NHHdDdZv2ACkMNmvlbZTHd6oDwhJexzoPaph9BV6vhbPcuDNw7RrJK4bjzKLNvJSKu2iqsTyoWJbRX4pdJqegEfA=,iv:42d9sGNIfk/5xFxbA9iMddVeAqPOAgM+88TQn3I/BrI=,tag:PakxKlcMBJ+fSPn5/B0xQQ==,type:str]
pgp: []
encrypted_regex: ^(admin_password|extraCommands|key|clickhouseDatabaseURL|databaseURL|client_id|client_secret|secret_key_base|otp_secret|private_key|public_key|primaryKey|deterministicKey|keyDerivationSalt|token|clientId|secretKey|installationId|installationKey|uriOverride|adminToken.value|password.value|sql_password|erlangCookie|AUTHENTICATION_PASSWORD|ROOM_API_SECRET_KEY|adminPassword|configPassword|adminUser|configUser|MAIL_PASSWORD|APP_KEY|api_key|api_secret|keys|livekit_key|livekit_secret|secret_key|admin_pass|admin_email|mariadbPassword|mariadbRootPassword|privateKey|data|stringData|PASSWD|password|pass|postgresPassword|postgresqlPassword|redminePassword|smtpPassword|registration_shared_secret|shared_secret|secret|admin_token|integrationKey|rootPassword)$
version: 3.8.1
diff --git a/apps/2024_cluster/secrets/cloudflare_ext_dns.yaml b/apps/2024_cluster/secrets/cloudflare_ext_dns.yaml
@@ -1,28 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
- name: cloudflare-api-token-secret
- namespace: kube-system
-type: Opaque
-stringData:
- api-token: ENC[AES256_GCM,data:XuidlbeBChqCxMocfydr6Fx/z7IKZP/urE3oWgOUYHlWDFHMukciCg==,iv:UlN8E7wtATBQQWHYO7mDMr8oCocKs/dXn0rcLRFafKQ=,tag:zy0tTdLWKctDFMtDrMGjMw==,type:str]
-sops:
- kms: []
- gcp_kms: []
- azure_kv: []
- hc_vault: []
- age:
- - recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh
- enc: |
- -----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlNDgyMFlJb0FjR3dWY1BI
- YnYwU3FJbWthVDBVZVJwak9FOVJpNkxZN2lRCkJsQlMvSE5Ya0xUSGp4bEtxc0Yw
- YzhYZlVRUk90b2RiRldoaEJtUFdEZmMKLS0tIFFZc2JxOHVwN1dWRlN6WXhkNm5K
- NGRzT0FPY21iVWw0SW1PMGhUT1BURnMKFJnoNMKOzKSy1PjHtrCYeWTRm4bM5DEM
- H6fgCEifiZEOGcLPIeBsVcJQECMAqfDg0jmL97RLAgHv96ARqVuEDA==
- -----END AGE ENCRYPTED FILE-----
- lastmodified: "2024-05-01T19:21:39Z"
- mac: ENC[AES256_GCM,data:Fo1fu17kx4qvrzLdxwsB7Ta4Q/VhxUXQV/obaufX8h7atlOsmohCoD6oRbm38lz4JSNu4acZSVEuiYs7vewMzXNxrYKhVxY99RFS5gMDic1nZTa5CEKGYuTCWlyeb5Fx2MAO1oftCdBaiY9XtKYMbwZiNNKo1p21WoEtggOqWwo=,iv:BNrQIkGiInugs/Q+qe7v7lwyhCgOUSYGjSgtYYykymk=,tag:Ydj/qobPcg4lZMWYu5GfRw==,type:str]
- pgp: []
- encrypted_regex: ^(uriOverride|adminToken.value|password.value|sql_password|erlangCookie|PASSWD|AUTHENTICATION_PASSWORD|ROOM_API_SECRET_KEY|adminPassword|configPassword|adminUser|configUser|APP_KEY|api_key|api_secret|keys|livekit_key|livekit_secret|secret_key|adminPassword|admin_pass|admin_email|mariadbPassword|mariadbRootPassword|privateKey|data|stringData|PASSWD|password|pass|postgresPassword|postgresqlPassword|redminePassword|smtpPassword|registration_shared_secret|shared_secret|secret)$
- version: 3.8.1
diff --git a/apps/2024_cluster/secrets/kustomization.yaml b/apps/2024_cluster/secrets/kustomization.yaml
@@ -8,7 +8,6 @@ resources:
- draupnir-synapse-signingkey.yaml
- matrix-synapse-signingkey.yaml
- draupnir-freifunk-config.yaml
- - cloudflare_ext_dns.yaml
- zertrixt-runner.yaml
- coder.yaml
- mas_config.yaml
diff --git a/infrastructure/controllers/cert-manager.yaml b/infrastructure/controllers/cert-manager.yaml
@@ -37,6 +37,20 @@ spec:
enabled: true
servicemonitor:
enabled: true
+ image:
+ tag: v1.15.3
+ webhook:
+ image:
+ tag: v1.15.3
+ cainjector:
+ image:
+ tag: v1.15.3
+ acmesolver:
+ image:
+ tag: v1.15.3
+ startupapicheck:
+ image:
+ tag: v1.15.3
---
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy