Update env var for tm staging

images/tasking-manager-api/Dockerfile

@@ -30,4 +30,5 @@ RUN pip install --upgrade markdown
 ## INITIALIZATION
 EXPOSE 5000
 CMD ["gunicorn", "-b", "0.0.0.0:5000", "--worker-class", "gevent", "--workers", "3", \
-    "--threads", "3", "--timeout", "179", "manage:application", "&"]
+    "--threads", "3", "--timeout", "179", "manage:application", "&"]
+

values.staging.template.yaml

@@ -643,8 +643,8 @@ osm-seed:
         accessMode: ReadWriteOnce
         mountPath: /var/lib/postgresql/data
         subPath: postgresql-d
-        AWS_ElasticBlockStore_volumeID: vol-077f1a9f62a1951e8
-        AWS_ElasticBlockStore_size: 20Gi
+        AWS_ElasticBlockStore_volumeID: vol-05a364a565aea360c
+        AWS_ElasticBlockStore_size: 50Gi
       resources:
         enabled: false
         requests:
@@ -664,48 +664,47 @@ osm-seed:
         label_key: nodegroup_type
         label_value: web
       replicaCount: 1
+      staticIp: c
       serviceAnnotations:
-        service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: '300'
+        service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300"
       ingressDomain: tm-api.staging.openhistoricalmap.org
       env:
-        TM_ORG_NAME: OpenHistoricalMap
-        TM_ORG_CODE: OHM
-        TM_ORG_URL: staging.openhistoricalmap.org
-        TM_ORG_PRIVACY_POLICY_URL: staging.openhistoricalmap.org/copyright
-        TM_ORG_GITHUB: github.com/openhistoricalmap
-        OSM_SERVER_URL: https://staging.openhistoricalmap.org
-        OSM_NOMINATIM_SERVER_URL: https://nominatim-api.openhistoricalmap.org
-        OSM_REGISTER_URL: https://staging.openhistoricalmap.org/user/new
-        ID_EDITOR_URL: https://staging.openhistoricalmap.org/edit?editor=id
-        POTLATCH2_EDITOR_URL: https://staging.openhistoricalmap.org/edit?editor=potlatch2
+        POSTGRES_HOST: {{STAGING_TM_API_DB_HOST}}
+        POSTGRES_DB: {{STAGING_TM_API_DB}}
+        POSTGRES_PASSWORD: {{STAGING_TM_API_DB_PASSWORD}}
+        POSTGRES_USER: {{STAGING_TM_API_DB_USER}}
+        POSTGRES_PORT: 5432
+        TM_ORG_NAME: 'OpenHistoricalMap'
+        TM_ORG_CODE: 'OHM'
+        TM_ORG_URL: 'openhistoricalmap.org'
+        TM_ORG_PRIVACY_POLICY_URL: 'staging.openhistoricalmap.org/copyright'
+        TM_ORG_GITHUB: 'github.com/openhistoricalmap'
+        OSM_SERVER_URL: 'https://staging.openhistoricalmap.org'
+        OSM_NOMINATIM_SERVER_URL: 'https://nominatim-api.staging.openhistoricalmap.org'
+        OSM_REGISTER_URL: 'https://staging.openhistoricalmap.org/user/new'
+        ID_EDITOR_URL: 'https://staging.openhistoricalmap.org/edit?editor=id'
+        POTLATCH2_EDITOR_URL: 'https://staging.openhistoricalmap.org/edit?editor=potlatch2'
         TM_SECRET: {{STAGING_TM_API_SECRET}}
-        TM_CONSUMER_KEY: CGWeUmRTFb6o0OQy4AyXb8bnl5fuSdCPODknveW7
-        TM_CONSUMER_SECRET: lIVcx44V97QqgTSbXeJw5EKAdIBZrJ2N5negJsF4
-        TM_EMAIL_FROM_ADDRESS: [email protected]
-        TM_EMAIL_CONTACT_ADDRESS: [email protected]
-        TM_SMTP_HOST: email-smtp.us-east-1.amazonaws.com
+        TM_CONSUMER_KEY: {{STAGING_TM_API_CONSUMER_KEY}}
+        TM_CONSUMER_SECRET: {{STAGING_TM_API_CONSUMER_SECRET}}
+        TM_EMAIL_FROM_ADDRESS: '[email protected]'
+        TM_SMTP_HOST: 'email-smtp.us-east-1.amazonaws.com'
         TM_SMTP_PORT: 25
         TM_SMTP_USER: {{MAILER_USERNAME}}
         TM_SMTP_PASSWORD: {{MAILER_PASSWORD}}
-        TM_DEFAULT_LOCALE: en
-        TM_APP_API_URL: https://tm-api.staging.openhistoricalmap.org
-        TM_APP_BASE_URL: https://tasks-staging.openhistoricalmap.org
+        TM_DEFAULT_LOCALE: 'en'
+        TM_APP_API_URL: 'https://tm-api.staging.openhistoricalmap.org'
+        TM_APP_BASE_URL: 'https://tasks.staging.openhistoricalmap.org'
         TM_IMPORT_MAX_FILESIZE: 3000000
         TM_MAX_AOI_AREA: 15000
-        # TM_CLIENT_ID: {{STAGING_TM_CLIENT_ID}}
-        # TM_CLIENT_SECRET: {{STAGING_TM_CLIENT_SECRET}}
-        # TM_DEFAULT_CHANGESET_COMMENT: staging
-        # TM_REDIRECT_URI: https://tm-api.staging.openhistoricalmap.org/authorized
-        # TM_SCOPE: 'read_prefs write_api'
-        # TM_APP_API_VERSION: v4
       resources:
         enabled: false
         requests:
-          memory: 1Gi
-          cpu: '2'
+          memory: "1Gi"
+          cpu: "2"
         limits:
-          memory: 2Gi
-          cpu: '2'
+          memory: "2Gi"
+          cpu: "2"
 
   # ====================================================================================================
   # Variables for nominatim api