diff --git a/apps/hydra/linkding/kuztomization.yaml b/apps/hydra/linkding/kuztomization.yaml index c922b44..7a62af4 100644 --- a/apps/hydra/linkding/kuztomization.yaml +++ b/apps/hydra/linkding/kuztomization.yaml @@ -4,7 +4,7 @@ metadata: name: linking namespace: linkding resources: +- deployment.yaml - namespace.yaml - srv.yaml - pvc.yaml -- deployment.yaml diff --git a/apps/hydra/secrets/immich-db.yaml b/apps/hydra/secrets/immich-db.yaml index 24eae4f..6e97c93 100644 --- a/apps/hydra/secrets/immich-db.yaml +++ b/apps/hydra/secrets/immich-db.yaml @@ -4,20 +4,20 @@ metadata: name: immich namespace: cnpg-cluster stringData: - db_password: ENC[AES256_GCM,data:sLJeMFmDrg0LriLfZr4A17N02EYeXgn6bRac85SE9Zh216ECksc8yg==,iv:MhtGaGrAupB0EkniNGA2x9cKKnUDIvNhT+V6GPXA59Q=,tag:HXZPIlC2ok87Webr1pXI9A==,type:str] - db_username: ENC[AES256_GCM,data:OFz/FEL3,iv:Uf+IX2kJ+gXuD0fiAkde9gGMQNsJf3kpA/b8w/UNfnA=,tag:0NeRTJTtNZqjEDaZ032rIQ==,type:str] + password: ENC[AES256_GCM,data:ro6PvLSzDN2nF8TZdmA+tbRCjngWmcrHP93sXM6FrqeZPsoo6h7dsw==,iv:46dbK5Ri6e0hqpHfPGR/1kvcqxekqtgHHCHpDXWSevA=,tag:DN5llN321qc5JQ7fBq0lyg==,type:str] + username: ENC[AES256_GCM,data:ccMGLgcl,iv:VuT7b5p1CAIzob8dy5J0BTml8z2uOlXmg+OncjZJZjs=,tag:kWJjv0vgD8XwtNNq8hFIFA==,type:str] sops: age: - recipient: age1lelpkv7u2xh5wezuwp09fmf9gsa8gp4rzy92jz0t203au82a7u5sutsjwa enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4enNoRXliUTFuUmVmT3BN - Y3RGUnFJcDA5SncrZlpYYit4c0Q0am1SU3d3ClFiN1o0b2J4eDg4WG5UTFN1MTNp - VzFOdVlpZ1dXN1U1ZGdQRllFNUF4SjgKLS0tIENFK3FxYlFLZENGeFNBYW5hVStr - d3NWdk9ZV1dQVzhnRE04R2ZlY0lGdXMKHQ6bPgJvFKC0JJWWDe6rrwZvSzhatBXO - CrtuPSEznGE28kaOyvFHJt7EZXmTupvOdwhdgbjEPuaXPsu2OE2mow== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlM0NpNGRNWE8zKzVpbFNE + UnNzVDRIWlA1TU9nTVV4elVGaWZOZ2R2ZlNvCi9qQTZHWEtFakRQUFlzU0ZvVHVi + V2FmMkZwVFZ6WHdiNElYc1RKMTNkM1UKLS0tIEcvQllZSjVXeVFZUUZKNitkcW5t + OXlVb253Y0RDWXFqSU9mZ3lZc25yTTgKKirL9lbdeA52EWWuqhELQpnhAWRQUs3K + lLC8LWHDB6z23fw4X9vzYN/g2IdC0dw9dOag2gFEfvafNcr5+ltCmw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-04-30T22:27:29Z" - mac: ENC[AES256_GCM,data:tvYlakETNWM1dpvw3dnD6typMAlV67/o8Phf5iwwT9KDi5WadmBcJ4Xkr9RZG8OdwGWicKjy4Yh7BfNeHE6ExhuA/vV/TgJPqXJihMUXcjB72kK1+6IdW3r+j8sTbHE6CMcBKXM1232mgZN0flpg6I1VgxkQDnd1Zg9keKILLao=,iv:kylqnarBLRNcCXFkmSk9nSEFl1d32URrfaVhEFo7qFU=,tag:sfVwdhSpChx0pBYpj8lhvQ==,type:str] + lastmodified: "2026-04-30T22:47:46Z" + mac: ENC[AES256_GCM,data:Gm2sqsYIEbI5yCtWKaVlo6fY22X9+W0u0VRXLEWfzvvhREQC+KdsJYfTyKAJCHLlJw+ciAjjbcsftAFZMt8vweUwMr9qNQIWeBWIbE/j3cNn+0KwQM/f6HpLz0LG27RYhdYWbzQGZDoPlyEIax+XiAhjdYQnU/vbRAty3II2GF0=,iv:Y6N/abUHSI5Y/TfZCpgstcoTfP7NE1Xfrr8AykSMByE=,tag:qjwVvnhlbcH+XUGSTsX7Vg==,type:str] encrypted_regex: ^(data|stringData)$ version: 3.12.2 diff --git a/apps/hydra/secrets/linking.yaml b/apps/hydra/secrets/linking.yaml index 852cb77..8276abe 100644 --- a/apps/hydra/secrets/linking.yaml +++ b/apps/hydra/secrets/linking.yaml @@ -4,20 +4,20 @@ metadata: name: linking namespace: linkding stringData: - supe_user_name: ENC[AES256_GCM,data:uIPyqIxg80lRvGfFrdGp8pc=,iv:jTrADo4WNLyfhsM7Zhka7O170DNMnNHTbFrbmgMvFx4=,tag:OUs5BKOQ/KtHDGjQA4K7qg==,type:str] - supe_user_password: ENC[AES256_GCM,data:jvU0VsL3QjT3vlJD5vCPAMg0c5QHoSWFxuiJsew7o2E4x9CQzHn1Ddu77go=,iv:daXdTeCGwuX2/3jj2kY7vb5pCXjtoj6ll0ACOPIPZFs=,tag:jteCYcCnhA44egCsqAR9oA==,type:str] + supe_user_name: ENC[AES256_GCM,data:XVBqIWJz4QHdgg48yNK9nmw=,iv:mt7dn/sEEy1Ed4DX0FK0v5pJFWgZ9MFuCWvW/SNhDUw=,tag:7738mUggImWqrVvWxanNPQ==,type:str] + supe_user_password: ENC[AES256_GCM,data:LJNaesKwkBReCgbbDczkCDL0DMUCo6o2YPzo4FQrgTwyqrlMcqdDm1PP8G8=,iv:zkDt8CSBmdM5ok0PDSaN4MyfFV5vt6YCs/EftWyN/54=,tag:xgW0u6cCQWt1m4ut1vNzag==,type:str] sops: age: - recipient: age1lelpkv7u2xh5wezuwp09fmf9gsa8gp4rzy92jz0t203au82a7u5sutsjwa enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrZ0xMV2dHQjd2emV5YmxY - WDhtTERveFRCdUsrYjVnVDlwZm51N0kxL0cwCjRocFRLQmRKZTRMVVV6cUMzSEpF - U1ZIemdERHV3MWh4aDNTK1p3MU5idkkKLS0tIEErSE1uM2ZGdGp4bzZvNjA4K3RT - U1pDdHk4TkhtZVo3WFFRcW8yUGdRT3cKT0pUdC/uO3yrMpeUkfsUr8Ts6C265l6U - iu++WtBzXk8xcqaHhvPZi2ShFPU/ffuIRGB/izdrUVgW0dIbWC2Ksw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5WkxCQUkvRERXYVVhK0RJ + c3RPbXVXTnJHc3pna2NKamRRdm9tb0lTMzA4Cis3K3F5R3A2YldIRDlUcUY0YVFs + U0RBak0rdUVTY2VSa2RTbnRGMjJ1aGMKLS0tIFZ4Vks1ZUI1SVg4eXNvYzBIMmt4 + QmZEaEc2L0NxUDFWS0lDTzRGbjlxMHcK9ozIUYv1rIJ6OOGajJ6PKQJLBVofKH/U + 1IQTjS7DoNFH0gEXSex2PtvYwbEqO297EFunokyYDQkHKEqGoMp85w== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-04-30T22:27:29Z" - mac: ENC[AES256_GCM,data:iUNdSKQBjo8j7piuU5ytGldE0WlJGuYSxkpg83/m5r85Ejo44tFDOK6YDZm3qm0fuxedjv2SUTD/Ms7rwB6gxqLZKMsyfApHgSNSh46CGIRb7XDYGZcpR6uCHlaErwX9how1q9IqsnGH8dv37rb4gn5wiH9weEE1eqp4CPhwIeg=,iv:+k47Tfxv2SeQxx64nBdGX2RKCc2LzpUlIqqLbKNxSBo=,tag:mHG7TxhghYT8sHPS4CAYbQ==,type:str] + lastmodified: "2026-04-30T22:47:46Z" + mac: ENC[AES256_GCM,data:VRVM7bWRci1XwvJ/Gwwz0HiY5ik9mcX/dBWAutVqwcqlOTB51+Piw0iONoLC1qCDIyGVOH9mV5U7u7BgdPKxmA3UfzJBcwcwHw0yaoMaFujWOVFQgSSOJ58+6Vuh2SDrf0nAmkJpp0jXkqa9/6XoIyb3qjQis4OsNAAPEXiJMlQ=,iv:8doqWJwaHidcYjbbSLbqUNclfsk3uf1jpyVcjcftA1I=,tag:7yrv+Cr2JlowaXaaO+o9nA==,type:str] encrypted_regex: ^(data|stringData)$ version: 3.12.2 diff --git a/apps/hydra/secrets/truenas-csi.yaml b/apps/hydra/secrets/truenas-csi.yaml index 6b6d328..3cb412e 100644 --- a/apps/hydra/secrets/truenas-csi.yaml +++ b/apps/hydra/secrets/truenas-csi.yaml @@ -4,19 +4,19 @@ metadata: name: truenas-csi-api-credentials namespace: truenas-csi stringData: - api-key: ENC[AES256_GCM,data:CPkjY0i3WPvn0R/07NO1uYNv3iXfcTQJJyE67GgTwkuO+1urwsm4zwiBS9GoxLDVs7kPaHOS8NH/aMQSOpnS1uFK,iv:PknNUaAbaBGf08gC1gU5RXUrTJ+sZPf8FbP5OY5Emc4=,tag:vhysG4kggYwW8zNqO6ke1w==,type:str] + api-key: ENC[AES256_GCM,data:P17H1ksNvjc51DbJsTnYdXOUHpMscqtWdV0CxunH+IGx3tsWrknCG3y6zpzb7XMD3TtRO8/63OEcy8W6LDF2+e24,iv:x5If53IjFyrr8E4OosdL1fHSikyk/Va9btePp8nry4o=,tag:QHmdC3vljynJQkZL4fMvlw==,type:str] sops: age: - recipient: age1lelpkv7u2xh5wezuwp09fmf9gsa8gp4rzy92jz0t203au82a7u5sutsjwa enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5ZEtxOXhHYitCbjF2VVlT - RHRCSkJZM1daclpjRnpTcXFlYkttSW55dkIwCmMxdDM4QTI3ZXdEcy9hMVhmVFl1 - TFpXaTNQWGZ4VERRN2N6TElkcVd6K3cKLS0tIERUU21NRjM0V0pLQXVPWVNhaTNU - Mk0xWTl3SVUxbEpZUHJFSXg0Ui9adDQKnh5g4sOPKrIWKL6eLbogX2Lw8aFuBlnO - P7WM0Drq9W37mub9USggU7NxVMS5NtEGWdfBK8rL8XJAlsI1cXAwxg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuZ3lranNtRndEVDJLVlhI + ZjZyZzhZenF5eG5Kd041TlN4OXJDYmpIZEZJCnI5Umo5Wm00emhUdG5aTWdkaGdr + eHBOREFMSmZFNzh4ZVM2SnRTdU1MaHMKLS0tIDJiSXVscTFHMGpqMHhZZ21VSHhx + N0haaU8rejRwZHZiMmtBTFI4Nk1tbUEKWwU2lcsejXv5xzCmslKvrugQqU9fHCIE + ebsSK+djYYSVsz/wwHWP2CO9GKH+0mSn2V/fi3x4WnPImJ6JSbitZA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-04-30T22:27:29Z" - mac: ENC[AES256_GCM,data:Q/jO16112dhijbnRZ89Z1hrZmbWyFEXAn2AvR/IFgHBMPUAepgQOiQnMLLHbvAthl2GTN7a4lWscz3C6TPmv658Xco/LxpIu615mm9uAK0uXchUm+r7c9BYiLzYWdML+7ouiYamLGuXoeXqwzSntbjCrQy/Op2JvGXD3UZLWaX0=,iv:BSMhYl0K1kKSgnbMgGE0M1Gu8KeKlbwLhR54buVugHc=,tag:B8y4h33JXyRYwUBGE583og==,type:str] + lastmodified: "2026-04-30T22:47:46Z" + mac: ENC[AES256_GCM,data:JIKUhicF8YYMN7DS6HhjzN6AfVDSMWIFKKXTGlYqCFE9Arx9+Js6Y0mWtcmNDKDq4JE0kLPZPplUk50jT6SvG/n4UF92i2cvKKkVsGdRL7rb0EVyMu7NOHvp9Y6F7os3raWhGEMHVcZcwON2ANAcVmvUXggP5933rVmnWpt1MjQ=,iv:fNqSgwTV/WVruXdL2/FxT3F5e7XVuX1mwT4vJ52uyjA=,tag:iphxaJq0Srln7LlLy3u/DQ==,type:str] encrypted_regex: ^(data|stringData)$ version: 3.12.2 diff --git a/go.mod b/go.mod index 4343a2b..d96848a 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module danicos.dev/daniel/homelab go 1.26.2 require ( - danicos.dev/daniel/go-kube v1.12.1 + danicos.dev/daniel/go-kube v1.13.0 github.com/cloudnative-pg/api v1.29.0 github.com/fatih/color v1.19.0 github.com/fluxcd/helm-controller/api v1.5.4 diff --git a/go.sum b/go.sum index e46fc9a..2f628e5 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -danicos.dev/daniel/go-kube v1.12.1 h1:JQBW2zgx1g2OwAuuSyEspAm709YLBSFZs8sWVv73sGs= -danicos.dev/daniel/go-kube v1.12.1/go.mod h1:zOhFK+bE4t14yOokp+yqh8Pht1/U102JV/29QoKBjjc= +danicos.dev/daniel/go-kube v1.13.0 h1:4c6LAkwbiWJ2qXPEPlKF5eD5KAOIN/oSCqgr+rdMykw= +danicos.dev/daniel/go-kube v1.13.0/go.mod h1:zOhFK+bE4t14yOokp+yqh8Pht1/U102JV/29QoKBjjc= github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/cloudnative-pg/api v1.29.0 h1:mNx6yJ5qi+Xrjs0NYrUy6V4MlXBkVJxGKwvTJZIuTX4= diff --git a/infrastructure/hydra/truenas-csi/kuztomization.yaml b/infrastructure/hydra/truenas-csi/kuztomization.yaml index 3654430..c93dc38 100644 --- a/infrastructure/hydra/truenas-csi/kuztomization.yaml +++ b/infrastructure/hydra/truenas-csi/kuztomization.yaml @@ -4,16 +4,16 @@ metadata: name: truenas-csi namespace: truenas-csi resources: -- controller-cluster-role.yaml -- controller-binding.yaml -- node-cluster-role.yaml - node-binding.yaml +- nfs-storage-class.yaml - iscsi-storage-class.yaml -- namespace.yaml -- controller-service-account.yaml -- node-service-account.yaml +- controller-deployment.yaml +- controller-binding.yaml - node-deamonset.yaml - CSIDriver.yaml - config.yaml -- nfs-storage-class.yaml -- controller-deployment.yaml +- namespace.yaml +- controller-service-account.yaml +- controller-cluster-role.yaml +- node-service-account.yaml +- node-cluster-role.yaml diff --git a/pkg/cnpg/cluster.go b/pkg/cnpg/cluster.go index fbdd131..331d07f 100644 --- a/pkg/cnpg/cluster.go +++ b/pkg/cnpg/cluster.go @@ -38,7 +38,7 @@ func Cluster() pg.Cluster { } /* - Need a role and secret - - Username - - Password + PG expects username, password + + PG Secret */ diff --git a/pkg/enc/immich.go.age b/pkg/enc/immich.go.age index cea615f..cd5dcb9 100644 Binary files a/pkg/enc/immich.go.age and b/pkg/enc/immich.go.age differ diff --git a/pkg/enc/linkding.go.age b/pkg/enc/linkding.go.age index 8c07ec3..4045166 100644 Binary files a/pkg/enc/linkding.go.age and b/pkg/enc/linkding.go.age differ diff --git a/pkg/enc/secrets.go.age b/pkg/enc/secrets.go.age index c80d416..cff217e 100644 Binary files a/pkg/enc/secrets.go.age and b/pkg/enc/secrets.go.age differ diff --git a/pkg/enc/truenas.go.age b/pkg/enc/truenas.go.age index 35f86e7..18edf21 100644 Binary files a/pkg/enc/truenas.go.age and b/pkg/enc/truenas.go.age differ