diff --git a/apps/hydra/linkding/deployment.yaml b/apps/hydra/linkding/deployment.yaml index 7e95600..8d8e72d 100644 --- a/apps/hydra/linkding/deployment.yaml +++ b/apps/hydra/linkding/deployment.yaml @@ -4,7 +4,7 @@ metadata: labels: app: linking name: linking - namespace: linking + namespace: linkding spec: selector: matchLabels: diff --git a/apps/hydra/linkding/kuztomization.yaml b/apps/hydra/linkding/kuztomization.yaml index 776f343..f79e113 100644 --- a/apps/hydra/linkding/kuztomization.yaml +++ b/apps/hydra/linkding/kuztomization.yaml @@ -2,9 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization metadata: name: linking - namespace: linking + namespace: linkding resources: +- pvc.yaml - deployment.yaml - namespace.yaml - srv.yaml -- pvc.yaml diff --git a/apps/hydra/linkding/namespace.yaml b/apps/hydra/linkding/namespace.yaml index f28f721..bc84cc5 100644 --- a/apps/hydra/linkding/namespace.yaml +++ b/apps/hydra/linkding/namespace.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Namespace metadata: - name: linking + name: linkding spec: {} status: {} diff --git a/apps/hydra/linkding/pvc.yaml b/apps/hydra/linkding/pvc.yaml index 7b6bf47..59f272d 100644 --- a/apps/hydra/linkding/pvc.yaml +++ b/apps/hydra/linkding/pvc.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: linking-pvc - namespace: linking + namespace: linkding spec: accessModes: - ReadWriteOnce diff --git a/apps/hydra/linkding/srv.yaml b/apps/hydra/linkding/srv.yaml index 772e6be..18f142e 100644 --- a/apps/hydra/linkding/srv.yaml +++ b/apps/hydra/linkding/srv.yaml @@ -4,7 +4,7 @@ metadata: labels: app: linking name: linking - namespace: linking + namespace: linkding spec: ports: - nodePort: 30010 diff --git a/apps/hydra/secrets/immich-db.yaml b/apps/hydra/secrets/immich-db.yaml index b207d7f..24eae4f 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:H9I2unAYP7d8cEOoA3SdUjfYKEXjXGjCBX2Ox/qcN5d6jjUsm+j4Cw==,iv:gfRYT/8WvpgGv+BXLAMSb7PIoVVIgdir46GY0uIYhGo=,tag:ZrxV0rZxrjkW1r/RcC6YEQ==,type:str] - db_username: ENC[AES256_GCM,data:3D98Xx5s,iv:P0bnBXZ8P28b+TJi5s7LufG83h2SvwmeaZ4ZM1/WW6A=,tag:uFjMtOC0NZnhfxtMxRwr+A==,type:str] + 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] sops: age: - recipient: age1lelpkv7u2xh5wezuwp09fmf9gsa8gp4rzy92jz0t203au82a7u5sutsjwa enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArTWI0czRKdmNkSURIVUdI - TmF3OSthQ3UzVkJFRmxuZnhCZW1vTk0zSjJJCkM5eFdOdlF4Q0FienZKUmcza01U - K01QMDVUbU9XejJ3eTN6SnRJWXBiZkkKLS0tIDMvdnpyK2tGMFRnZmxWYklBdDVC - MUI4dWFPWlp0U2c0dC9JcnAzcTlCL3MKcl2Akyido58LfSkbM4uc5l7F2mZL0Vr2 - k6ztaJQASt7E3yRPEYZzlGe8zh7KmQE+RisCQRhTyk8ZI0TI0dBQwQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4enNoRXliUTFuUmVmT3BN + Y3RGUnFJcDA5SncrZlpYYit4c0Q0am1SU3d3ClFiN1o0b2J4eDg4WG5UTFN1MTNp + VzFOdVlpZ1dXN1U1ZGdQRllFNUF4SjgKLS0tIENFK3FxYlFLZENGeFNBYW5hVStr + d3NWdk9ZV1dQVzhnRE04R2ZlY0lGdXMKHQ6bPgJvFKC0JJWWDe6rrwZvSzhatBXO + CrtuPSEznGE28kaOyvFHJt7EZXmTupvOdwhdgbjEPuaXPsu2OE2mow== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-04-30T22:25:01Z" - mac: ENC[AES256_GCM,data:58zdDSId4IELh6HrY982Eld2jtNI6HWaYK4mf7kWlVTVgFBB/7E4S0mHy3SNcmQhHKrVl4VjoebuLgnS2oIHUCszB06YZZI5VB5W/WDlGRiCa13ahNssRJTJv09C2aDs6Wgu3K/TW+cK7rRzSx2xV+/ggPJc0aZJyUxiB3pytZ8=,iv:tYMfm+B5fSGh/CXGD8LcPZD9ob963VuJC0nuU/lVATw=,tag:n4ZUtEAy4eTE0BY+aGxP8A==,type:str] + lastmodified: "2026-04-30T22:27:29Z" + mac: ENC[AES256_GCM,data:tvYlakETNWM1dpvw3dnD6typMAlV67/o8Phf5iwwT9KDi5WadmBcJ4Xkr9RZG8OdwGWicKjy4Yh7BfNeHE6ExhuA/vV/TgJPqXJihMUXcjB72kK1+6IdW3r+j8sTbHE6CMcBKXM1232mgZN0flpg6I1VgxkQDnd1Zg9keKILLao=,iv:kylqnarBLRNcCXFkmSk9nSEFl1d32URrfaVhEFo7qFU=,tag:sfVwdhSpChx0pBYpj8lhvQ==,type:str] encrypted_regex: ^(data|stringData)$ version: 3.12.2 diff --git a/apps/hydra/secrets/kuztomization.yaml b/apps/hydra/secrets/kuztomization.yaml index d459926..c689ca9 100644 --- a/apps/hydra/secrets/kuztomization.yaml +++ b/apps/hydra/secrets/kuztomization.yaml @@ -3,6 +3,6 @@ kind: Kustomization metadata: name: secrets resources: +- linking.yaml - truenas-csi.yaml - immich-db.yaml -- linking.yaml diff --git a/apps/hydra/secrets/linking.yaml b/apps/hydra/secrets/linking.yaml index 110056a..852cb77 100644 --- a/apps/hydra/secrets/linking.yaml +++ b/apps/hydra/secrets/linking.yaml @@ -2,22 +2,22 @@ apiVersion: v1 kind: Secret metadata: name: linking - namespace: linking + namespace: linkding stringData: - supe_user_name: ENC[AES256_GCM,data:C5CJpeN9QQROt7QC+WO/eOc=,iv:UC3fozXsI5MQbp3K2YTFDwIcdSJj1YA+CfwuRF8+uyE=,tag:WUEvyT6td9IJZIqvIOx/Ug==,type:str] - supe_user_password: ENC[AES256_GCM,data:5ieWvqHulWrgK0kHUD+P/6FttjYl1wqDrOQe8zXnEDuhxaTrzOedkTkvnvo=,iv:8n2fW9vTcxgE65UBpSGDbLm8TkHM4AtvCl1wyKnRjmY=,tag:GpGJuLpQEknScDG0UiAtGg==,type:str] + 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] sops: age: - recipient: age1lelpkv7u2xh5wezuwp09fmf9gsa8gp4rzy92jz0t203au82a7u5sutsjwa enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4K2NUTUVSam9ZTitYbUhy - dG5GOSt6ZGlvMEFwQUViTUE2c05xT0JSdmxzCjhrS055RWM4UFNnb0hlSWxmYzNV - K2dSWXBMcURHdjJ4T1dJVm1LUDUzcVEKLS0tIHlqcHpDeEh1OWltRVFJMDFuWllC - MlNDdWFKeHJHL2pCTEJUcUhDdHg3S2sKFUfecGAmRjUXg1MVtey+zeqCLuSBQgy4 - nGC+zojDH6+LX3aS4um5xpil+ZtylTHIq97rjZG/7UFQoNhgxoX74g== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrZ0xMV2dHQjd2emV5YmxY + WDhtTERveFRCdUsrYjVnVDlwZm51N0kxL0cwCjRocFRLQmRKZTRMVVV6cUMzSEpF + U1ZIemdERHV3MWh4aDNTK1p3MU5idkkKLS0tIEErSE1uM2ZGdGp4bzZvNjA4K3RT + U1pDdHk4TkhtZVo3WFFRcW8yUGdRT3cKT0pUdC/uO3yrMpeUkfsUr8Ts6C265l6U + iu++WtBzXk8xcqaHhvPZi2ShFPU/ffuIRGB/izdrUVgW0dIbWC2Ksw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-04-30T22:25:01Z" - mac: ENC[AES256_GCM,data:WLTtDu9cRlcb4nBFluuVMpFHxz6UB07H0ntNukq9p/XJnGFQSBKISP/nQ4dcqK1zzMhmhlRcFeZAXXvmJaEJuAaZRV7n1dkgHZtTC2ZXTuGIvB2NrC0phNcw17QMvLEvxUVMmjLkIk+syGJuNhvypp7COcKRnA350MsMcJ2tbUI=,iv:ysEejhg7H/J5TXEMmM8gI81tY7IcNsHkZW852idSaCk=,tag:jt8l4NsyaIC3oX67rVe0+g==,type:str] + lastmodified: "2026-04-30T22:27:29Z" + mac: ENC[AES256_GCM,data:iUNdSKQBjo8j7piuU5ytGldE0WlJGuYSxkpg83/m5r85Ejo44tFDOK6YDZm3qm0fuxedjv2SUTD/Ms7rwB6gxqLZKMsyfApHgSNSh46CGIRb7XDYGZcpR6uCHlaErwX9how1q9IqsnGH8dv37rb4gn5wiH9weEE1eqp4CPhwIeg=,iv:+k47Tfxv2SeQxx64nBdGX2RKCc2LzpUlIqqLbKNxSBo=,tag:mHG7TxhghYT8sHPS4CAYbQ==,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 612a2cd..6b6d328 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:VRzqfzRXWEC8Su/vMca+1s8Rzr/LHFBN/wgAZeYlvIjck/wWayY5FaeCqBg6uQAEwXzqQfNHLZnRVdqlzLDX4J9I,iv:fZpjbrCVxJRCCRj6a8ww2eVDysA8asF5mvyzg0vtohQ=,tag:17a3gvF/lKrjYe5cE7crzA==,type:str] + api-key: ENC[AES256_GCM,data:CPkjY0i3WPvn0R/07NO1uYNv3iXfcTQJJyE67GgTwkuO+1urwsm4zwiBS9GoxLDVs7kPaHOS8NH/aMQSOpnS1uFK,iv:PknNUaAbaBGf08gC1gU5RXUrTJ+sZPf8FbP5OY5Emc4=,tag:vhysG4kggYwW8zNqO6ke1w==,type:str] sops: age: - recipient: age1lelpkv7u2xh5wezuwp09fmf9gsa8gp4rzy92jz0t203au82a7u5sutsjwa enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5M1Q0djBlYmpZc05KeStk - WXdzd016blNWNkRBMVdHRzkzeUdQY1BPckVFClB4dkptb0VNSTVGd0RuRzMxSTd5 - TmlrRDdSWDR5eGN3MVBhQ1pCM1NiZ2sKLS0tIElNYmdRczIvdStYU3plekYvcjRD - b2ZEZ0gvNHpTa0ZVV3gxbStmb0p4dzAKQEytZ9YpJVhb+wwYwIccz6oKMyXfePAd - qFQqOircJVTCsWsAiV5TBfUk4JH1ctt7c/aKveJrahTDoajm3OT1Hw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5ZEtxOXhHYitCbjF2VVlT + RHRCSkJZM1daclpjRnpTcXFlYkttSW55dkIwCmMxdDM4QTI3ZXdEcy9hMVhmVFl1 + TFpXaTNQWGZ4VERRN2N6TElkcVd6K3cKLS0tIERUU21NRjM0V0pLQXVPWVNhaTNU + Mk0xWTl3SVUxbEpZUHJFSXg0Ui9adDQKnh5g4sOPKrIWKL6eLbogX2Lw8aFuBlnO + P7WM0Drq9W37mub9USggU7NxVMS5NtEGWdfBK8rL8XJAlsI1cXAwxg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-04-30T22:25:01Z" - mac: ENC[AES256_GCM,data:6PFhfP5KSzwmL3mZ21FxLiq8tUjL31086LBW3p2keMxwUbUibwfGnLpD0vNpm3hYBYa7GkyCcbyj6P27zLcyI8u8Ud6JNoRUYLZheyM9GCkhPXo1Z5Pb8kzwYcVB2jfUl/S86dYU3AilYMcpoMFaetfL7wPUVZJMWfqW1EwaY4s=,iv:W4cdUMly7X3j89q8FRFrein24zZEhVaj3p1rC7iJgnY=,tag:wDr03kLcZ5pVe9imh5ZZMA==,type:str] + lastmodified: "2026-04-30T22:27:29Z" + mac: ENC[AES256_GCM,data:Q/jO16112dhijbnRZ89Z1hrZmbWyFEXAn2AvR/IFgHBMPUAepgQOiQnMLLHbvAthl2GTN7a4lWscz3C6TPmv658Xco/LxpIu615mm9uAK0uXchUm+r7c9BYiLzYWdML+7ouiYamLGuXoeXqwzSntbjCrQy/Op2JvGXD3UZLWaX0=,iv:BSMhYl0K1kKSgnbMgGE0M1Gu8KeKlbwLhR54buVugHc=,tag:B8y4h33JXyRYwUBGE583og==,type:str] encrypted_regex: ^(data|stringData)$ version: 3.12.2 diff --git a/infrastructure/hydra/truenas-csi/kuztomization.yaml b/infrastructure/hydra/truenas-csi/kuztomization.yaml index 9963cac..0021430 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 +- CSIDriver.yaml +- config.yaml +- node-service-account.yaml +- node-binding.yaml +- node-deamonset.yaml - nfs-storage-class.yaml - iscsi-storage-class.yaml - namespace.yaml -- controller-service-account.yaml -- controller-cluster-role.yaml -- node-service-account.yaml -- node-cluster-role.yaml -- node-binding.yaml -- node-deamonset.yaml -- CSIDriver.yaml - controller-deployment.yaml -- controller-binding.yaml -- config.yaml +- controller-service-account.yaml diff --git a/pkg/linkding/linkding.go b/pkg/linkding/linkding.go index 782f8a1..e032eba 100644 --- a/pkg/linkding/linkding.go +++ b/pkg/linkding/linkding.go @@ -19,7 +19,7 @@ var Secret = struct { } var meta kube.Metadata -var Namespace = kube.Namespace(root.Linkding.Name) +var Namespace = kube.Namespace("linkding") var srv core.Service var pvc core.PersistentVolumeClaim