From 22c3419ce2e8f48ce9c0450c7036aa7f4d5b1f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?c=C4=83t=C4=83lin?= Date: Sat, 17 Feb 2024 17:59:45 +0100 Subject: [PATCH] feat: add ReadWriteMany access mode for grafana, loki and prometheus' pvcs --- k8s/argo-apps/loki.yaml | 11 +++++++++++ k8s/services/argo/project-fuku.yaml | 1 - k8s/services/argo/project-management.yaml | 1 - k8s/services/argo/project-roboces.yaml | 1 - k8s/services/loki/sealedsecrets.yaml | 6 +++--- tofu/adguard/main.tf | 5 +++++ 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/k8s/argo-apps/loki.yaml b/k8s/argo-apps/loki.yaml index 3097f28..80dc79e 100644 --- a/k8s/argo-apps/loki.yaml +++ b/k8s/argo-apps/loki.yaml @@ -25,6 +25,8 @@ spec: type: pvc enabled: true size: 10Gi + accessModes: + - ReadWriteMany ingress: enabled: true hosts: @@ -61,6 +63,8 @@ spec: isDefault: true server: persistentVolume: + accessModes: + - ReadWriteMany enabled: true extraScrapeConfigs: | - job_name: 'argocd' @@ -69,9 +73,16 @@ spec: alertmanager: persistence: enabled: true + accessModes: + - ReadWriteMany singleBinary: replicas: 1 persistence: enabled: true storageClass: default size: 25Gi + accessModes: + - ReadWriteMany + - repoURL: https://git.roboces.dev/catalin/fukuops.git + path: k8s/services/loki + targetRevision: main diff --git a/k8s/services/argo/project-fuku.yaml b/k8s/services/argo/project-fuku.yaml index 5ad7158..cf22ca5 100644 --- a/k8s/services/argo/project-fuku.yaml +++ b/k8s/services/argo/project-fuku.yaml @@ -16,7 +16,6 @@ spec: - group: rbac.authorization.k8s.io kind: ClusterRoleBinding sourceRepos: - - https://gitlab.com/fukurokuju/k3s/services.git - https://git.roboces.dev/catalin/fukuops.git - https://charts.goauthentik.io/ - https://kubereboot.github.io/charts diff --git a/k8s/services/argo/project-management.yaml b/k8s/services/argo/project-management.yaml index 29b07e3..e3a171f 100644 --- a/k8s/services/argo/project-management.yaml +++ b/k8s/services/argo/project-management.yaml @@ -20,7 +20,6 @@ spec: - group: "*" kind: "*" sourceRepos: - - https://gitlab.com/fukurokuju/k3s/services.git - https://git.roboces.dev/catalin/fukuops.git - https://democratic-csi.github.io/charts/ - https://bitnami-labs.github.io/sealed-secrets diff --git a/k8s/services/argo/project-roboces.yaml b/k8s/services/argo/project-roboces.yaml index 51e0b8a..dbbb7b5 100644 --- a/k8s/services/argo/project-roboces.yaml +++ b/k8s/services/argo/project-roboces.yaml @@ -10,5 +10,4 @@ spec: server: https://kubernetes.default.svc sourceRepos: - - https://gitlab.com/fukurokuju/k3s/services.git - https://git.roboces.dev/catalin/fukuops.git diff --git a/k8s/services/loki/sealedsecrets.yaml b/k8s/services/loki/sealedsecrets.yaml index 5a56c60..68a5f51 100644 --- a/k8s/services/loki/sealedsecrets.yaml +++ b/k8s/services/loki/sealedsecrets.yaml @@ -7,8 +7,8 @@ metadata: namespace: monitoring spec: encryptedData: - password: AgCDqLnCRtrqOSSS06hv+p95Hx+R4Yl91SYd+RgzQkDzOWC2/ltnfWr4M5WhzCPijTtGuYFMxP2Q0CaduqD/+R6cxye5ImyX2Jlsx68Y/ClDCSnDqPhi/a6j4cI1Dkk7DE/JMPvUrLyFEnTGuD+O2rfgaiJOTFjF89xyByUXlAi53/Q3bTPEf6kwCnzyHdJR4pKpPbYaQqIlokD8ZkZ1Loxp3CrkoUKKib8UiO/nM9pdRUxtcN6GUf469QqIbdIAx/VmmBaP/W/drI7uwVuTLuAhYN8RiRz41rclWAneJYFQ1F5l5nchEfwiSd/8AzqLCVv+6Nt/nQyEnD3rRgODp2YFfllXCpU/UUlbnJlPUk1qseQx014MCPqPtlxLKKhOwkKBVWCHbUDNTUvnduFruTbWrkwM1LQbkm5HHI+gzBiX6nssjWx2MS/rcP4d0hyGguBmlr69eF3X1nhkXUaL2RJrztULpyAXIan7Z35fIbcZ7SjRPaZnszsSPGHGo8S7JL6kJLboli4VaUX1Rle86vMwDGfFR5VGSIQ52W86Qbhbqim4DvU6iam5AfcWizRU8RO1mtIGsxV8Evweyp8GjyDH84IGOQBdgMr/Ty4CDyXYRmrT4LFSCs3WbgJnNXr6Y0c2o2VXxvxBtGuCYzHXUR3bjXoKOu2KUdR5S0TJhHvDNQdeD8tCVChES5G/k2jk2PszciHS/VJYvjruCeN1yyvTDQZZRh2y+mSSTmp/9g== - user: AgAj9yFg+PwRkK1dvqOjz9konV+bSSORZF0KaQkQR5M7Kxy4scabWSKIzjhinJ3R9poex5ta4F5jV+C8xOMcyHX76edyaYhdb+dqKThTKXhRXrwCJQKDrE7uqVBpkXmJQKKKAi3RNtvezBtR7/5fzS7vx4YaWe7/XpZsxpSZoF+tXf6bzLsZe4w9KLjLVbH+4J/vfWjr4E9j1gSRdM1kJQGbBYsSSL/DOXyJs+hJIVtec21qtPL5Hh34VsMgxYawGMfmoqYaWvKKHAQ6b/xQtuX8x5Uoiud/+mQspr0Fg4XXlDFbyjxRkG7cibgcLFf5WlnkfRL6MQfOTR94oH3vqWkFDGLGLMTSaK74yd4M+6Jjgv/awi35CBb4gbinOAlxrszdiqG9dvunj6zK5dSOEBzTNDtn/FkQKmbpmcbiBN6T00X4LIhYFmAs1Fb6MOn6Qa8mAKthvoDZpF4YNWlyxMRXFLM1E7BYuNC2AvIhRMhh7zS1Dt7qbPHSy5iMw+QadC9d30udYKhJCFZn1ohjrCDkfFZpHE2wpTQv5+fPB3rMk3XqpLlYbdtWaFPlE/KQ4TPb0niDmkeaYTg9qQzp/rzT1V+D4LhYjwdU82Up+dJo5QeHN8VyLIml2Dg8t3ZZJaZqxBbRlrUbVyFujO2b2xRJaOInFHA64SAq4HyOgrXdqYDcsmSoATBYzYFH94vM/mb4srD3NSnlT9fdpu2jOQ2zvqcblEU= + password: AgCZjcF3chb/mg0OuCorxMv9AXmjpIuiRx4Zj7fLg9yKGXyYWUjrKIkuZVy0NyQu4IU8IGxdf7q11xxUc+mc4FWIAar8Lmt//6aAcLCPpbKh903W8g6TeUrJQCqBFqCRhLzjHeCG4WyrgAwjM8xelHl7pQRcG4yad8stnLIhN2rR5Z4Znprvw4xUktpcfc/8DvIN9YnDwFA/+DQpSb1BVpn9c6yODK8aCyktgjkXZsqb5ENfOknPu5GHlWOb8UTrRDPPycXpN/Ld17iySGlg18kbD7dCtpHgJOF3MULmebgQrP1fKfyHtnkQMhUDmmAJxOXXhphoIf3zXDiOSL61Z7bGsdaUjGn6l5IdNPRC2/WnRAnQY4/3iO6uwfQcdyscf33JoSZbEsvuzW7dGZRu60HmujkxACgaGSxU6NXjPlkrptZjcW8C/c6SDP0WYKlRj+vrkjPMudyVKthC6A8Gezl/JnH0uwofqz87SNEkLCpurD9LeJ1h5o30/DOvTm4lXGYU8YvmTgfT0bbvSdjv+i0VKN5QxVnwjymiJqyNdxoR+vOGRSa1xFZusS/lajd6LfMVF4L4XKgyIajzESF5xLy6KO1v29M5F0X/EdPfLjNCRMRgQcTFz7rn82pIrmdt/We9OxioyiNZsJ7k4AKwzlrWPUbbhEI/cP0w8tLm+gRXT1UCz3+nG9NM2f7um3vlotvU/1/QT3oCoKLYWxwDr251wgGNchQzTOYGE5bzvA== + user: AgCZBx77cHwdvxd1wHIR7ztq1PJtbpuH9B90KbiwHmTa2MB66+tBkAPNltCucmLikI9v5k9CtOV7V5tcmhcNGHEyU0Y8rfpcXUsojw2ljNH5nS/lqvxPq80R7rJJA4rbvJFDR/TE8dHhft5OiClb5HGzy99oLfzpXGRq0D90sraedCJea3O9nlZLbgaryQG8mfPONic1P5i4RHYOyB2F2dzdX8vuQNCzMS3n9bnfFDPiGwrYJHkkilXy62xfzEoWj1LTpcvs2tzQf5m8PeTaV+X5c5AKEpvTlHrZTonPsS3LZQ1qghuvgbROhMQspdqlVOajscnZxqbh14B8EiLChGuMsKK2MJoxZbIu+g2PwyGM7Ss4fVKIJJ8IkQCozUC036GssSk6tfNiTYDJkXJPr8e7ylj9dhbAV9nuFh0VW01f6TAbK68ll3QfqCHn60muNc1/fUQ3tQtCFfNHwAmV2GOLkrQXM9fvqyxXXu5CC5ddfNhjvbwtJfvssLdF7MiOWEz9+bXIf2bJhCnnjhzKnqq+hCAbjRTQ5ivFACYSOIoQE0KiN1GFPpYUrzcSLvces5o2oi+23v/iX5hW2Wuxuw2Tf6SxLemBtKUILkKrETkUcB52OIfYOk7Q/0Gpsy+0MIrVPb/eX7IAfhsrCyl8MgL1Db6bPr3YcnLXcKKxJD0sq2WlecOSO3J1bWzRIIIHYrSESoqS5IbQWW8vphCDSRDY/gza6sQ= template: metadata: creationTimestamp: null @@ -23,7 +23,7 @@ metadata: namespace: monitoring spec: encryptedData: - users: AgAC5DkymIjf7vuFltlHTopEDBGGDb/DfV8o9epUf9+kuS5H4n3jXD9DpLCBA/MQQnDZ1mLpj/4moETgaFTy+uP83RbzgiSq/VipF/+5JPM5SIBaRSPR/8fmEVnKg2X7Fuo4VPR3DpoA0qRP7ykrZB6datRW5mSCpxYi4oDcjSXmH0Rdd4Exen2t4lFYU0mf1TqrFl2X6S+sKzWUCdbeaLaF9Wp0u0IIEEvSnSCBjCJNSmE7D6TdLGNTfZL51iY3DgIRgD5brCcomte9U0ba5xW4pgHEEletab9CyZAgRxzUr55qpQDhSOXhgxqRJG/9U6HpZJp2ejk0HKjit0LOdM6LazdDZyU0wyc5Vj1iMp1L53rQ0dnFUMIME1R2lVzYPlO1VS3Su3fAh9kkFID9gbVYW0YNmsKUOtjPnKu35T34DmgLrj/C4lPgTtztVseTwtkWlTNaizSzkxTpKpDRdnVC1QFpzo1rYSEncsNL8oFggcJRyt8pUXrtHdhXxbAYdgmHuiFOrTTccKgocvdabRKJh4vfhW3Np3zt3kTw3m6O4Y0rQ8ea9me/ZNp4h6LwmktAd255tgtFAeMRyuFZSO8xH9IwCKDq4ozrpG9hjolCfhhukikPOWLXkfY9QO2lm0XyvCeZdamI1MR+AdiWeJ/jbVhtw3x2o/wr0Go6cDY7tmy1J9RDFS9ECnwprl5L3flLr16sBRU4krFNpoMp8eJjN8N8NcXEouaDicW2y0sH4BmbknXkCpnTKy8UuV4= + users: AgAoXKtSO3tVMNtgsMfVaaD9gWPDU5S5CvaELp84OqrjV5P4PHsv4En3/uAaXcB3jgZGYJIA3ST8xYQr6E5YCEY6JsgJMh+8Qd14xG9ig0zPuSI00O2H7S6mFfHNm5s78slM38Bj1eR7DvnHAnFy5G4WxUAFEaScAT+Eh3x9RpsjYvDLrSPFKzrDYeF1bmuKBOhh79AgOD/5sz2G7z0B+jBEjjj4KDE4gOWqt03I1xwFxeh7LZhHOtqqNGSKu8hKh2KF2ZmxAFcxdAKhLUfkE8GLDtmH/drtHiDijgRLuL8UekkgPFkMkN1ywPxHOKwoGgUerD123xYN4jOxx5Gl3HBobCpQz82HNFfiUIqlaFxOwg1tz1QpKG1puENtMCfTlQmyYOSSNJg9/DuooKSjWfIT1YunzSBWHMgOrcZtCvtNwecveBTlQszw41ypK5CfvunGoLdQe783uoFezjDWQ5Foxo0OCl54dQLme4MvgJGb9NZs0rfAoz06n4OZmt7sEgEJLj13NA6rDLLOWzoXoXUT9fdB14BfNxj4DqzeRRZgGN7xLzyqO+6DMsmQnV8NhUJKJV+7zxySZbdgIqXlK5cQbnMqtyi8E7ZLE65zg5yCjyL/fx7dNooBDdNS04Bg/H1XT2RPNdvtCgNVtBUP32O23mtdCX9li+HgxoDJqmUFKE95Hi3O/utadbnqXDpw7xihH8cLw3J7Lole9PJJ64caWsT29dr56rPo0LaXRTGHB7Cz9LfqC1ZTr2W1VNU= template: metadata: creationTimestamp: null diff --git a/tofu/adguard/main.tf b/tofu/adguard/main.tf index f084e93..c5410ef 100644 --- a/tofu/adguard/main.tf +++ b/tofu/adguard/main.tf @@ -65,3 +65,8 @@ resource "adguard_rewrite" "grafana_3" { domain = "grafana.fuku" answer = "192.168.1.33" } + +resource "adguard_rewrite" "feeds" { + domain = "feeds.roboces.dev" + answer = "192.168.1.12" +} \ No newline at end of file