fix for ingress (beta)

Author: cedricve

charts/hub/Chart.yaml

@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.54.3
+version: 0.55.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/hub/templates/kerberos-hub/hub-api.yaml

@@ -39,25 +39,7 @@ spec:
     {{- toYaml . | nindent 8 }}
   {{- end }}
 
-  {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
-  rules:
-    - host: "{{ .Values.kerberoshub.api.url }}"
-      http:
-        paths:
-          - path: /
-            backend:
-              serviceName: hub-api-svc
-              servicePort: 8081
-    {{- if .Values.kerberoshub.api.legacyUrl }}
-    - host: "{{ .Values.kerberoshub.api.legacyUrl }}"
-      http:
-        paths:
-          - path: /
-            backend:
-              serviceName: hub-api-svc
-              servicePort: 8081
-    {{- end }}
-  {{- else }}
+  {{ if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
   rules:
     - host: "{{ .Values.kerberoshub.api.url }}"
       http:
@@ -91,7 +73,25 @@ spec:
                 name: hub-api-svc
                 port:
                   number: 80
-  {{- end }}
+  {{ else }}
+    rules:
+    - host: "{{ .Values.kerberoshub.api.url }}"
+      http:
+        paths:
+          - path: /
+            backend:
+              serviceName: hub-api-svc
+              servicePort: 8081
+    {{- if .Values.kerberoshub.api.legacyUrl }}
+    - host: "{{ .Values.kerberoshub.api.legacyUrl }}"
+      http:
+        paths:
+          - path: /
+            backend:
+              serviceName: hub-api-svc
+              servicePort: 8081
+    {{- end }}
+  {{ end }}
 ---
 apiVersion: apps/v1
 kind: Deployment

charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml

@@ -35,16 +35,9 @@ spec:
     {{- toYaml . | nindent 8 }}
   {{- end }}
 
-  {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
-  rules:
-    - host: "{{ .Values.kerberoshub.frontend.demoUrl }}"
-      http:
-        paths:
-          - path: /
-            backend:
-              serviceName: hub-frontend-demo-svc
-              servicePort: 80
-  {{- else }}
+
+  
+  {{ if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
   rules:
     - host: "{{ .Values.kerberoshub.frontend.demoUrl }}"
       http:
@@ -56,7 +49,16 @@ spec:
               name: hub-frontend-demo-svc
               port:
                 number: 80
-  {{- end }}
+  {{ else }}
+  rules:
+    - host: "{{ .Values.kerberoshub.frontend.demoUrl }}"
+      http:
+        paths:
+          - path: /
+            backend:
+              serviceName: hub-frontend-demo-svc
+              servicePort: 80
+  {{ end }}
 ---
 apiVersion: apps/v1
 kind: Deployment

charts/hub/templates/kerberos-hub/hub-frontend.yaml

@@ -34,35 +34,7 @@ spec:
   tls:
     {{- toYaml . | nindent 8 }}
   {{- end }}
-
-  {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
-  rules:
-    - host: "{{ .Values.kerberoshub.frontend.url }}"
-      http:
-        paths:
-          - path: /
-            backend:
-              serviceName: hub-frontend-svc
-              servicePort: 80
-    {{- if .Values.kerberoshub.frontend.legacyUrl }}
-    - host: "{{ .Values.kerberoshub.frontend.legacyUrl }}"
-      http:
-        paths:
-          - path: /
-            backend:
-              serviceName: hub-frontend-svc
-              servicePort: 80
-    {{- end }}
-    {{- range .Values.kerberoshub.frontend.domains }}
-    - host: "{{ . }}"
-      http:
-        paths:
-          - path: /
-            backend:
-              serviceName: hub-frontend-svc
-              servicePort: 80
-    {{- end }}
-  {{- else }}
+  {{ if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
   rules:
     - host: "{{ .Values.kerberoshub.frontend.url }}"
       http:
@@ -98,7 +70,35 @@ spec:
               port:
                 number: 80
     {{- end }}
-  {{- end }}
+  
+  {{ else }}
+  rules:
+    - host: "{{ .Values.kerberoshub.frontend.url }}"
+      http:
+        paths:
+          - path: /
+            backend:
+              serviceName: hub-frontend-svc
+              servicePort: 80
+    {{- if .Values.kerberoshub.frontend.legacyUrl }}
+    - host: "{{ .Values.kerberoshub.frontend.legacyUrl }}"
+      http:
+        paths:
+          - path: /
+            backend:
+              serviceName: hub-frontend-svc
+              servicePort: 80
+    {{- end }}
+    {{- range .Values.kerberoshub.frontend.domains }}
+    - host: "{{ . }}"
+      http:
+        paths:
+          - path: /
+            backend:
+              serviceName: hub-frontend-svc
+              servicePort: 80
+    {{- end }}
+  {{ end }}
 ---
 apiVersion: apps/v1
 kind: Deployment