From 2ceae2d60c16f689d6c993538940229271b8c8d5 Mon Sep 17 00:00:00 2001 From: james-otten Date: Fri, 27 Sep 2024 23:50:39 -0400 Subject: [PATCH 1/2] add vars --- .github/workflows/deploy-to-k8s.yaml | 2 ++ infra/helm/meshdb/templates/meshweb.yaml | 10 ++++++++++ infra/helm/meshdb/templates/secrets.yaml | 2 ++ 3 files changed, 14 insertions(+) diff --git a/.github/workflows/deploy-to-k8s.yaml b/.github/workflows/deploy-to-k8s.yaml index 23ecd593..33cded65 100644 --- a/.github/workflows/deploy-to-k8s.yaml +++ b/.github/workflows/deploy-to-k8s.yaml @@ -69,6 +69,8 @@ jobs: --set meshweb.forms_url="${{ vars.FORMS_URL }}" \ --set meshdb.site_base_url="${{ vars.SITE_BASE_URL }}" \ --set meshweb.slack_webhook="${{ secrets.SLACK_ADMIN_NOTIFICATIONS_WEBHOOK_URL }}" \ + --set meshweb.slack_join_webhook="${{ secrets.SLACK_JOIN_REQUESTS_CHANNEL_WEBHOOK_URL }}" \ + --set meshweb.osticket_api_token="${{ secrets.OSTICKET_API_TOKEN }}" \ --set meshweb.environment="${{ inputs.environment }}" \ --set ingress.hosts[0].host="${{ vars.INGRESS_HOST }}",ingress.hosts[0].paths[0].path=/,ingress.hosts[0].paths[0].pathType=Prefix \ --set ingress.hosts[1].host="${{ vars.INGRESS_HOST_LEGACY }}",ingress.hosts[1].paths[0].path=/,ingress.hosts[1].paths[0].pathType=Prefix diff --git a/infra/helm/meshdb/templates/meshweb.yaml b/infra/helm/meshdb/templates/meshweb.yaml index 8a3c1174..20171d4b 100644 --- a/infra/helm/meshdb/templates/meshweb.yaml +++ b/infra/helm/meshdb/templates/meshweb.yaml @@ -95,6 +95,16 @@ spec: secretKeyRef: name: meshdb-secrets key: slack-webhook + - name: SLACK_JOIN_REQUESTS_CHANNEL_WEBHOOK_URL + valueFrom: + secretKeyRef: + name: meshdb-secrets + key: slack-join-webhook + - name: OSTICKET_API_TOKEN + valueFrom: + secretKeyRef: + name: meshdb-secrets + key: osticket-api-token volumeMounts: - name: static-content-vol mountPath: /opt/meshdb/static diff --git a/infra/helm/meshdb/templates/secrets.yaml b/infra/helm/meshdb/templates/secrets.yaml index 30f88b6b..3b51d6cd 100644 --- a/infra/helm/meshdb/templates/secrets.yaml +++ b/infra/helm/meshdb/templates/secrets.yaml @@ -16,3 +16,5 @@ data: uisp-pass: {{ .Values.uisp.psk | b64enc | quote }} pano-github-token: {{ .Values.meshweb.pano_github_token | b64enc | quote }} slack-webhook: {{ .Values.meshweb.slack_webhook | b64enc | quote }} + slack-join-webhook: {{ .Values.meshweb.slack_join_webhook | b64enc | quote }} + osticket-api-token: {{ .Values.meshweb.osticket_api_token | b64enc | quote }} From a80efda7e0e64c3c8c21269bf66f0cc9e3b3d57b Mon Sep 17 00:00:00 2001 From: Andrew Dickinson Date: Sun, 6 Oct 2024 11:55:33 -0400 Subject: [PATCH 2/2] Add new ticket endpoint variable --- .github/workflows/deploy-to-k8s.yaml | 1 + infra/helm/meshdb/templates/configmap.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/workflows/deploy-to-k8s.yaml b/.github/workflows/deploy-to-k8s.yaml index 33cded65..591e6305 100644 --- a/.github/workflows/deploy-to-k8s.yaml +++ b/.github/workflows/deploy-to-k8s.yaml @@ -71,6 +71,7 @@ jobs: --set meshweb.slack_webhook="${{ secrets.SLACK_ADMIN_NOTIFICATIONS_WEBHOOK_URL }}" \ --set meshweb.slack_join_webhook="${{ secrets.SLACK_JOIN_REQUESTS_CHANNEL_WEBHOOK_URL }}" \ --set meshweb.osticket_api_token="${{ secrets.OSTICKET_API_TOKEN }}" \ + --set meshweb.osticket_new_ticket_endpoint="${{ vars.OSTICKET_NEW_TICKET_ENDPOINT }}" \ --set meshweb.environment="${{ inputs.environment }}" \ --set ingress.hosts[0].host="${{ vars.INGRESS_HOST }}",ingress.hosts[0].paths[0].path=/,ingress.hosts[0].paths[0].pathType=Prefix \ --set ingress.hosts[1].host="${{ vars.INGRESS_HOST_LEGACY }}",ingress.hosts[1].paths[0].path=/,ingress.hosts[1].paths[0].pathType=Prefix diff --git a/infra/helm/meshdb/templates/configmap.yaml b/infra/helm/meshdb/templates/configmap.yaml index f565986a..b42f4cb7 100644 --- a/infra/helm/meshdb/templates/configmap.yaml +++ b/infra/helm/meshdb/templates/configmap.yaml @@ -37,3 +37,5 @@ data: FORMS_URL: {{ .Values.meshweb.forms_url | quote }} SITE_BASE_URL: {{ .Values.meshdb.site_base_url | quote }} + + OSTICKET_NEW_TICKET_ENDPOINT: {{ .Values.meshweb.osticket_new_ticket_endpoint | quote }} \ No newline at end of file