diff --git a/common/environments.yaml b/common/environments.yaml index b7b036b..c43d5a0 100644 --- a/common/environments.yaml +++ b/common/environments.yaml @@ -2,7 +2,7 @@ environments: badhouseplants: kubeContext: badhouseplants values: - #- ./common/values/values.badhouseplants.yaml + - ./common/values/values.badhouseplants.yaml - base: enabled: true - velero: diff --git a/common/values/values.badhouseplants.yaml b/common/values/values.badhouseplants.yaml index 1e2f9e0..a969676 100644 --- a/common/values/values.badhouseplants.yaml +++ b/common/values/values.badhouseplants.yaml @@ -1 +1,3 @@ -registry: registry.badhouseplants.net +registry: registry.badhouseplants.net/containers +registry_url: registry.badhouseplants.net +main_ip: 195.201.249.91 diff --git a/common/values/values.etersoft.yaml b/common/values/values.etersoft.yaml index 7a1fcb7..10f06f5 100644 --- a/common/values/values.etersoft.yaml +++ b/common/values/values.etersoft.yaml @@ -1,2 +1,3 @@ registry: registry.ru.badhouseplants.net/containers registry_url: registry.ru.badhouseplants.net +main_ip: 91.232.225.63 diff --git a/helmfiles/system.yaml b/helmfiles/system.yaml index 83fe6e6..88edaf6 100644 --- a/helmfiles/system.yaml +++ b/helmfiles/system.yaml @@ -103,7 +103,7 @@ releases: needs: - kube-system/metallb inherit: - - template: env-values + - template: common-values-tpl - name: traefik chart: traefik/traefik diff --git a/kustomizations/kyverno/badhouseplants/pvc-patch.yaml b/kustomizations/kyverno/badhouseplants/pvc-patch.yaml index 51ce360..a63ac99 100644 --- a/kustomizations/kyverno/badhouseplants/pvc-patch.yaml +++ b/kustomizations/kyverno/badhouseplants/pvc-patch.yaml @@ -4,6 +4,19 @@ metadata: name: replace-storage-class-by-openebs spec: rules: + - name: local-path-fix + match: + any: + - resources: + kinds: + - PersistentVolumeClaim + namespaces: + - registry + mutate: + patchStrategicMerge: + metadata: + annotations: + volume.kubernetes.io/selected-node: bordeaux - name: replace-storage-class match: any: diff --git a/values/badhouseplants/kube-system/namespaces/values.yaml b/values/badhouseplants/kube-system/namespaces/values.yaml index b5f18b4..eedb177 100644 --- a/values/badhouseplants/kube-system/namespaces/values.yaml +++ b/values/badhouseplants/kube-system/namespaces/values.yaml @@ -12,6 +12,7 @@ namespaces: labels: istio-injection: disabled - name: platform + defaultRegcred: true - name: games - name: team-fortress-2 - name: pipelines diff --git a/values/badhouseplants/values.traefik.yaml b/values/badhouseplants/kube-system/traefik/values.yaml similarity index 100% rename from values/badhouseplants/values.traefik.yaml rename to values/badhouseplants/kube-system/traefik/values.yaml diff --git a/values/badhouseplants/kube-system/zot-mirror/secrets.yaml b/values/badhouseplants/kube-system/zot-mirror/secrets.yaml deleted file mode 100644 index ff88a50..0000000 --- a/values/badhouseplants/kube-system/zot-mirror/secrets.yaml +++ /dev/null @@ -1,22 +0,0 @@ -authHeader: ENC[AES256_GCM,data:nmlP0vRoKJRivvwJArnEO26sqIwFtnK5MYVPJBBCmAGCPpe/U00gYu6JET0gPqGV,iv:+GZwWrxoWw0mAZxZdITBLtHgRKYIyaj/NQwHbD8KppA=,tag:MAer3FiaBxyNwJr0BbDtow==,type:str] -_mirror_password: ENC[AES256_GCM,data:W2xy2RMmD4d6N+DNceIgtDGUpygOGEbWgGa9Icsy,iv:YsQfm/EmBYY35q2irlZ2rmzkbJzlFnfgMSEKq0G1I5o=,tag:7rNG02Wm9g8GUXeM4nTHqA==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPVUlyVFZWcWFuWnEyS2Nv - Tkx6aTZKY1czQ25RTHhKNWNNQ0xIaWJLb1VFCkdoT0RBTW9EWG8zbzYxekdsUEY2 - bE9nQUthV3NCa0kzRnBwZ2U2MWlVNzAKLS0tIFY4RVJDM05ZVmR3NEt5YUlpOWZa - ZVc1bmJnU1o4U3NGaGN0Sk90YTR0ckkK8gmkHty4Gwt4vuVK3xhWWg4h/EgvJULh - Trgn0lzx2pCThg/+82u5J1T/QLXdbbDFFFwGldiMwNjZQfpOmrZpVw== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-03-26T21:04:45Z" - mac: ENC[AES256_GCM,data:cTN6wq1m1XtsfNujCfQ4nKtX1Pkc8MFCipUeScDLJUuZZwg4St0h1OkYtYJBWeVSt3CSjjexQpb7Oi9K8wukboIVevaIj0BTT1hkf2ZUFeIV8W62mtftfdRex0yJ/4h1gTZaYBhHEw+qD6r+XvavDs1m22FF5RuF+5qfGUEWA4I=,iv:RsVuXbLVfZSJ7AkIvEdf7H2auFTiqXgpXLe/LbATAo8=,tag:1V5eIiJzjzv4C1JNNf5Quw==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.9.4 diff --git a/values/badhouseplants/org-badhouseplants/app-gitea/values.yaml b/values/badhouseplants/org-badhouseplants/app-gitea/values.yaml index 512622b..8f802f3 100644 --- a/values/badhouseplants/org-badhouseplants/app-gitea/values.yaml +++ b/values/badhouseplants/org-badhouseplants/app-gitea/values.yaml @@ -59,7 +59,7 @@ gitea: MAX_CREATION_LIMIT: 0 DISABLED_REPO_UNITS: repo.wiki service: - DISABLE_REGISTRATION: false + DISABLE_REGISTRATION: true server: DOMAIN: gitea.badhouseplants.net ROOT_URL: https://gitea.badhouseplants.net diff --git a/values/badhouseplants/secrets.external-dns.yaml b/values/badhouseplants/platform/external-dns/secrets.yaml similarity index 100% rename from values/badhouseplants/secrets.external-dns.yaml rename to values/badhouseplants/platform/external-dns/secrets.yaml diff --git a/values/badhouseplants/values.external-dns.yaml b/values/badhouseplants/platform/external-dns/values.yaml similarity index 100% rename from values/badhouseplants/values.external-dns.yaml rename to values/badhouseplants/platform/external-dns/values.yaml diff --git a/values/badhouseplants/secrets.minio.yaml b/values/badhouseplants/platform/minio/secrets.yaml similarity index 100% rename from values/badhouseplants/secrets.minio.yaml rename to values/badhouseplants/platform/minio/secrets.yaml diff --git a/values/badhouseplants/values.minio.yaml b/values/badhouseplants/platform/minio/values.yaml similarity index 99% rename from values/badhouseplants/values.minio.yaml rename to values/badhouseplants/platform/minio/values.yaml index fe77801..552d362 100644 --- a/values/badhouseplants/values.minio.yaml +++ b/values/badhouseplants/platform/minio/values.yaml @@ -56,7 +56,7 @@ consoleService: port: '9001' resources: requests: - memory: 2Gi + memory: 1Gi buckets: - name: badhouseplants-net policy: download diff --git a/values/badhouseplants/values.uptime-kuma.yaml b/values/badhouseplants/platform/uptime-kuma/values.yaml similarity index 100% rename from values/badhouseplants/values.uptime-kuma.yaml rename to values/badhouseplants/platform/uptime-kuma/values.yaml diff --git a/values/badhouseplants/registry/cluster-mirror/secrets.yaml b/values/badhouseplants/registry/cluster-mirror/secrets.yaml new file mode 100644 index 0000000..551e28a --- /dev/null +++ b/values/badhouseplants/registry/cluster-mirror/secrets.yaml @@ -0,0 +1,22 @@ +authHeader: ENC[AES256_GCM,data:BWmu4bpFjlIDStIcWfpsgbm1hfxlvZAK9LabhXuAdArJzflc4VA+Dy5fJRAMu9Mv,iv:+rwtfnjJCZKPmdcUkTfklq19uSgavOKaySK/O/xd2PE=,tag:3yXa+0LbIqMDk6KLWAAN0Q==,type:str] +_mirror_password: ENC[AES256_GCM,data:0aa6fqR3+0ZY5KhRKJa0SKBcBnF/KizHXTIm2NQB,iv:DUB8ItYbT+K31XLbWzi5909RPVn9DG9HRDU120VxbdY=,tag:DniRwku2rQX44ffMn4mU6Q==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsQ0U5L01iNFo5Y0t5SFo2 + MXlwVDhQZ2R5QnVlUndmQ0x5L2ppU1h6aEVZCmhaUW1JY0RDMEM0T1JkZkk3TGVD + R0JjaEN0MGxVV1RIZUxkbjgzMTlTMmsKLS0tIFdDNW8xaWsxamFvUGRFaVZsVUV4 + S3ZiYTJGOUFzZlNwSUZvNGtmSFNpczQK/npaHLqHSxMnCXNvDFw0eB9KfMJ7bWfV + ZuteeaXG+eZNX4l1ZY1pLNUv9kui4oXI8payp7sTZJI6WYZCQz6Oaw== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2025-03-27T20:50:16Z" + mac: ENC[AES256_GCM,data:XtX4NUZ9PCdAFckdlygywFQ8vJRAszOjqPItr0MNRM0ndk/PkYYGzY0phMan7FgxY3Cz5XMJcv/MEogLedM+uH5vMbsOpRY49jpILMORL3Ni1tZFG5Px5NbfExGQmjFyefotRzCHlsUSTZEHlBIp4+FeBI41CgBbLw45rEoneL8=,iv:Ilk7TXqKSSV5WYnptLRaOk/lwwHHLesbSslOCarlVEA=,tag:vWXe+r3tHXoMtWYeJN9T0g==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.9.4 diff --git a/values/common/kube-system/metallb-resources/values.gotmpl b/values/common/kube-system/metallb-resources/values.gotmpl new file mode 100644 index 0000000..57fa0ee --- /dev/null +++ b/values/common/kube-system/metallb-resources/values.gotmpl @@ -0,0 +1 @@ +addresses: "{{ .Values.main_ip }}-{{ .Values.main_ip }}" diff --git a/values/etersoft/kube-system/cilium/values.yaml b/values/etersoft/kube-system/cilium/values.yaml deleted file mode 100644 index 00ab2c7..0000000 --- a/values/etersoft/kube-system/cilium/values.yaml +++ /dev/null @@ -1,8 +0,0 @@ -operator: - replicas: 1 -endpointRoutes: - enabled: true -ipam: - ciliumNodeUpdateRate: "15s" - operator: - clusterPoolIPv4PodCIDRList: ["192.168.0.0/16"] diff --git a/values/etersoft/kube-system/metallb-resources/values.yaml b/values/etersoft/kube-system/metallb-resources/values.yaml deleted file mode 100644 index 67f0b84..0000000 --- a/values/etersoft/kube-system/metallb-resources/values.yaml +++ /dev/null @@ -1 +0,0 @@ -addresses: 91.232.225.63-91.232.225.63