Update env var production - staging

osmus · Jun 17, 2024 · 712c1a4 · 712c1a4
1 parent aba34a9
commit 712c1a4
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 35 deletions.
diff --git a/.github/workflows/chartpress.yaml b/.github/workflows/chartpress.yaml
@@ -37,14 +37,17 @@ jobs:
           _input-file: 'values.staging.template.yaml'
           _format-key: '{{key}}'
           _output-file: 'values.staging.yaml'
-          POSTGRES_DB: ${{ secrets.STAGING_POSTGRES_DB }}
-          POSTGRES_USER: ${{ secrets.STAGING_POSTGRES_USER }}
+          # Dashboard
           POSTGRES_PASSWORD: ${{ secrets.STAGING_POSTGRES_PASSWORD }}
           OSM_CLIENT_ID: ${{ secrets.STAGING_OSM_CLIENT_ID }}
           OSM_CLIENT_SECRET: ${{ secrets.STAGING_OSM_CLIENT_SECRET }}
-          SANDBOX_PG_DB_USER: ${{ secrets.STAGING_SANDBOX_PG_DB_USER }}
+          # Sandbox
           SANDBOX_PG_DB_PASSWORD: ${{ secrets.STAGING_SANDBOX_PG_DB_PASSWORD }}
           SANDBOX_PG_DB_NAME: ${{ secrets.STAGING_SANDBOX_PG_DB_NAME }}
+          SANDBOX_OSM_id_key: ${{ secrets.STAGING_SANDBOX_OSM_ID_KEY }}
+          SANDBOX_OAUTH_CLIENT_ID: ${{ secrets.STAGING_SANDBOX_OAUTH_CLIENT_ID }}
+          SANDBOX_OAUTH_KEY: ${{ secrets.STAGING_SANDBOX_OAUTH_KEY }}
+          # Cluster
           AWS_REGION: ${{ secrets.AWS_REGION }}
           EKS_CLUSTER: ${{ secrets.EKS_CLUSTER }}
       - name: Production - substitute secrets
@@ -54,16 +57,21 @@ jobs:
           _input-file: 'values.production.template.yaml'
           _format-key: '{{key}}'
           _output-file: 'values.production.yaml'
-          POSTGRES_DB: ${{ secrets.PRODUCTION_POSTGRES_DB }}
-          POSTGRES_USER: ${{ secrets.PRODUCTION_POSTGRES_USER }}
+          # Dashboard
           POSTGRES_PASSWORD: ${{ secrets.PRODUCTION_POSTGRES_PASSWORD }}
           OSM_CLIENT_ID: ${{ secrets.PRODUCTION_OSM_CLIENT_ID }}
           OSM_CLIENT_SECRET: ${{ secrets.PRODUCTION_OSM_CLIENT_SECRET }}
+          # Sandbox
           SANDBOX_PG_DB_USER: ${{ secrets.PRODUCTION_SANDBOX_PG_DB_USER }}
           SANDBOX_PG_DB_PASSWORD: ${{ secrets.PRODUCTION_SANDBOX_PG_DB_PASSWORD }}
           SANDBOX_PG_DB_NAME: ${{ secrets.PRODUCTION_SANDBOX_PG_DB_NAME }}
+          SANDBOX_OSM_id_key: ${{ secrets.PRODUCTION_SANDBOX_OSM_ID_KEY }}
+          SANDBOX_OAUTH_CLIENT_ID: ${{ secrets.PRODUCTION_SANDBOX_OAUTH_CLIENT_ID }}
+          SANDBOX_OAUTH_KEY: ${{ secrets.PRODUCTION_SANDBOX_OAUTH_KEY }}
+          # Cluster
           AWS_REGION: ${{ secrets.AWS_REGION }}
           EKS_CLUSTER: ${{ secrets.EKS_CLUSTER }}
+
       - name: AWS Credentials
         if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main'
         uses: aws-actions/configure-aws-credentials@v1

diff --git a/dashboard-charts/templates/dashboard/configMap.yaml b/dashboard-charts/templates/dashboard/configMap.yaml
@@ -4,29 +4,40 @@ kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-dashboard-common-env
 data:
+    ENVIRONMENT: {{ .Values.dashboard.env.ENVIRONMENT | quote }}
+
+    # Dashboard
     OSM_CLIENT_ID: {{ .Values.dashboard.env.OSM_CLIENT_ID | quote }}
     OSM_CLIENT_SECRET: {{ .Values.dashboard.env.OSM_CLIENT_SECRET | quote }}
     REDIRECT_URI: {{ .Values.dashboard.env.REDIRECT_URI | quote }}
     OSM_INSTANCE_URL: {{ .Values.dashboard.env.OSM_INSTANCE_URL | quote }}
     OSM_INSTANCE_SCOPES: {{ .Values.dashboard.env.OSM_INSTANCE_SCOPES | quote }}
-    ENVIRONMENT: {{ .Values.dashboard.env.ENVIRONMENT | quote }}
 
-    # postgres credentials
+    # Dashboard Db Postgres credentials
     DB_PORT: "5432"
     POSTGRES_HOST: {{ .Release.Name }}-dashboard-db
     POSTGRES_USER: {{ .Values.db.env.POSTGRES_USER | quote }}
     POSTGRES_PASSWORD: {{ .Values.db.env.POSTGRES_PASSWORD | quote }}
     POSTGRES_DB: {{ .Values.db.env.POSTGRES_DB | quote }}
 
+    # Domian e.g boxes.osmsandbox.us
+    SANDBOX_DOMAIN: {{ .Values.dashboard.env.SANDBOX_DOMAIN | quote }}
+
     # Sandbox credentials
-    DB_PORT: "5432"
     SANDBOX_PG_DB_PORT: {{ .Values.dashboard.env.SANDBOX_PG_DB_PORT | quote }}
     SANDBOX_PG_DB_USER: {{ .Values.dashboard.env.SANDBOX_PG_DB_USER | quote }}
     SANDBOX_PG_DB_PASSWORD: {{ .Values.dashboard.env.SANDBOX_PG_DB_PASSWORD | quote }}
     SANDBOX_PG_DB_NAME: {{ .Values.dashboard.env.SANDBOX_PG_DB_NAME | quote }}
     OSM_SANDBOX_CHART: {{ .Values.dashboard.env.OSM_SANDBOX_CHART | quote }}
-
-    # Domian
-    SANDBOX_DOMAIN: {{ .Values.dashboard.env.SANDBOX_DOMAIN | quote }}
-
+    SANDBOX_MAILER_ADDRESS: {{ .Values.dashboard.env.SANDBOX_MAILER_ADDRESS | quote }}
+    SANDBOX_MAILER_DOMAIN: {{ .Values.dashboard.env.SANDBOX_MAILER_DOMAIN | quote }}
+    SANDBOX_MAILER_USERNAME: {{ .Values.dashboard.env.SANDBOX_MAILER_USERNAME | quote }}
+    SANDBOX_MAILER_PASSWORD: {{ .Values.dashboard.env.SANDBOX_MAILER_PASSWORD | quote }}
+    SANDBOX_OSM_id_key: {{ .Values.dashboard.env.SANDBOX_OSM_id_key | quote }}
+    SANDBOX_OAUTH_CLIENT_ID: {{ .Values.dashboard.env.SANDBOX_OAUTH_CLIENT_ID | quote }}
+    SANDBOX_OAUTH_KEY: {{ .Values.dashboard.env.SANDBOX_OAUTH_KEY | quote }}
+    SANDBOX_MAILER_FROM: {{ .Values.dashboard.env.SANDBOX_MAILER_FROM | quote }}
+    SANDBOX_ORGANIZATION_NAME: {{ .Values.dashboard.env.SANDBOX_ORGANIZATION_NAME | quote }}
+    SANDBOX_WEBSITE_STATUS: {{ .Values.dashboard.env.SANDBOX_WEBSITE_STATUS | quote }}
+    SANDBOX_BACKUP_FILE_URL: {{ .Values.dashboard.env.SANDBOX_BACKUP_FILE_URL | quote }}
 {{- end }}
diff --git a/values.production.template.yaml b/values.production.template.yaml
@@ -12,8 +12,8 @@ db:
     label_key: nodegroup_type
     label_value: dashboard-node
   env:
-    POSTGRES_DB: {{POSTGRES_DB}}
-    POSTGRES_USER: {{POSTGRES_USER}}
+    POSTGRES_DB: db_dashboard
+    POSTGRES_USER: postgres
     POSTGRES_PASSWORD: {{POSTGRES_PASSWORD}}
   persistenceDisk:
     enabled: false
@@ -35,20 +35,41 @@ dashboard:
   enabled: true
   ingressDomain: dashboard.osmsandbox.us
   env:
+    ENVIRONMENT: production
+    ##### Dashboard
     OSM_CLIENT_ID: {{OSM_CLIENT_ID}}
     OSM_CLIENT_SECRET: {{OSM_CLIENT_SECRET}}
-    REDIRECT_URI: 'https://dashboard.osmsandbox.us/redirect_sandbox'
-    OSM_INSTANCE_URL: 'https://www.openstreetmap.org'
-    OSM_INSTANCE_SCOPES: 'read_prefs'
+    REDIRECT_URI: "https://dashboard.osmsandbox.us/redirect_sandbox"
+    OSM_INSTANCE_URL: "https://www.openstreetmap.org"
+    OSM_INSTANCE_SCOPES: "read_prefs"
+
+    #################### Sandbox env vars ####################
     OSM_SANDBOX_CHART: https://osmus.github.io/osm-sandbox-deploy/osm-sandbox-deploy-0.0.1-0.dev.git.17.hed91bc0.tgz
-    # PG data
+
+    ##### Sandbox Database env vars
     SANDBOX_PG_DB_PORT: "5432"
-    SANDBOX_PG_DB_USER: {{SANDBOX_PG_DB_USER}}
+    SANDBOX_PG_DB_USER: postgres
     SANDBOX_PG_DB_PASSWORD: {{SANDBOX_PG_DB_PASSWORD}}
     SANDBOX_PG_DB_NAME: {{SANDBOX_PG_DB_NAME}}
-    ENVIRONMENT: 'dev'
-    # Main domain
-    SANDBOX_DOMAIN: 'boxes.osmsandbox.us'
+
+    ##### Sandbox Api env vars
+    SANDBOX_DOMAIN: "boxes.osmsandbox.us"
+    SANDBOX_MAILER_ADDRESS: "none"
+    SANDBOX_MAILER_DOMAIN: osmsandbox.us
+    SANDBOX_MAILER_USERNAME: "none"
+    SANDBOX_MAILER_PASSWORD: "none"
+    SANDBOX_OSM_id_key: {{SANDBOX_OSM_id_key}}
+    SANDBOX_OAUTH_CLIENT_ID: {{SANDBOX_OAUTH_CLIENT_ID}}
+    SANDBOX_OAUTH_KEY: {{SANDBOX_OAUTH_KEY}}
+    SANDBOX_MAILER_FROM: osm-sandbox-admins@googlegroups.com
+    SANDBOX_NOMINATIM_URL: "none"
+    SANDBOX_OVERPASS_URL: "none"
+    SANDBOX_NEW_RELIC_LICENSE_KEY: "none"
+    SANDBOX_NEW_RELIC_APP_NAME: "none"
+    SANDBOX_ORGANIZATION_NAME: OpenStreetMap-Sandbox
+    SANDBOX_WEBSITE_STATUS: "online"
+    SANDBOX_BACKUP_FILE_URL: {{SANDBOX_BACKUP_FILE_URL}}
+
   resources:
     enabled: false
     requests:

diff --git a/values.staging.template.yaml b/values.staging.template.yaml
@@ -1,6 +1,6 @@
 environment: dashboard
 serviceType: ClusterIP
-createClusterIssuer: false
+createClusterIssuer: true
 adminEmail: admin@osmsandbox.us
 db:
   enabled: true
@@ -12,8 +12,8 @@ db:
     label_key: nodegroup_type
     label_value: dashboard-node
   env:
-    POSTGRES_DB: {{POSTGRES_DB}}
-    POSTGRES_USER: {{POSTGRES_USER}}
+    POSTGRES_DB: db_dashboard
+    POSTGRES_USER: postgres
     POSTGRES_PASSWORD: {{POSTGRES_PASSWORD}}
   persistenceDisk:
     enabled: false
@@ -31,25 +31,45 @@ db:
       memory: "10Gi"
       cpu: "5"
   sharedMemorySize: 16Mi
-  # livenessProbeExec: true
 dashboard:
   enabled: true
-  ingressDomain: dashboard.staging.osmsandbox.us
+  ingressDomain: staging.dashboard.osmsandbox.us
   env:
+    ENVIRONMENT: staging
+    ##### Dashboard
     OSM_CLIENT_ID: {{OSM_CLIENT_ID}}
     OSM_CLIENT_SECRET: {{OSM_CLIENT_SECRET}}
-    REDIRECT_URI: 'https://dashboard.staging.osmsandbox.us/redirect_sandbox'
-    OSM_INSTANCE_URL: 'https://www.openstreetmap.org'
-    OSM_INSTANCE_SCOPES: 'read_prefs'
+    REDIRECT_URI: "https://staging.dashboard.osmsandbox.us/redirect_sandbox"
+    OSM_INSTANCE_URL: "https://www.openstreetmap.org"
+    OSM_INSTANCE_SCOPES: "read_prefs"
+
+    #################### Sandbox env vars ####################
     OSM_SANDBOX_CHART: https://osmus.github.io/osm-sandbox-deploy/osm-sandbox-deploy-0.0.1-0.dev.git.17.hed91bc0.tgz
-    # PG data
+
+    ##### Sandbox Database env vars
     SANDBOX_PG_DB_PORT: "5432"
-    SANDBOX_PG_DB_USER: {{SANDBOX_PG_DB_USER}}
+    SANDBOX_PG_DB_USER: postgres
     SANDBOX_PG_DB_PASSWORD: {{SANDBOX_PG_DB_PASSWORD}}
     SANDBOX_PG_DB_NAME: {{SANDBOX_PG_DB_NAME}}
-    ENVIRONMENT: 'dev'
-    # Main domain
-    SANDBOX_DOMAIN: 'boxes.staging.osmsandbox.us'
+
+    ##### Sandbox Api env vars
+    SANDBOX_DOMAIN: "staging.boxes.osmsandbox.us"
+    SANDBOX_MAILER_ADDRESS: "none"
+    SANDBOX_MAILER_DOMAIN: staging.osmsandbox.us
+    SANDBOX_MAILER_USERNAME: "none"
+    SANDBOX_MAILER_PASSWORD: "none"
+    SANDBOX_OSM_id_key: {{SANDBOX_OSM_id_key}}
+    SANDBOX_OAUTH_CLIENT_ID: {{SANDBOX_OAUTH_CLIENT_ID}}
+    SANDBOX_OAUTH_KEY: {{SANDBOX_OAUTH_KEY}}
+    SANDBOX_MAILER_FROM: osm-sandbox-admins@googlegroups.com
+    SANDBOX_NOMINATIM_URL: "none"
+    SANDBOX_OVERPASS_URL: "none"
+    SANDBOX_NEW_RELIC_LICENSE_KEY: "none"
+    SANDBOX_NEW_RELIC_APP_NAME: "none"
+    SANDBOX_ORGANIZATION_NAME: OpenStreetMap-Sandbox
+    SANDBOX_WEBSITE_STATUS: "online"
+    SANDBOX_BACKUP_FILE_URL: {{SANDBOX_BACKUP_FILE_URL}}
+
   resources:
     enabled: false
     requests: