diff --git a/apps/hydra/linkding/deployment.yaml b/apps/hydra/linkding/deployment.yaml index 604f9f6..7e95600 100644 --- a/apps/hydra/linkding/deployment.yaml +++ b/apps/hydra/linkding/deployment.yaml @@ -2,18 +2,18 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app: linkding - name: linkding - namespace: linkding + app: linking + name: linking + namespace: linking spec: selector: matchLabels: - app: linkding + app: linking strategy: {} template: metadata: labels: - app: linkding + app: linking spec: containers: - env: @@ -23,14 +23,14 @@ spec: valueFrom: secretKeyRef: key: supe_user_name - name: linkding + name: linking - name: LD_SUPERUSER_PASSWORD valueFrom: secretKeyRef: key: supe_user_password - name: linkding + name: linking image: sissbruecker/linkding:1.45.0 - name: linkding + name: linking ports: - containerPort: 9090 resources: {} @@ -46,5 +46,5 @@ spec: volumes: - name: data persistentVolumeClaim: - claimName: linkding-pvc + claimName: linking-pvc status: {} diff --git a/apps/hydra/linkding/kuztomization.yaml b/apps/hydra/linkding/kuztomization.yaml index 61fcd21..776f343 100644 --- a/apps/hydra/linkding/kuztomization.yaml +++ b/apps/hydra/linkding/kuztomization.yaml @@ -1,10 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization metadata: - name: linkding - namespace: linkding + name: linking + namespace: linking resources: +- deployment.yaml - namespace.yaml - srv.yaml - pvc.yaml -- deployment.yaml diff --git a/apps/hydra/linkding/namespace.yaml b/apps/hydra/linkding/namespace.yaml index bc84cc5..f28f721 100644 --- a/apps/hydra/linkding/namespace.yaml +++ b/apps/hydra/linkding/namespace.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Namespace metadata: - name: linkding + name: linking spec: {} status: {} diff --git a/apps/hydra/linkding/pvc.yaml b/apps/hydra/linkding/pvc.yaml index 47cc9f9..7b6bf47 100644 --- a/apps/hydra/linkding/pvc.yaml +++ b/apps/hydra/linkding/pvc.yaml @@ -1,8 +1,8 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: linkding-pvc - namespace: linkding + name: linking-pvc + namespace: linking spec: accessModes: - ReadWriteOnce diff --git a/apps/hydra/linkding/srv.yaml b/apps/hydra/linkding/srv.yaml index 6469f94..772e6be 100644 --- a/apps/hydra/linkding/srv.yaml +++ b/apps/hydra/linkding/srv.yaml @@ -2,16 +2,16 @@ apiVersion: v1 kind: Service metadata: labels: - app: linkding - name: linkding - namespace: linkding + app: linking + name: linking + namespace: linking spec: ports: - nodePort: 30010 port: 9090 targetPort: 0 selector: - app: linkding + app: linking type: NodePort status: loadBalancer: {} diff --git a/apps/hydra/secrets/immich-db.yaml b/apps/hydra/secrets/immich-db.yaml index 5e55703..b207d7f 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:ExUIjDrV6bpFb49SaWV8SDwWyBOF58rb1xAtOvu8Jqz09VsGKSEupQ==,iv:fQ9rfAcerYzaFMdbrWsZ/YR/cGPhHrExtc+fVoW/2dk=,tag:VSJC2Y7xIzY8s4o4sOvfVg==,type:str] - db_username: ENC[AES256_GCM,data:h4JMTcRY,iv:QnfMeP002cRvldSfSZfVd5LHVrAlEUOy9EJhTr0ZC/8=,tag:KkL5EogpD3zNR1Nq6gVJbQ==,type:str] + 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] sops: age: - recipient: age1lelpkv7u2xh5wezuwp09fmf9gsa8gp4rzy92jz0t203au82a7u5sutsjwa enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFWTBvZVpuRzhuOFFuVmtY - QzZWcmVXRFIyZ1VJL0dneDNOTnptUzVHMmpjCmQvZkJHM2xlQVVCVDloVU5hUFFy - MExnbktKajErNWtjbDZ6THI2ZDVBNTgKLS0tIGdSaUFaNzRRZWd5Z1FockVJanlm - eFJac3R0Mms5eXk2M2pNOG9SNzBPNFEKmNUhnZHDV9HJ0WlZfnnsSjq9Q7Fe89lD - 79xHtPRVZ2EdfETDGM6KvQQV1nCDZwgEl1EgajUcVP9dSuIpoH7HmQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArTWI0czRKdmNkSURIVUdI + TmF3OSthQ3UzVkJFRmxuZnhCZW1vTk0zSjJJCkM5eFdOdlF4Q0FienZKUmcza01U + K01QMDVUbU9XejJ3eTN6SnRJWXBiZkkKLS0tIDMvdnpyK2tGMFRnZmxWYklBdDVC + MUI4dWFPWlp0U2c0dC9JcnAzcTlCL3MKcl2Akyido58LfSkbM4uc5l7F2mZL0Vr2 + k6ztaJQASt7E3yRPEYZzlGe8zh7KmQE+RisCQRhTyk8ZI0TI0dBQwQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-04-30T22:22:16Z" - mac: ENC[AES256_GCM,data:3exs28tq6RKN3WGFGTzAJXLpTzAsUJEkHRdM3YLD0H3j0b9tDYPOcL/7N7OHA9DKUm1nbQrpNiDVU2w+FemSGOgxqSiNIkjhyilIykn/ZE+YlISG7zWoj60OgylKdbsM/dC9bBvlu/VhoDxdCg/BKFBk0h403NOs8gdQOMVp3H0=,iv:ANgAYhusC0J0SlqShRk0AHFktNsjWrT36cQww85ZkG8=,tag:+Gnx3Mv9bCToWVEiNb7Fag==,type:str] + 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] encrypted_regex: ^(data|stringData)$ version: 3.12.2 diff --git a/apps/hydra/secrets/kuztomization.yaml b/apps/hydra/secrets/kuztomization.yaml index 184c88b..d459926 100644 --- a/apps/hydra/secrets/kuztomization.yaml +++ b/apps/hydra/secrets/kuztomization.yaml @@ -3,6 +3,6 @@ kind: Kustomization metadata: name: secrets resources: -- linkding.yaml - truenas-csi.yaml - immich-db.yaml +- linking.yaml diff --git a/apps/hydra/secrets/linking.yaml b/apps/hydra/secrets/linking.yaml new file mode 100644 index 0000000..110056a --- /dev/null +++ b/apps/hydra/secrets/linking.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: Secret +metadata: + name: linking + namespace: linking +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] +sops: + age: + - recipient: age1lelpkv7u2xh5wezuwp09fmf9gsa8gp4rzy92jz0t203au82a7u5sutsjwa + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4K2NUTUVSam9ZTitYbUhy + dG5GOSt6ZGlvMEFwQUViTUE2c05xT0JSdmxzCjhrS055RWM4UFNnb0hlSWxmYzNV + K2dSWXBMcURHdjJ4T1dJVm1LUDUzcVEKLS0tIHlqcHpDeEh1OWltRVFJMDFuWllC + MlNDdWFKeHJHL2pCTEJUcUhDdHg3S2sKFUfecGAmRjUXg1MVtey+zeqCLuSBQgy4 + nGC+zojDH6+LX3aS4um5xpil+ZtylTHIq97rjZG/7UFQoNhgxoX74g== + -----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] + 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 644e6c5..612a2cd 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:XWRWmMjp12BhI/mjlkicTYfZTGkgmmsDq5ZLst6r/yy0a01plVwyHLZI22BEQNVUu/gYu+ks8VY6esOstvNzL8ev,iv:tYduFXx9ORCUYkVtB0js25pp5xQi+ysg60571LpnJCg=,tag:K1CBeuZjvP1NgR3227H6tQ==,type:str] + api-key: ENC[AES256_GCM,data:VRzqfzRXWEC8Su/vMca+1s8Rzr/LHFBN/wgAZeYlvIjck/wWayY5FaeCqBg6uQAEwXzqQfNHLZnRVdqlzLDX4J9I,iv:fZpjbrCVxJRCCRj6a8ww2eVDysA8asF5mvyzg0vtohQ=,tag:17a3gvF/lKrjYe5cE7crzA==,type:str] sops: age: - recipient: age1lelpkv7u2xh5wezuwp09fmf9gsa8gp4rzy92jz0t203au82a7u5sutsjwa enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0RHFnMXorMWQ5K0RFNmNS - cTBmU1g0ckl0SlZXbTQxcGlYNFpESGx0U3hFCjl3MzhIcXNWTkw2dzdoSzlXVWNh - RHRyWmpTUDNnbXllWHIrcCswTTBmQVkKLS0tIFJlaldmcm50dVprbTN2WnVjWUxW - R2FDdGVpTkl0ci8vSEhDeVVDT01BTHcKRWTZbnVbBxtOWkyf57r1vmF4NxkpW4PT - 74ggykRmkq815WfnSy3JNunFFC1WpT8sU/Shsanb/WVDJ/CwpLnkyg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5M1Q0djBlYmpZc05KeStk + WXdzd016blNWNkRBMVdHRzkzeUdQY1BPckVFClB4dkptb0VNSTVGd0RuRzMxSTd5 + TmlrRDdSWDR5eGN3MVBhQ1pCM1NiZ2sKLS0tIElNYmdRczIvdStYU3plekYvcjRD + b2ZEZ0gvNHpTa0ZVV3gxbStmb0p4dzAKQEytZ9YpJVhb+wwYwIccz6oKMyXfePAd + qFQqOircJVTCsWsAiV5TBfUk4JH1ctt7c/aKveJrahTDoajm3OT1Hw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-04-30T22:22:16Z" - mac: ENC[AES256_GCM,data:s07OjBF8ncDoIHkrsGYzr88XyY1/c3DF8TdrGrZONC36RJR1LZnqFXiMYMGxV67i2cixYzoS4o1oWSsxODEfRiqko+X45mmdcrXyw8X853s+58eCxjQPPtvPLyAM4CjX4dVVzmfuJMb3Hf3hA27w2qf/lYdZgBBh7aN7FK8npOo=,iv:4K0LHohlWpojT2weMeviJZih3A8K86nBqqaJYVkHLhE=,tag:NzG95dKtDDHUVUtAq2dt8A==,type:str] + lastmodified: "2026-04-30T22:25:01Z" + mac: ENC[AES256_GCM,data:6PFhfP5KSzwmL3mZ21FxLiq8tUjL31086LBW3p2keMxwUbUibwfGnLpD0vNpm3hYBYa7GkyCcbyj6P27zLcyI8u8Ud6JNoRUYLZheyM9GCkhPXo1Z5Pb8kzwYcVB2jfUl/S86dYU3AilYMcpoMFaetfL7wPUVZJMWfqW1EwaY4s=,iv:W4cdUMly7X3j89q8FRFrein24zZEhVaj3p1rC7iJgnY=,tag:wDr03kLcZ5pVe9imh5ZZMA==,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 4e31f4d..9963cac 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-deployment.yaml -- controller-cluster-role.yaml -- node-cluster-role.yaml -- node-binding.yaml -- CSIDriver.yaml -- config.yaml - nfs-storage-class.yaml +- iscsi-storage-class.yaml - namespace.yaml - controller-service-account.yaml -- controller-binding.yaml +- controller-cluster-role.yaml - node-service-account.yaml +- node-cluster-role.yaml +- node-binding.yaml - node-deamonset.yaml -- iscsi-storage-class.yaml +- CSIDriver.yaml +- controller-deployment.yaml +- controller-binding.yaml +- config.yaml diff --git a/pkg/root/services.go b/pkg/root/services.go index 9ee4f8e..b9ea269 100644 --- a/pkg/root/services.go +++ b/pkg/root/services.go @@ -17,7 +17,7 @@ type Public struct { type Postgres struct{} var Linkding = Service{ - Name: "linkding", + Name: "linking", Image: "sissbruecker/linkding:1.45.0", Port: 9090, SecurityContextID: 33, // www-data user, group and FS ID