From 7b5288519d0ab8abc0ccdf7a3018bab26447fbea Mon Sep 17 00:00:00 2001 From: Denis Patrakeev Date: Tue, 4 Mar 2025 11:49:15 +0300 Subject: [PATCH] [DO-1600] Fix name files and secret postgres_exporter (!80) [DO-1600] Co-authored-by: denis.patrakeev Reviewed-on: https://git.avroid.tech/K8s/k8s-configs/pulls/80 --- .../karma/argocd-apps-karma-app.yaml | 2 +- ...ues-ovveride.yaml => values-override.yaml} | 0 .../argocd-apps-trivy-operator-app.yaml | 2 +- ...ues-ovveride.yaml => values-override.yaml} | 0 .../security/trivy/argocd-apps-trivy-app.yaml | 2 +- ...ues-ovveride.yaml => values-override.yaml} | 0 .../argocd-apps-postgres-exporter-app.yaml | 2 +- ...ues-ovveride.yaml => values-override.yaml} | 41 +++++++++++-------- .../argocd-apps-redis-exporter-app.yaml | 2 +- ...ues-ovveride.yaml => values-override.yaml} | 0 10 files changed, 30 insertions(+), 21 deletions(-) rename clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/{values-ovveride.yaml => values-override.yaml} (100%) rename clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy-operator/{values-ovveride.yaml => values-override.yaml} (100%) rename clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy/{values-ovveride.yaml => values-override.yaml} (100%) rename clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/postgres-exporter/{values-ovveride.yaml => values-override.yaml} (59%) rename clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/redis-exporter/{values-ovveride.yaml => values-override.yaml} (100%) diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/argocd-apps-karma-app.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/argocd-apps-karma-app.yaml index 39bf995..9043edc 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/argocd-apps-karma-app.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/argocd-apps-karma-app.yaml @@ -20,7 +20,7 @@ spec: targetRevision: 2.9.3 helm: valueFiles: - - $values/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/values-ovveride.yaml + - $values/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/values-override.yaml syncPolicy: automated: prune: true diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/values-ovveride.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/values-override.yaml similarity index 100% rename from clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/values-ovveride.yaml rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/values-override.yaml diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy-operator/argocd-apps-trivy-operator-app.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy-operator/argocd-apps-trivy-operator-app.yaml index 541c63f..5e78b49 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy-operator/argocd-apps-trivy-operator-app.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy-operator/argocd-apps-trivy-operator-app.yaml @@ -20,7 +20,7 @@ spec: targetRevision: 0.26.0 helm: valueFiles: - - $values/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy-operator/values-ovveride.yaml + - $values/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy-operator/values-override.yaml syncPolicy: automated: prune: true diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy-operator/values-ovveride.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy-operator/values-override.yaml similarity index 100% rename from clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy-operator/values-ovveride.yaml rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy-operator/values-override.yaml diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy/argocd-apps-trivy-app.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy/argocd-apps-trivy-app.yaml index 6f4bc9a..a1bba35 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy/argocd-apps-trivy-app.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy/argocd-apps-trivy-app.yaml @@ -20,7 +20,7 @@ spec: targetRevision: 0.11.1 helm: valueFiles: - - $values/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy/values-ovveride.yaml + - $values/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy/values-override.yaml syncPolicy: automated: prune: true diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy/values-ovveride.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy/values-override.yaml similarity index 100% rename from clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy/values-ovveride.yaml rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/security/trivy/values-override.yaml diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/postgres-exporter/argocd-apps-postgres-exporter-app.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/postgres-exporter/argocd-apps-postgres-exporter-app.yaml index e8508f8..5d8cda7 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/postgres-exporter/argocd-apps-postgres-exporter-app.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/postgres-exporter/argocd-apps-postgres-exporter-app.yaml @@ -20,7 +20,7 @@ spec: targetRevision: 6.9.0 helm: valueFiles: - - $values/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/postgres-exporter/values-ovveride.yaml + - $values/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/postgres-exporter/values-override.yaml syncPolicy: automated: prune: true diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/postgres-exporter/values-ovveride.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/postgres-exporter/values-override.yaml similarity index 59% rename from clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/postgres-exporter/values-ovveride.yaml rename to clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/postgres-exporter/values-override.yaml index fa3aa42..bd4de41 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/postgres-exporter/values-ovveride.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/postgres-exporter/values-override.yaml @@ -21,6 +21,31 @@ serviceAccount: # If not set and create is true, a name is generated using the fullname template name: vault +config: + ## The datasource properties on config are passed through helm tpl function. + ## ref: https://helm.sh/docs/developing_charts/#using-the-tpl-function + datasource: + # Specify userFile if DB username is stored in a file. + # For example, to use with vault-injector from Hashicorp + userSecret: + name: postgres-exporter-config + key: username + # Only one of password, passwordFile, passwordSecret and pgpassfile can be specified + passwordSecret: + name: postgres-exporter-config + key: password + + # postgres_exporter.yml + postgresExporter: + auth_modules: + pg_monitoring: + type: userpass + userpass: + username: $DATA_SOURCE_USER + password: $DATA_SOURCE_PASS + options: + sslmode: disable + nodeSelector: node-role.kubernetes.io/worker: "" @@ -37,19 +62,3 @@ deployment: vault.security.banzaicloud.io/vault-role: "cloud-prod" vault.security.banzaicloud.io/vault-skip-verify: "false" vault.security.banzaicloud.io/vault-path: "avroid-office" - -# Additional volumes, e. g. for secrets used in an extraContainer -extraVolumes: - - name: postgres-exporter-config - secret: - defaultMode: 420 - items: - - key: postgres_exporter.yml - path: postgres_exporter.yml - secretName: postgres-exporter-secret - -# Additional volume mounts -extraVolumeMounts: - - name: postgres-exporter-config - mountPath: /etc/postgres_exporter.yml - subPath: postgres_exporter.yml diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/redis-exporter/argocd-apps-redis-exporter-app.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/redis-exporter/argocd-apps-redis-exporter-app.yaml index 8251099..82d7be5 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/redis-exporter/argocd-apps-redis-exporter-app.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/redis-exporter/argocd-apps-redis-exporter-app.yaml @@ -20,7 +20,7 @@ spec: targetRevision: 6.9.0 helm: valueFiles: - - $values/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/redis-exporter/values-ovveride.yaml + - $values/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/redis-exporter/values-override.yaml syncPolicy: automated: prune: true diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/redis-exporter/values-ovveride.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/redis-exporter/values-override.yaml similarity index 100% rename from clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/redis-exporter/values-ovveride.yaml rename to clusters/k8s-avroid-office.prod.local/namespaces/cloud-prod/monitoring/redis-exporter/values-override.yaml