From f045d2b90b96d7fd84a792a12c60b7c5fd401b0b Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Thu, 16 Jul 2020 15:43:10 -0500
Subject: [PATCH] Update GRB values to match new configuration

---
 .gitlab-ci.yml                 |  2 +-
 production/values-g16-grb.yaml | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c99641a..1a8e015 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -149,7 +149,7 @@ deploy_g16_grb:
     # copy extra values files to the local directory (where helm has access via docker mount)
     - cp ../../production/values-g16-grb.yaml .
     # namespace names are the same as domain names
-    - helm upgrade -v 2 --install --kubeconfig $kubeconfig --namespace $ns --set grbNotifier.image.dockerTag=$docker_tag -f values-g16-grb.yaml cspp-geo-grb cspp-geo-grb/
+    - helm upgrade -v 2 --install --kubeconfig $kubeconfig --namespace $ns -f values-g16-grb.yaml cspp-geo-grb cspp-geo-grb/
   dependencies:
     - get_chart_grb
   rules:
diff --git a/production/values-g16-grb.yaml b/production/values-g16-grb.yaml
index 3fd9a8a..e02a48c 100644
--- a/production/values-g16-grb.yaml
+++ b/production/values-g16-grb.yaml
@@ -3,13 +3,13 @@ grbProcessor:
     - name: APID_FILTER
       value: "GOES-16-ABI-Only.xml"
 
-grbNotifier:
-  uploadDst: "s3://g16-abi-l1b-netcdf"
-  s3Endpoint: "http://geosphere-minio:9000"
-  s3Secret: "geosphere-minio"
-  s3AccessKey: "accesskey"
-  s3SecretKey: "secretkey"
-  rabbitOut:
-    host: "geosphere-rabbit-rabbitmq"
-    username: "user"
-    passwordSecret: "geosphere-rabbit-rabbitmq"
\ No newline at end of file
+fanoutServer: "fanout1.ssec.wisc.edu"
+uploadDst: "s3://g16-abi-l1b-netcdf"
+s3Endpoint: "http://geosphere-minio:9000"
+s3Secret: "geosphere-minio"
+s3AccessKey: "accesskey"
+s3SecretKey: "secretkey"
+rabbitOut:
+  host: "geosphere-rabbit-rabbitmq"
+  username: "user"
+  passwordSecret: "geosphere-rabbit-rabbitmq"
\ No newline at end of file
-- 
GitLab