diff --git a/kubernetes/outline/deployment.jsonnet b/kubernetes/outline/deployment.jsonnet index a346f74..dd2ef49 100644 --- a/kubernetes/outline/deployment.jsonnet +++ b/kubernetes/outline/deployment.jsonnet @@ -45,7 +45,7 @@ local env = std.objectValuesAll(std.mapWithKey( { key: "app.kubernetes.io/name", operator: "In", - values: ["redis"], + values: ["valkey"], }, ], }, diff --git a/kubernetes/outline/outline-secret.jsonnet b/kubernetes/outline/outline-secret.jsonnet index e06780a..9037855 100644 --- a/kubernetes/outline/outline-secret.jsonnet +++ b/kubernetes/outline/outline-secret.jsonnet @@ -36,8 +36,8 @@ local values = import 'values.libsonnet'; "OIDC_TOKEN_URI": "AgB/rVeKhEJqOiYAzNPDoujVdPnyL1TWDR5KCyTzh8KQo/C1cD+0O/GCR2JX6IXEKvT4S1CzGLgaSqeYSNdpkMpA1CigacteICD3op/rytusmwxUqhTPWT4Tfdu2VzR1VT0mkfYcCMlmctGRqm+vYCx9wRp1ZT/9IkJEnakwRvZ24h6ltgGLniVKaCTmclETyFL2VQUXRyBSyHmm/DEvaxzRaUW4gTSreT7tD0EsT7AgKACcD8Qeka4uTtoC7K9foQHYiBtyMfn9H0eCfJwdEi0J8DOWHt4HDEo/iCmWoUXtkKgDUJ5i2fNGvy6qeyHEqUjJha+tXQ8tbU+o38ahvpGuKdvQ6RBSShRQufKuaUVru8+C7fXqbKLc3x8Bm5zWm8LAPF/y2QR3+Wjzz9bUxURijxcYS6/0Zv69ML2xUgo6ZwtbxK05OwzgJ3f041j/h+Bg/K0hAXShaclObp93RPPRrlsqkiaeH1vL5OaMtRHykC2yjHh2mBlQ0w7he991UB4JOXCYW939Tb6wJc2JY6vOz9+5IAU5sbZ/aomKU8PKLr5DSKHCjYYLwAjKGaNqB8UDx7cJevTF4n4baKbr0D+WT/gnAXnXvP364KXUGzKXmi3WCF6OUctO5RzgwpdtrHINKxVUtBZLfhmlnTk0ir8xEuMfMuq+3IJbCmLHUcHwUP6Prwx5D5yn0ZihXkzZRU2sz+OhVpAOSysqHQmLwmNkrqPLlpxI6LuqTbMuKw5nzJ8UOSA4xBAiDyQp6fmAfA/facJWMPBiKyTspNFRI+0=", "OIDC_USERNAME_CLAIM": "AgBMCqyx4VGLZUFWfGmpJplWhdwK2+lbBqtbB4Q9nd6yoJWbuFy/zcQkmJcpga9H9Q+AIxv4f13PjXSSnlo3K54DqqiU92ndGCmhnNwMeAG8HFtXds5pF5DvbJIWJl5R+2fbpKdLHQakNdaDWME6++9t9mlAZSIGXtpJaD9UZAHNL8j3N9GRdI5fy+Ea0xBxUk2Rlvk0l9zt2Mo55Bk+1YlUx5ayaQGZHWibMEh5/Mr1zq82k/9yRktGj+WHzJ3Z46n7piyqUCcBf1XAMHBH6gAAgZhSC+UojKxLKH+DUJ8pOZOChUGEgsnmjdwruE25gKvQfULKXahJany/1+XZi4DXaHualt58C/kU+ErVVRSIfxir3HHiDY4pHv0Xr9NVG41u7uDao/X1+ojNbnW/V3a6bPI2/JM7T3PNctH0FXoCNpYGCUpgHhRtsBroNToce4dpwp5p6bUF8IKoQKMSNUKPRCmdHNTgV6tXt53xIDUD0J7LLPxNKQDUotYZLfPwy9utJhCvTOWM9HkIqx97FwUN1EKfONiOJp5SfKNgdU5cutIRHOqKm5e7YEtTPYCjcQTjtIAqGMOmpRRpJe55wDHJ7/LVLaRdcn+P7sPZxESlURN7+wMuaqLSJJ5z3WInrSHxquIf6Rbem6tsYfBY3GFEZNQWMTk8LOH/Y4ltVgQ6icgturAXXGU4+LOz8R3JoEhMHJqyyFQQZw==", "OIDC_USERINFO_URI": "AgB1ltnwRjastg4OzJW80coJ9IX4WWWhnkjWXMYIwf4v0Ponb00ccBuC4zaNqvEvSXFTNGN4KBzd5Qm6ZflCpmlUAgXU5Kl10o+yrD/VVvQhaMqYvQqzMoEmPs74fNiJpJ0fjhPYgDfus5m9rXWTxrLgBwWEyQ4eAk13iTt+NIpPUs3XmswH3U9l43e1kcgOUfyPbbgO8YVI8VuR/TinfQ/Chaq2xDNcmWdd+mVaZttcQCG4bz6sTnl/1CNzqfleN6u7fzaSFCz4eb/d+Sw0oN8X8P1ig5vyobONUauWFcnHgNU0DYPFZiex+Nl5uXUdMvRY5c9uDyId86ttJdPGOCmx7PJotN4I8UqfUSFSXLBlN9fplvBXeb4OJItiYxrHPsazrD/59VsdPSjLXjJT3KpLuyTzgqlFNP/wqQvx/+N4Bkslr0CcxShwDuJkh6D6pOvEUx/HqYz+E/3ypsb8ENpt3vYJWisHe+tcfNmaUyatk9n0zUENUmvbC7sjOI6UyGIl5El9F8ewN9NxaEHwNfOVO8c9o/dOexnLkq2olV3UHbPRPdmJ9otJtiee6I+BfREmtmLT5QLEuArFeKNXAZhbzDGIcinjD5ATwFkedwhOE70hNDN7wM4PkgWKkfybu872g0/C3FCgVHb63251HpgyQf52l4gws+7RelmaEU+abCTshzeSzEYby/4AOWOs3ydu9trhA4L0VLquUmnQ68hYZW8lNOdoYpLFd75jqlZOVm4W4jNt6ZlZDveSenoBNb1XYOUl8EdO1e1/BelXpH41918=", - "REDIS_PASSWORD": "AgB6uxEDIv8IuK48OtsB01Iv72GzSe5kGYb+KRAQY0ANPEqm/iVl+SBXILI+fmj/qt9aeWONMOUolO4pNv8Huj1NcAWNhmI7S4h9ORjixKwcv5rQ840KygMk8Hfn3K6QIQ70Lky1VIDF8q2hY2WMCobkvwumcgr1ruOCgXHWt20kleqG13uWiIRUg1ULBvN9WVe4gt64JnN6wXJbSfiMeysZofWYNSLJRIeSxouRnKVKUzMYrKtSvA1X3AGag+4Qp3hTBtufRIJdOtR7Qo4d0M75WMAWkqfO4+zmlUQAmuHtrLBGgisfnVlijFZAVFVeDIrdiaBSUbPfVf+FQT6Tt/+sNwIO5ClSe2BUwG7443cmJeHJtuEn5dMdYyiUEi4Q++frY4KMXC/bmTuQAGdgAPqZxokllv0xKVrOhUYSDnIopOkF23jnMTG64+g868wwthCi9xnIw6bUDRVcUd3qnERFKQMG155AJBkajPv93Ng50oN9Uk0XvnW+L2s8U9tBidkFOYBLwJZ9KHKeszoUFHi+xJ/vq2qowUj4lEVcsfgKg0vuXabGBKwii7ymy423mM5VkFywlEsDFh2jiYcr8LGYTyIAsASlgsT0c3dvBetnfhIk2qcvZS1y/ItpjF/khOvcYQLESUabTghYCa38kLLvmgEHtzEEm5+6JgedXG3Ex7eY5QzMCrCqm420OOptpZD97pH3NVdDPkhVyBQ4839QgOvKvWJdW7TfHuvaGZ+8vA==", - "REDIS_URL": "AgBWgbxjFPkXugZuHucGOkaXzXglM9DquxE1d7U8RPytnrCEU9aZFPfE4Tq3mqAEBuNkeI/EV3M05YHsPu+inNmiuvflY7HrWn6+USau7ybZgL60y/U5Ipk17YPFoVFruwcDF4lvfJax70F6tR7goCRiqjVazZjStOeIN2C1m3zD2283L9JGLFdIQ37qt67zXSRdfZH3RjW0ZArNJB0OFrB32XiVS6kEo9lEIj2sEUWDAtkhbeHf2oirJasaxsZyHPcPphDwvYL+Qzco791P0QaL0a1vFIS3T4LA4a8wUvBZYhsSUkjIWiYcP5g3f+aVKAsQJ/a5mXAV5vgpjkSMxBaFvqJlYnXuGDtskjwCi51b5J33smQtHN4kNFjU+7fptt7HgD6g4TFrVdDXo5xStz2iTKXO5EzzjuaASi0e+49iEhd+CjxpVbPoA3W3tv/sVIPJB9s/Vtl57NRbhm07XYnoqu2Cr65twgcNlxy+0CeKGvf+hVOrC88xcOg58sbSET+O3Ii0W60TNhyfMiXrKEiSXmowiaBsTuMlmZFdv8pqnkC+/W+ANaxH3chAruQVdji2DVifjcvMzT9megzMvusrqJ0d9kkTnBlVF6FCGsqtvugbW/IVX+zsaHDMHPBg7BwTp+12+/HLR5ngl9tHm2WyCWWC0UMyU88zgxU4o7dgKtp1o5Suy7TbnK2w2rmg9fdx5nTUQE1D0U/kyfoo8LnrEiODKLVOgRXDGD9F6SmlS8mkLB7/arpPIo67z9GVMMFqKP0p0aF5ue60liqt9k9EzVzE", + "REDIS_PASSWORD": "AgDK7wCFYGLe8pS0SGJF+E4evjJLHdxtu1MwjY086ohUjOcYxvavRvmmRdnmsHxhc7odLxCYDXJpoIL0WbZHkmGIGRTMLX+1T7YoWWLTQGRSK4XiQZzBAj14GV/FLr7OYQBea5A4tWZHSGOYPUrETN2UOj+iPkEZfGEOLwiIQWj1370PKrWeMYPzSZaMsqpakx/DbPXEwds/5PPxeACUDs3trC1QnVF4bqVbLvImoWpylkKkpOqQchq1CuJwM1qeU1Oc+vS6195ntsMbMsIl3lNueigsuYsEz8/W0YT3cyJGBbLWHaQShrWLoQYC365rvzsBAi7eiuX373YfMrEWRiMiK4oQot/jUo7BWpf5L+EAoXIuxqDIiaCH9quf8IMSyDuKwPbh6Xz2OLpGK6kdeEwCpcDuPlGJtAMLwqZo+TCA/O3uIG/LtKMkqEHMWG5eLHWxgti4eKnZwnnejFa6ELoMzDRbLAPTIiSWtyZRJWrgR8vKbIm5Jp88N5vKKEkkZ07RbKTtG7gVaWBF1IQddBofgg5lE5FAMvV5c5FutG4nK3lJz288FDfC06Wt+LtIY/Bs1nFYavRvB4H53NnCD/EiY1JCG1jUfCkmk50YEYHJtingta3rie6xJ66KoguTgGO56aqr53L93MD6/zpmQP1mbsdzU/NW7gmPtsBzcFB/CPBiWlkwEz8R4uBazRg/ftZeHboshwn2Z6nykoLS8t0D4RriPL3go5k0OcU5U4SECg==", + "REDIS_URL": "AgAhjl2TejmvuzABSXxifDXS/eNKgilxMEfWVhixpdeXcbKgXBJZywII87W3NJs110mwaAUNQ3kpG6+9CfEbfsRzkTpYawEfDb+RqeVEQMGCDZgro2mzkSf7jfr2EGd1TEJLmGtAYFZkL1+mmr/aYUI9kP3AlrPm0voD546UqHir3IvWfVhlP3JUoaykaaOjmJ+tC86/v/dYzkcLtgJbqSDp2rl7qGeC+yYg92hF2WWLedpb44GFULtpYsEyCU3iKZq7iVLFJv7XoIsPvkWiYTHMvFE6cMeOXdq/ieNFQjOEdZ30VZNjmLk0be95jlftgy/NDbudouBuvG9dzv+IkXqLSuO4QVIquXignvMTNdk45uJseNyyuJpQ49OFrpabl3e3g5oFRbbsLMPHomExU1sEeIE1gB8pYqAQSclvt+Ygr0Vw9++1jJuvKbhM/Ps34KovSFk89Vn9xqw/oaGClZr8zHJnYcYHRri3ZyThhFtwokfFJFqnrj1pZNHEHKOoIizVHt33afC8q9gjaH187ttT1LC9SHQVbc79Daj8epexzcHt+mIgXDhFA3tEMD7FsGENAYwaTuz3cXRnCLoL5Xnnh2DmazRJgtWxIe07mz/vVim/ZqtP+YU2bCVYTTMluBxcdD3OvI4yoXtbe+iP97tDNy6CHOuvCuyLjwd54HYB0ClBNP1hMaqdx9HcGFP1Q2u3MqmOcDcrhfZljJhxaOaCVJ7RXdX9N3lS3OhPDyzNj2GILFGqTUtZSFLG5XOwckJhobtAHuu5fyxGnQh3uShQ6O0bkw==", "SECRET_KEY": "AgDE826GBCLWwfwmr8i1PrjAAhuQ+KGBy7+aGSjTscznquEVkiGL0BSXG3K1GaJzEh/RVAd8wvN+521jCwoaC8qBM4Olcfkfa0l70g+NYIsIMl+YWtCthfPw1T1VJTellw4nQduS3ym3qm0E+mn/zjpykr+cqeorFbMlBctqjvdgEpAmMLk7xkSyTwofPQkQmpXjvvpGcLOz6ldiErd6bgz0Gwr2cz3rZxMTP7d/e80gqAkXmYW7ed70fcGmeRdsLc5LSUS0zd5/aMdBFq3TsXW6/zSjqOwSuTTj6IhgxOlGBaijF4U78zOnUajdmMwGEQ2X2MldfmhgSFRf8ElIuo/4FO2D6sQJMCQfYhGwyRtd+SpOzqbzhF4eeXK5NJG1QaFKoPFLfiRO2Kd8MPJCQQqzoUSAxkC+nWz9HVe027ZatSx7JafJSfaRR2830acgfaXV0m+jy4WGOi4jJmZkeQIB6wqT62Nz4lGKbz+vCpiQjJmY+iPI1X7lshrCjhCV1+pSbatDhrgc2JrdwD41AlkXv4gkSq+JQIprWGP9Omgvu9jaNB/NwnNl1ehvISbk9aw9a/Pn20NmmR9b++NptLscxxdoSxMbr+9Zrz3D52xhpipLiuAPPtO+qCK+/RbBm6Dnfh5s5bolkSw/oR0KQMRBAMJCCWNw3lPtpLi8a4PxkSnodGkjM7qnqw6GKGCkiBw+gE/FhCnRju3N9sXasBulw/8rIAhYLOMTSgMIK72NcDNcMdn2Dx17s8StdWcGe99RiZ5JryMWE2tOxznGH5aE", "UTILS_SECRET": "AgCg07Y1yvjvJ6W9lqMsWbSx5W4V1n8SVjQpSc+1wxPFHSynuY5It1qYG8ODBnotbfdfyEwtIdWpyAQImwjfMGPsoRrcjUZmjuNy/thqQxrwC02t57FgP7bYtK8gwPZ1h3hlXdMb+igiu3p8ri+ku79g3eN2QaEPVDpB7b/O8kuoZC43M0EsYaL02sPKFx6tTbOJ7BHdlw3JufYMIetZJ0njSn9QipmCtFSWisbfMjr2UrCFSojNvvhnWHrG5hFhYwQavMuu+9beoNu9qp3eoQoaSugcliu0bwX2xGKm3ZDDUOS+vxPKnQeU3QjeUVyGUF6Lm1qG14L71ugsU6lc/QsAHsYkGW4xyEsi5y2pwMGm9jESwnlICcGD/ywCtuXr89FaNvPaSYG80sLV07q3OZbbv0MJ/nX7bwfAqZ1qlVWHQ8qrPPAKSndcyy6GHX9hKM/DJOZMY9lHoSTAstMUMpwzbxER9oP/k2A9BP1oFuV6HelPPNRjv012zH03ici63563Mo5FZFJmHTsn1IYC36Sc0HjA+hk69egN2S5epZx9FcZb8nhqjccZi2xAsBJqWWi02BOPhL+lKpGESMAsVs8MGGJD4HGC0YAVudHOz5+foXLflZZti0NNqXtarszlyRfk73VZZxTo0o84sFO7SzcaEWYc3Pd+FG2TFNCWMAzIAXA9Xx8P/1mxiSA2DEQowTdAf0LYAWyqM0AR3yLbqhbJGGvJf8F3/TQqDhdAZaHlztnd9bn6LXrJiZc6PM6Puc/StkYTTJqr8WYgBRraiK32" } diff --git a/kubernetes/outline/redis/Chart.lock b/kubernetes/outline/redis/Chart.lock deleted file mode 100644 index 7368d65..0000000 --- a/kubernetes/outline/redis/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: redis - repository: https://charts.bitnami.com/bitnami - version: 18.18.0 -digest: sha256:735e476d75450a035fe783004c56d5041b487be689c0596a73e63a69bac125f8 -generated: "2024-03-05T23:11:03.075016348Z" diff --git a/kubernetes/outline/redis/Chart.yaml b/kubernetes/outline/redis/Chart.yaml deleted file mode 100644 index d1bdd68..0000000 --- a/kubernetes/outline/redis/Chart.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v2 -name: redis -type: application - -version: 0.1.0 - -dependencies: - - name: redis - version: '18.18.0' - repository: 'https://charts.bitnami.com/bitnami' diff --git a/kubernetes/outline/redis/values.yaml b/kubernetes/outline/redis/values.yaml deleted file mode 100644 index 6404071..0000000 --- a/kubernetes/outline/redis/values.yaml +++ /dev/null @@ -1,24 +0,0 @@ -redis: - enabled: true - architecture: standalone - auth: - existingSecret: "outline-env" - existingSecretPasswordKey: "REDIS_PASSWORD" - persistence: - enabled: true - storageClass: "kadalu.pool" - accessMode: "ReadWriteOnce" - size: "2Gi" - master: - affinity: - podAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 100 - podAffinityTerm: - labelSelector: - matchExpressions: - - key: "app.kubernetes.io/name" - operator: "In" - values: - - "outline" - topologyKey: "kubernetes.io/hostname" diff --git a/kubernetes/outline/valkey/Chart.lock b/kubernetes/outline/valkey/Chart.lock new file mode 100644 index 0000000..e2544c1 --- /dev/null +++ b/kubernetes/outline/valkey/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: valkey + repository: oci://registry-1.docker.io/bitnamicharts + version: 0.1.0 +digest: sha256:e4a258e794c54e6ca0bc8a38eb539abba7ac7ff488c8aa3720264ca1301623e0 +generated: "2024-05-11T17:07:00.1262661+02:00" diff --git a/kubernetes/outline/valkey/Chart.yaml b/kubernetes/outline/valkey/Chart.yaml new file mode 100644 index 0000000..6b8da1c --- /dev/null +++ b/kubernetes/outline/valkey/Chart.yaml @@ -0,0 +1,10 @@ +apiVersion: v2 +name: redis +type: application + +version: 0.1.0 + +dependencies: + - name: valkey + version: '0.1.0' + repository: 'oci://registry-1.docker.io/bitnamicharts' diff --git a/kubernetes/outline/valkey/values.yaml b/kubernetes/outline/valkey/values.yaml new file mode 100644 index 0000000..e4880bc --- /dev/null +++ b/kubernetes/outline/valkey/values.yaml @@ -0,0 +1,24 @@ +valkey: + enabled: true + architecture: standalone + auth: + existingSecret: 'outline-env' + existingSecretPasswordKey: 'REDIS_PASSWORD' + persistence: + enabled: true + storageClass: 'kadalu.pool' + accessMode: 'ReadWriteOnce' + size: '2Gi' + master: + affinity: + podAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - weight: 100 + podAffinityTerm: + labelSelector: + matchExpressions: + - key: 'app.kubernetes.io/name' + operator: 'In' + values: + - 'outline' + topologyKey: 'kubernetes.io/hostname'