diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 52e4552..094d5cb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -100,6 +100,7 @@ jobs: kubectl create secret generic grafana-oauth-secret \ -n monitoring \ --from-literal=GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET="${{ secrets.GRAFANA_CLIENT_SECRET }}" \ + --from-literal=GF_SECURITY_SECRET_KEY="${{ secrets.GRAFANA_SECRET_KEY }}" \ --dry-run=client -o yaml | kubectl apply -f - - name: Create oauth2-proxy secrets diff --git a/helm/monitoring/oauth2-proxy-alertmanager.yaml b/helm/monitoring/oauth2-proxy-alertmanager.yaml index 9aaba6a..36f730f 100644 --- a/helm/monitoring/oauth2-proxy-alertmanager.yaml +++ b/helm/monitoring/oauth2-proxy-alertmanager.yaml @@ -1,3 +1,8 @@ +hostAliases: +- ip: "13.140.150.2" + hostnames: + - "keycloak.13.140.150.2.nip.io" + config: existingSecret: oauth2-proxy-alertmanager cookie_secure: false diff --git a/helm/monitoring/oauth2-proxy-prometheus.yaml b/helm/monitoring/oauth2-proxy-prometheus.yaml index 52e9314..45c58ea 100644 --- a/helm/monitoring/oauth2-proxy-prometheus.yaml +++ b/helm/monitoring/oauth2-proxy-prometheus.yaml @@ -1,3 +1,8 @@ +hostAliases: +- ip: "13.140.150.2" + hostnames: + - "keycloak.13.140.150.2.nip.io" + config: existingSecret: oauth2-proxy-prometheus cookie_secure: false diff --git a/helm/monitoring/values.yaml b/helm/monitoring/values.yaml index a26011b..aeeaf6f 100644 --- a/helm/monitoring/values.yaml +++ b/helm/monitoring/values.yaml @@ -17,7 +17,7 @@ grafana: root_url: http://grafana.13.140.150.2.nip.io security: - secret_key: a8f3d2e1c4b7f6a9e2d5c8b1f4a7e0d3 + secret_key: $__file{/etc/secrets/GF_SECURITY_SECRET_KEY} auth: disable_login_form: true