From 5c98178b9e7b398a41603f4cb451597d320c02ab Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Fri, 7 Aug 2020 17:29:24 -0500
Subject: [PATCH] Remove "force" from ingress annotation
---
admin/README.md | 5 ++++-
ci_geosphere-test/values-client.yaml | 2 +-
ci_geosphere-test/values-mapcache.yaml | 2 +-
ci_geosphere-test/values-mapserver.yaml | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/admin/README.md b/admin/README.md
index 8607060..3c1f897 100644
--- a/admin/README.md
+++ b/admin/README.md
@@ -214,5 +214,8 @@ section of the `Ingress` definition.
```yaml
ingress:
annotations:
- ingress.kubernetes.io/force-ssl-redirect: "true"
+ ingress.kubernetes.io/ssl-redirect: "true"
```
+
+Note: this annotation applies to the traefik ingress controller and may not
+be the same for nginx or other ingress controllers installed on a cluster.
diff --git a/ci_geosphere-test/values-client.yaml b/ci_geosphere-test/values-client.yaml
index ce8d7a7..f1a73a9 100644
--- a/ci_geosphere-test/values-client.yaml
+++ b/ci_geosphere-test/values-client.yaml
@@ -1,7 +1,7 @@
ingress:
enabled: true
annotations:
- ingress.kubernetes.io/force-ssl-redirect: "true"
+ ingress.kubernetes.io/ssl-redirect: "true"
hosts:
- host: geosphere-test.ssec.wisc.edu
paths: ["/"]
diff --git a/ci_geosphere-test/values-mapcache.yaml b/ci_geosphere-test/values-mapcache.yaml
index 35d1d4e..9174ab6 100644
--- a/ci_geosphere-test/values-mapcache.yaml
+++ b/ci_geosphere-test/values-mapcache.yaml
@@ -15,7 +15,7 @@ seed:
ingress:
enabled: true
annotations:
- ingress.kubernetes.io/force-ssl-redirect: "true"
+ ingress.kubernetes.io/ssl-redirect: "true"
hosts:
- host: geosphere-test.ssec.wisc.edu
paths: ["/mapcache"]
diff --git a/ci_geosphere-test/values-mapserver.yaml b/ci_geosphere-test/values-mapserver.yaml
index 7d0fafa..242c81a 100644
--- a/ci_geosphere-test/values-mapserver.yaml
+++ b/ci_geosphere-test/values-mapserver.yaml
@@ -13,7 +13,7 @@ source:
ingress:
enabled: true
annotations:
- ingress.kubernetes.io/force-ssl-redirect: "true"
+ ingress.kubernetes.io/ssl-redirect: "true"
hosts:
- host: geosphere-test.ssec.wisc.edu
paths: ["/wms", "/wms_times"]
--
GitLab