Add remaining GCP-based values files

admin/kubekorner_geosphere_prometheus_rules.yaml

@@ -305,7 +305,7 @@ spec:
           ruleGroup: geosphere-node
         annotations:
           summary: "Host context switching (instance {{ $labels.instance }})"
-          description: "Context switching is growing on node (> 1000 / s)\n  VALUE = {{ $value }}\n  LABELS: {{ $labels }}"
+          description: "Context switching is growing on node (> 6000 / s)\n  VALUE = {{ $value }}\n  LABELS: {{ $labels }}"
       - alert: HostSwapIsFillingUp
         expr: (1 - (node_memory_SwapFree_bytes / node_memory_SwapTotal_bytes)) * 100 > 80
         for: 5m

ci_gcp/gitlab-ci.yaml

@@ -33,26 +33,12 @@ test gcp connection:
         kubectl get all;
       fi
 
-gcp deploy grb:
-  extends: .gcloud_base
-  stage: deploy GRB
-  script:
-    - ns=$(./helpers/get_namespace.sh)
-    - cd geosphere-grb/chart
-    - source cspp-geo-grb/cibuild.env
-    # copy private ssh key to the chart for inclusion in the secret
-    - cp $GRB_PROXY_SSH_KEY cspp-geo-grb/secrets/grb_ssh_proxy_rsa
-    - echo "Deploying version $docker_tag to cluster namespace $ns"
-    - helm upgrade -v 2 --install --namespace $ns -f ../../ci_gcp/values-grb-g16.yaml cspp-geo-grb cspp-geo-grb/
-  dependencies:
-    - get_chart_grb
-
 gcp create geotiff storage:
   extends: .gcloud_base
   stage: create storage
   script:
     - ns=$(./helpers/get_namespace.sh)
-    - ./helpers/create_pvc.sh "$ns" "ci_${ns}/geotiff-pvc.yaml" "cspp-geo-geo2grid" "$KUBECONFIG"
+    - ./helpers/create_pvc.sh "$ns" "ci_gcp/geotiff-pvc.yaml" "cspp-geo-geo2grid"
   # this job doesn't actually need any artifacts from previous jobs
   dependencies: []
   rules:
@@ -63,12 +49,27 @@ gcp create geotiff storage:
         - ci_gcp/geotiff-pvc.yaml
     - if: $CREATE_STORAGE
 
+gcp create postgres storage:
+  extends: .gcloud_base
+  stage: create storage
+  script:
+    - ns=$(./helpers/get_namespace.sh)
+    - ./helpers/create_pvc.sh "$ns" "ci_gcp/postgres-pvc.yaml" "geosphere-postgis"
+  # this job doesn't actually need any artifacts from previous jobs
+  dependencies: []
+  rules:
+    - if: $CI_COMMIT_TAG !~ /^r[0-9]+_[0-9]+/
+      when: never
+    - changes:
+        - ci_gcp/postgres-pvc.yaml
+    - if: $CREATE_STORAGE
+
 gcp create shapefile storage:
   extends: .gcloud_base
   stage: create storage
   script:
     - ns=$(./helpers/get_namespace.sh)
-    - ./helpers/create_pvc.sh "$ns" "ci_${ns}/shapefiles-pvc.yaml" "geosphere-tile-gen-shapefiles" "$KUBECONFIG"
+    - ./helpers/create_pvc.sh "$ns" "ci_gcp/shapefiles-pvc.yaml" "geosphere-tile-gen-shapefiles"
   # this job doesn't actually need any artifacts from previous jobs
   dependencies: []
   rules:
@@ -80,13 +81,10 @@ gcp create shapefile storage:
     - if: $CREATE_STORAGE
 
 gcp deploy rabbit:
-  environment:
-    name: geosphere
-    url: http://geosphere.ssec.wisc.edu
-  extends: .helm_based_job
+  extends: .gcloud_base
   stage: deploy infrastructure
   script:
-    - ./helpers/deploy_rabbitmq.sh ci_geosphere
+    - ./helpers/deploy_rabbitmq.sh ci_gcp
   # this job doesn't actually need any artifacts from previous jobs
   dependencies: []
   rules:
@@ -96,9 +94,82 @@ gcp deploy rabbit:
     - if: $CI_PIPELINE_SOURCE == "pipeline"
       when: never
     - changes:
-        - ci_geosphere/values-geosphere-rabbit.yaml
+        - ci_gcp/values-geosphere-rabbit.yaml
     - if: $DEPLOY_RABBIT
 
+gcp deploy postgres:
+  extends: .gcloud_base
+  stage: deploy infrastructure
+  script:
+    - ./helpers/deploy_postgis.sh ci_gcp
+  # this job doesn't actually need any artifacts from previous jobs
+  dependencies: []
+  rules:
+    - if: $CI_COMMIT_TAG !~ /^gcp-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_gcp/values-postgis.yaml
+    - if: $DEPLOY_POSTGIS
+
+gcp deploy grb:
+  extends: .gcloud_base
+  stage: deploy GRB
+  script:
+    - ns=$(./helpers/get_namespace.sh)
+    - cd geosphere-grb/chart
+    - source cspp-geo-grb/cibuild.env
+    # copy private ssh key to the chart for inclusion in the secret
+    - cp $GRB_PROXY_SSH_KEY cspp-geo-grb/secrets/grb_ssh_proxy_rsa
+    - echo "Deploying version $docker_tag to cluster namespace $ns"
+    - helm upgrade -v 2 --install --namespace $ns -f ../../ci_gcp/values-grb-g16.yaml cspp-geo-grb cspp-geo-grb/
+  dependencies:
+    - get_chart_grb
+  rules:
+    - if: $CI_COMMIT_TAG !~ /^gcp-r[0-9]+_[0-9]+/
+      when: never
+    - when: on_success
+
+gcp deploy geo2grid g16 radf:
+  extends: .deploy_geo2grid
+  variables:
+    VALUES_DIR: "ci_gcp"
+    DEPLOY_SUFFIX: "-g16-radf"
+  rules:
+    - if: $CI_COMMIT_TAG !~ /^gcp-r[0-9]+_[0-9]+/
+      when: never
+    - when: on_success
+
+gcp deploy tile gen g16 radf:
+  extends: .deploy_tile_gen
+  variables:
+    VALUES_DIR: "ci_gcp"
+    DEPLOY_SUFFIX: "-g16-radf"
+  rules:
+    - if: $CI_COMMIT_TAG !~ /^gcp-r[0-9]+_[0-9]+/
+      when: never
+    - when: on_success
+
+gcp deploy mapserver:
+  variables:
+    VALUES_DIR: "ci_gcp"
+  extends: .deploy_mapserver
+  rules:
+    - if: $CI_COMMIT_TAG !~ /^gcp-r[0-9]+_[0-9]+/
+      when: never
+    - when: on_success
+
+gcp deploy mapcache:
+  variables:
+    VALUES_DIR: "ci_gcp"
+  extends: .deploy_mapcache
+  rules:
+    - if: $CI_COMMIT_TAG !~ /^gcp-r[0-9]+_[0-9]+/
+      when: never
+    - when: on_success
+
 gcp deploy client:
   extends: .gcloud_base
   stage: deploy Client

ci_gcp/postgres-pvc.yaml

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

ci_gcp/values-mapcache.yaml

+rabbitIn:
+  host: "geosphere-rabbit-rabbitmq"
+  username: "user"
+  passwordSecret: "geosphere-rabbit-rabbitmq"
+  topic: "data.goes.g16.abi.*.l1b.tiles.*.complete"
+wms:
+  host: "geosphere-mapserver"
+cache:
+  persistence:
+    enabled: true
+    storageClass: "local-path"
+    size: 2Ti
+    cleanup:
+      # 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
+  seedArgs: "-z 0,3"
+ingress:
+  enabled: true
+  hosts:
+    - host: ""
+      paths: ["/mapcache"]

ci_gcp/values-mapserver.yaml

+imageSource:
+  #  s3Endpoint: "http://geosphere-minio:9000"
+  existingClaim: "cspp-geo-geo2grid"
+tileSource:
+  existingClaim: "geosphere-tile-gen-shapefiles"
+database:
+  postgresHost: "geosphere-postgis-postgresql"
+  postgresPort: 5432
+  postgresDatabaseName: "postgres"
+  postgresUser: "postgres"
+  postgresPasswordSecret: "geosphere-postgis-postgresql"
+ingress:
+  enabled: true
+  hosts:
+    - host: ""
+      paths: ["/wms", "/wms_times"]
+    # the test site uses the production WMS server
+#    - host: geosphere-test.ssec.wisc.edu
+#      paths: ["/wms", "/wms_times"]

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

+rabbitIn:
+  host: "geosphere-rabbit-rabbitmq"
+  username: "user"
+  passwordSecret: "geosphere-rabbit-rabbitmq"
+  topic: "data.goes.g16.abi.radf.l1b.geotiff.all.complete"
+rabbitOut:
+  host: "geosphere-rabbit-rabbitmq"
+  username: "user"
+  passwordSecret: "geosphere-rabbit-rabbitmq"
+source:
+  existingClaim: "cspp-geo-geo2grid"
+destination:
+  #  s3Endpoint: "http://geosphere-minio:9000"
+  persistence:
+    enabled: true
+    storageClass: "standard"
+    existingClaim: "geosphere-tile-gen-shapefiles"
+database:
+  postgresHost: "geosphere-postgis-postgresql"
+  postgresPort: 5432
+  postgresDatabaseName: "postgres"
+  postgresUser: "postgres"
+  postgresPasswordSecret: "geosphere-postgis-postgresql"