Use default openshift ingress (#414)

* use default openshift ingress * update comments
dell · Apr 30, 2024 · 9c2ba6c · 9c2ba6c
1 parent e6b55d3
commit 9c2ba6c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/charts/csm-authorization/Chart.yaml b/charts/csm-authorization/Chart.yaml
@@ -15,4 +15,4 @@ dependencies:
 - name: ingress-nginx
   version: 4.0.19
   repository: https://kubernetes.github.io/ingress-nginx
-  condition: ingress-nginx.enabled
+  condition: nginx.enabled
diff --git a/charts/csm-authorization/templates/ingress.yaml b/charts/csm-authorization/templates/ingress.yaml
@@ -3,14 +3,19 @@ kind: Ingress
 metadata:
   name: proxy-server
   namespace: {{ include "custom.namespace" . }}
-  {{- if .Values.authorization.proxyServerIngress.annotations }}
   annotations:
+    {{- if eq .Values.openshift true }}
+    route.openshift.io/termination: "edge"
+    {{- end }}
+    {{- if .Values.authorization.proxyServerIngress.annotations }}
     {{- range $key, $value := .Values.authorization.proxyServerIngress.annotations }}
     {{ $key }}: {{ tpl $value $ | quote }}
     {{- end }}
   {{- end }}
 spec:
+  {{- if eq .Values.nginx.enabled true }}
   ingressClassName: {{ .Values.authorization.proxyServerIngress.ingressClassName }}
+  {{- end }}
   tls:
   - hosts:
       - {{ .Values.authorization.hostname }}
@@ -28,24 +33,24 @@ spec:
   - host: {{ .Values.authorization.hostname }}
     http:
       paths:
-        - path: /
-          pathType: Prefix
-          backend:
+        - backend:
             service:
               name: proxy-server
               port:
                 number: 8080
+          path: /
+          pathType: Prefix
   {{- if .Values.authorization.proxyServerIngress.hosts  }}
   {{- range .Values.authorization.proxyServerIngress.hosts }}
   - host: {{ tpl . $}}
     http:
       paths:
-        - path: /
-          pathType: Prefix
-          backend:
+        - backend:
             service:
               name: proxy-server
               port:
                 number: 8080
+          path: /
+          pathType: Prefix
   {{- end }}
   {{- end}}
diff --git a/charts/csm-authorization/values.yaml b/charts/csm-authorization/values.yaml
@@ -1,6 +1,12 @@
-# if enabled, nginx ingress controller will be deployed
+# set to true if installing on an OpenShift Container Platform
+# if enabled, the OpenShift Ingress Operator will be used
 # if you have your own ingress controller, keep this false and set the appropriate annotations for the ingresses in the authorization section
-ingress-nginx:
+openshift: false
+
+# set to true if installing on a Kubernetes Container Platform
+# if enabled, NGINX Ingress Controller will be deployed
+# if you have your own ingress controller, keep this false and set the appropriate annotations for the ingresses in the authorization section
+nginx:
   enabled: true
 
 # if enabled, cert-manager will be deployed
@@ -60,4 +66,4 @@ vault:
   address: https://10.0.0.1:8400
   kvEnginePath: secret
   skipCertificateValidation: true
-
+