From 0069a4c9a8a1059034a0608493449a35698be82a Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Tue, 18 Aug 2020 11:32:54 -0500
Subject: [PATCH] Remove forced TLS on mapcache and mapserver ingress
---
admin/README.md | 2 +-
ci_geosphere/values-mapcache.yaml | 4 ++--
ci_geosphere/values-mapserver.yaml | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/admin/README.md b/admin/README.md
index 6628365..7279e1d 100644
--- a/admin/README.md
+++ b/admin/README.md
@@ -61,7 +61,7 @@ https://github.com/kubernetes/ingress-nginx/tree/master/charts/ingress-nginx
```bash
helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
-helm install ingress-nginx ingress-nginx/ingress-nginx --set controller.metrics.enabled=true
+helm install -n kube-system ingress-nginx ingress-nginx/ingress-nginx --set controller.metrics.enabled=true
```
### Local Path Configuration
diff --git a/ci_geosphere/values-mapcache.yaml b/ci_geosphere/values-mapcache.yaml
index 40362ec..a56f3f0 100644
--- a/ci_geosphere/values-mapcache.yaml
+++ b/ci_geosphere/values-mapcache.yaml
@@ -14,8 +14,8 @@ seed:
overlays: true
ingress:
enabled: true
- annotations:
- ingress.kubernetes.io/ssl-redirect: "true"
+# annotations:
+# ingress.kubernetes.io/ssl-redirect: "true"
hosts:
- host: geosphere.ssec.wisc.edu
paths: ["/mapcache"]
diff --git a/ci_geosphere/values-mapserver.yaml b/ci_geosphere/values-mapserver.yaml
index 19f8f19..29d8746 100644
--- a/ci_geosphere/values-mapserver.yaml
+++ b/ci_geosphere/values-mapserver.yaml
@@ -5,8 +5,8 @@ tileSource:
existingClaim: "geosphere-tile-gen-shapefiles"
ingress:
enabled: true
- annotations:
- ingress.kubernetes.io/ssl-redirect: "true"
+# annotations:
+# ingress.kubernetes.io/ssl-redirect: "true"
hosts:
- host: geosphere.ssec.wisc.edu
paths: ["/wms", "/wms_times"]
--
GitLab