Add initial changes to add postgres to production site

.gitlab-ci.yml

@@ -3,7 +3,7 @@ stages:
   - build prereqs
   - test
   - create storage
-  - deploy rabbit
+  - deploy infrastructure
   - deploy GRB
   - deploy G2G
   - deploy tile gen

admin/kubekorner_geosphere_prometheus_rules.yaml

@@ -220,14 +220,14 @@ spec:
           summary: "Host unusual disk read rate (instance {{ $labels.instance }})"
           description: "Disk is probably reading too much data (> 150 MB/s)\n  VALUE = {{ $value }}\n  LABELS: {{ $labels }}"
       - alert: HostUnusualDiskWriteRate
-        expr: sum by (instance) (irate(node_disk_written_bytes_total[5m])) / 1024 / 1024 > 150
+        expr: sum by (instance) (irate(node_disk_written_bytes_total[5m])) / 1024 / 1024 > 300
         for: 5m
         labels:
           severity: warning
           ruleGroup: geosphere-node
         annotations:
           summary: "Host unusual disk write rate (instance {{ $labels.instance }})"
-          description: "Disk is probably writing too much data (> 150 MB/s)\n  VALUE = {{ $value }}\n  LABELS: {{ $labels }}"
+          description: "Disk is probably writing too much data (> 300 MB/s)\n  VALUE = {{ $value }}\n  LABELS: {{ $labels }}"
       - alert: HostOutOfDiskSpace
         expr: (node_filesystem_avail_bytes{mountpoint="/"}  * 100) / node_filesystem_size_bytes{mountpoint="/"} < 10
         for: 5m

ci_gcp/gitlab-ci.yaml

@@ -84,7 +84,7 @@ gcp deploy rabbit:
     name: geosphere
     url: http://geosphere.ssec.wisc.edu
   extends: .helm_based_job
-  stage: deploy rabbit
+  stage: deploy infrastructure
   script:
     - ./helpers/deploy_rabbitmq.sh ci_geosphere
   # this job doesn't actually need any artifacts from previous jobs

ci_geosphere-test/gitlab-ci.yaml

@@ -37,7 +37,7 @@ gstest deploy rabbit:
     name: geosphere-test
     url: http://geosphere-test.ssec.wisc.edu
   extends: .helm_based_job
-  stage: deploy rabbit
+  stage: deploy infrastructure
   script:
     - ./helpers/deploy_rabbitmq.sh ci_geosphere-test
   # this job doesn't actually need any artifacts from previous jobs

ci_geosphere-test/values-mapcache.yaml

@@ -13,6 +13,12 @@ cache:
     cleanup:
       # every 6 hours
       schedule: "0 */6 * * *"
+database:
+  postgresHost: "geosphere-postgis-postgresql"
+  postgresPort: 5432
+  postgresDatabaseName: "postgres"
+  postgresUser: "postgres"
+  postgresPasswordSecret: "geosphere-postgis-postgresql-production"
 seed:
   images: false
   overlays: false

ci_geosphere/gitlab-ci.yaml

@@ -12,10 +12,20 @@ gs create geotiff storage:
   stage: create storage
   script:
     - ns=$(./helpers/get_namespace.sh)
-    # copy secret kubeconfig to the mounted (pwd) directory
-    - cp $kubekorner_k3s_config .
-    - kubeconfig=$(basename $kubekorner_k3s_config)
-    - ./helpers/create_pvc.sh "$ns" "ci_geosphere/geotiff-pvc.yaml" "cspp-geo-geo2grid" "$kubeconfig"
+    - ./helpers/create_pvc.sh "$ns" "ci_geosphere/geotiff-pvc.yaml" "cspp-geo-geo2grid"
+  # this job doesn't actually need any artifacts from previous jobs
+  dependencies: []
+  rules:
+    - if: $CI_COMMIT_TAG !~ /^r[0-9]+_[0-9]+/
+      when: never
+    - if: $CREATE_STORAGE
+
+gs create postgres storage:
+  extends: .helm_based_job
+  stage: create storage
+  script:
+    - ns=$(./helpers/get_namespace.sh)
+    - ./helpers/create_pvc.sh "$ns" "ci_geosphere/postgres-pvc.yaml" "geosphere-postgis"
   # this job doesn't actually need any artifacts from previous jobs
   dependencies: []
   rules:
@@ -28,10 +38,7 @@ gs create shapefile storage:
   stage: create storage
   script:
     - ns=$(./helpers/get_namespace.sh)
-    # copy secret kubeconfig to the mounted (pwd) directory
-    - cp $kubekorner_k3s_config .
-    - kubeconfig=$(basename $kubekorner_k3s_config)
-    - ./helpers/create_pvc.sh "$ns" "ci_geosphere/shapefiles-pvc.yaml" "geosphere-tile-gen-shapefiles" "$kubeconfig"
+    - ./helpers/create_pvc.sh "$ns" "ci_geosphere/shapefiles-pvc.yaml" "geosphere-tile-gen-shapefiles"
   # this job doesn't actually need any artifacts from previous jobs
   dependencies: []
   rules:
@@ -47,13 +54,11 @@ gs deploy rabbit:
     name: geosphere
     url: http://geosphere.ssec.wisc.edu
   extends: .helm_based_job
-  stage: deploy rabbit
+  stage: deploy infrastructure
   script:
     - ./helpers/deploy_rabbitmq.sh ci_geosphere
-    - cp ${kubekorner_k3s_config} .
-    - kubeconfig=$(basename ${kubekorner_k3s_config})
     - |-
-      kubectl get secret --kubeconfig "${kubeconfig}" geosphere-rabbit-rabbitmq --namespace=geosphere -oyaml | grep -v '^\s*namespace:\s' | grep -v "[Hh]elm" | grep -v "[tT]ime" | grep -v "selfLink" | grep -v "uid" | grep -v "resourceVersion" | sed 's/ name: .*/ name: geosphere-rabbit-rabbitmq-production/' | kubectl apply --kubeconfig "${kubeconfig}" --namespace=geosphere-test -f -
+      kubectl get secret geosphere-rabbit-rabbitmq --namespace=geosphere -oyaml | grep -v '^\s*namespace:\s' | grep -v "[Hh]elm" | grep -v "[tT]ime" | grep -v "selfLink" | grep -v "uid" | grep -v "resourceVersion" | sed 's/ name: .*/ name: geosphere-rabbit-rabbitmq-production/' | kubectl apply --namespace=geosphere-test -f -
   # this job doesn't actually need any artifacts from previous jobs
   dependencies: []
   rules:
@@ -66,6 +71,28 @@ gs deploy rabbit:
         - ci_geosphere/values-geosphere-rabbit.yaml
     - if: $DEPLOY_RABBIT
 
+gs deploy postgres:
+  environment:
+    name: geosphere
+    url: http://geosphere.ssec.wisc.edu
+  extends: .helm_based_job
+  stage: deploy infrastructure
+  script:
+    - ./helpers/deploy_postgis.sh ci_geosphere
+    - |-
+      kubectl get secret geosphere-postgis-postgresql --namespace=geosphere -oyaml | grep -v '^\s*namespace:\s' | grep -v "[Hh]elm" | grep -v "[tT]ime" | grep -v "selfLink" | grep -v "uid" | grep -v "resourceVersion" | sed 's/ name: .*/ name: geosphere-postgis-postgresql-production/' | kubectl apply --namespace=geosphere-test -f -
+  # this job doesn't actually need any artifacts from previous jobs
+  dependencies: []
+  rules:
+    - if: $CI_COMMIT_TAG !~ /^r[0-9]+_[0-9]+/
+      when: never
+    # no need to build if another project triggered us
+    - if: $CI_PIPELINE_SOURCE == "pipeline"
+      when: never
+    - changes:
+        - ci_geosphere/values-postgis.yaml
+    - if: $DEPLOY_POSTGIS
+
 gs deploy g16 grb:
 #  environment:
 #    name: geosphere

ci_geosphere/postgres-pvc.yaml

+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: geosphere-postgis
+  labels: {}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 8Gi
+  storageClassName: "longhorn"

ci_geosphere/values-mapcache.yaml

@@ -14,6 +14,12 @@ cache:
       # every 6 hours
       schedule: "0 */6 * * *"
       age: "+2"
+database:
+  postgresHost: "geosphere-postgis-postgresql"
+  postgresPort: 5432
+  postgresDatabaseName: "postgres"
+  postgresUser: "postgres"
+  postgresPasswordSecret: "geosphere-postgis-postgresql"
 seed:
   images: true
   overlays: true

ci_geosphere/values-postgis.yaml

+persistence:
+  enabled: true
+  existingClaim: "geosphere-postgis"
 metrics:
   enabled: true
   serviceMonitor:

ci_geosphere/values-tile-gen-g16-radc.yaml

@@ -15,3 +15,9 @@ destination:
     enabled: true
     storageClass: "longhorn"
     existingClaim: "geosphere-tile-gen-shapefiles"
+database:
+  postgresHost: "geosphere-postgis-postgresql"
+  postgresPort: 5432
+  postgresDatabaseName: "postgres"
+  postgresUser: "postgres"
+  postgresPasswordSecret: "geosphere-postgis-postgresql"

ci_geosphere/values-tile-gen-g16-radf.yaml

@@ -15,4 +15,9 @@ destination:
     enabled: true
     storageClass: "longhorn"
     existingClaim: "geosphere-tile-gen-shapefiles"
-
+database:
+  postgresHost: "geosphere-postgis-postgresql"
+  postgresPort: 5432
+  postgresDatabaseName: "postgres"
+  postgresUser: "postgres"
+  postgresPasswordSecret: "geosphere-postgis-postgresql"

ci_geosphere/values-tile-gen-g16-radm1.yaml

@@ -15,3 +15,9 @@ destination:
     enabled: true
     storageClass: "longhorn"
     existingClaim: "geosphere-tile-gen-shapefiles"
+database:
+  postgresHost: "geosphere-postgis-postgresql"
+  postgresPort: 5432
+  postgresDatabaseName: "postgres"
+  postgresUser: "postgres"
+  postgresPasswordSecret: "geosphere-postgis-postgresql"

ci_geosphere/values-tile-gen-g16-radm2.yaml

@@ -15,3 +15,9 @@ destination:
     enabled: true
     storageClass: "longhorn"
     existingClaim: "geosphere-tile-gen-shapefiles"
+database:
+  postgresHost: "geosphere-postgis-postgresql"
+  postgresPort: 5432
+  postgresDatabaseName: "postgres"
+  postgresUser: "postgres"
+  postgresPasswordSecret: "geosphere-postgis-postgresql"

ci_tests/run_basic_postgres_test.sh

@@ -20,7 +20,7 @@ install_basic_postgres_charts "ci_tests/basic_postgres"
 
 # give kubernetes a bit to create the resources
 debug "Waiting for Kubernetes to deploy and schedule components..."
-sleep 60
+sleep 90
 debug "Done waiting"
 
 debug "Getting GRB pod name"