Environment enhancements

- Added s3gw-ui-no-tls.local ingress due to browser complaining mixed http/https sources from gui application. Signed-off-by: Giuseppe Baccini <[email protected]>
aquarist-labs · Jun 14, 2022 · c236ba6 · c236ba6
1 parent cdf5b3b
commit c236ba6
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 5 deletions.
diff --git a/env/README.md b/env/README.md
@@ -16,7 +16,7 @@ allocated on a separate virtual host:
 
 * **Longhorn dashboard**, on: `longhorn.local`
 * **s3gw**, on: `s3gw.local` and `s3gw-no-tls.local`
-* **s3gw s3 explorer**, on: `s3gw-ui.local`
+* **s3gw s3 explorer**, on: `s3gw-ui.local` and `s3gw-ui-no-tls.local`
 
 Host names are exposed with a node port service listening on ports
 30443 (https) and 30080 (http).  
@@ -27,15 +27,15 @@ When you are running the cluster on a virtual machine,
 you can patch host's `/etc/hosts` file as follow:  
 
 ```text
-10.46.201.101   longhorn.local s3gw.local s3gw-no-tls.local s3gw-ui.local
+10.46.201.101   longhorn.local s3gw.local s3gw-no-tls.local s3gw-ui.local s3gw-ui-no-tls.local
 ```
 
 This makes host names resolving with the admin node.  
 Otherwise, when you are running the cluster on bare metal,
 you can patch host's `/etc/hosts` file as follow:  
 
 ```text
-127.0.0.1   longhorn.local s3gw.local s3gw-no-tls.local s3gw-ui.local
+127.0.0.1   longhorn.local s3gw.local s3gw-no-tls.local s3gw-ui.local s3gw-ui-no-tls.local
 ```
 
 Services can now be accessed at:
@@ -45,4 +45,5 @@ https://longhorn.local:30443
 https://s3gw.local:30443
 http://s3gw-no-tls.local:30080
 https://s3gw-ui.local:30443
+http://s3gw-ui-no-tls.local:30080
 ```
diff --git a/env/ingress-traefik/s3gw-ui-ingress.yaml b/env/ingress-traefik/s3gw-ui-ingress.yaml
@@ -21,3 +21,23 @@ spec:
                 name: s3gw-ui-service
                 port:
                   number: 80
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: s3gw-ui-no-tls-ingress
+  namespace: s3gw-system
+  annotations:
+    traefik.ingress.kubernetes.io/router.middlewares: s3gw-system-cors-header@kubernetescrd
+spec:
+  rules:
+    - host: s3gw-ui-no-tls.local
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: s3gw-ui-service
+                port:
+                  number: 80
diff --git a/env/s3gw-dev.yaml b/env/s3gw-dev.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# This file was auto-generated by generate-spec.sh on 2022/33/10 14:06:36 CEST
+# This file was auto-generated by generate-spec.sh on 2022/51/14 15:06:07 CEST
 #
 
 apiVersion: v1
@@ -330,3 +330,23 @@ spec:
                 name: s3gw-ui-service
                 port:
                   number: 80
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: s3gw-ui-no-tls-ingress
+  namespace: s3gw-system
+  annotations:
+    traefik.ingress.kubernetes.io/router.middlewares: s3gw-system-cors-header@kubernetescrd
+spec:
+  rules:
+    - host: s3gw-ui-no-tls.local
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: s3gw-ui-service
+                port:
+                  number: 80
diff --git a/env/s3gw.yaml b/env/s3gw.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# This file was auto-generated by generate-spec.sh on 2022/32/10 14:06:13 CEST
+# This file was auto-generated by generate-spec.sh on 2022/50/14 15:06:51 CEST
 #
 
 apiVersion: v1
@@ -330,3 +330,23 @@ spec:
                 name: s3gw-ui-service
                 port:
                   number: 80
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: s3gw-ui-no-tls-ingress
+  namespace: s3gw-system
+  annotations:
+    traefik.ingress.kubernetes.io/router.middlewares: s3gw-system-cors-header@kubernetescrd
+spec:
+  rules:
+    - host: s3gw-ui-no-tls.local
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: s3gw-ui-service
+                port:
+                  number: 80