Ingress type openshift (#52)

* Specify ingress controller type Signed-off-by: Kevin Fox <[email protected]> * Fix indenting, docs Signed-off-by: Kevin Fox <[email protected]> * Fix spacing Signed-off-by: Kevin Fox <[email protected]> * Fix missing brackets Signed-off-by: Kevin Fox <[email protected]> * Fix missing brackets Signed-off-by: Kevin Fox <[email protected]> * Add ingress-nginx support Signed-off-by: Kevin Fox <[email protected]> * Use the right example values for test version to upgrade from. Signed-off-by: Kevin Fox <[email protected]> * Fix var in wrong location Signed-off-by: Kevin Fox <[email protected]> * Fix missing arg Signed-off-by: Kevin Fox <[email protected]> * Try this to checkout the right version Signed-off-by: Kevin Fox <[email protected]> * Switch to upgrading from 0.14.0 Signed-off-by: Kevin Fox <[email protected]> * Install crds Signed-off-by: Kevin Fox <[email protected]> * Simple ingress support For a lot of situations, ingress rules can be derived from trustDomain. Change the code to generate rules by default for the user. Signed-off-by: Kevin Fox <[email protected]> * Add upgrade test fix from 43 Signed-off-by: Kevin Fox <[email protected]> * Incorperate feedback Signed-off-by: Kevin Fox <[email protected]> * Fix test Signed-off-by: Kevin Fox <[email protected]> * Apply suggestions from code review Co-authored-by: Faisal Memon <[email protected]> Signed-off-by: kfox1111 <[email protected]> * Fix docs Signed-off-by: Kevin Fox <[email protected]> * Enable unset ingress controller type to use with openshift later Signed-off-by: Kevin Fox <[email protected]> * Openshift ingress controller type support Signed-off-by: Kevin Fox <[email protected]> * Fix missing end tag Signed-off-by: Kevin Fox <[email protected]> * Fix merge conflicts Signed-off-by: Kevin Fox <[email protected]> * Fix doc merge conflicts Signed-off-by: Kevin Fox <[email protected]> * Apply suggestions from code review Co-authored-by: Faisal Memon <[email protected]> Signed-off-by: kfox1111 <[email protected]> * Update docs Signed-off-by: Kevin Fox <[email protected]> * Apply suggestions from code review Co-authored-by: Faisal Memon <[email protected]> Signed-off-by: kfox1111 <[email protected]> * Fix docs Signed-off-by: Kevin Fox <[email protected]> * Incorperate feedback Signed-off-by: Kevin Fox <[email protected]> * Fix merge conflicts Signed-off-by: Kevin Fox <[email protected]> * Fix automatically generated rules on openshift Signed-off-by: Kevin Fox <[email protected]> * Fix formatting Signed-off-by: Kevin Fox <[email protected]> * Fix pathType Signed-off-by: Kevin Fox <[email protected]> * Make openshift edge rules work Signed-off-by: Kevin Fox <[email protected]> * Fix var scoping Signed-off-by: Kevin Fox <[email protected]> * Fix docs Signed-off-by: Kevin Fox <[email protected]> * Fix issue created during merge conflict Signed-off-by: Kevin Fox <[email protected]> * Fix docs Signed-off-by: Kevin Fox <[email protected]> --------- Signed-off-by: Kevin Fox <[email protected]> Signed-off-by: kfox1111 <[email protected]> Co-authored-by: Faisal Memon <[email protected]> Co-authored-by: Mariusz Sabath <[email protected]>
2023-11-03 13:16:14 -07:00
parent 2dce90f44e
commit 81cc2dc573
14 changed files with 220 additions and 179 deletions
@@ -71,11 +71,13 @@
 {{-     $type = .global.spire.ingressControllerType }}
 {{-   else if ne .ingress.controllerType "" }}
 {{-     $type = .ingress.controllerType }}
+{{-   else if (dig "openshift" false .global) }}
+{{-     $type = "openshift" }}
 {{-   else }}
 {{-     $type = "other" }}
 {{-   end }}
-{{-   if not (has $type (list "other" "ingress-nginx")) }}
-{{-     fail "Unsupported ingress controller type specified. Must be one of [other, ingress-nginx]" }}
+{{-   if not (has $type (list "ingress-nginx" "openshift" "other")) }}
+{{-     fail "Unsupported ingress controller type specified. Must be one of [ingress-nginx, openshift, other]" }}
 {{-   end }}
 {{-   $type }}
 {{- end }}
@@ -96,6 +98,9 @@
 * ingress - the standardized ingress object
 * svcName - The service to route to
 * port - which port on the service to use
+ * path - optional path to set on the rules
+ * pathType - typical ingress path type
+ * tlsSection - bool specifying to add by default the tls section to the ingress. Ingress-nginx needs true, openshift needs false.
 * Values - Chart values
 */}}
 {{ define "spire-lib.ingress-spec" }}
@@ -106,18 +111,22 @@
 ingressClassName: {{ . | quote }}
 {{- end }}
 {{- if eq (add (len .ingress.tls) (len .ingress.hosts)) 0 }}
+{{ if or .tlsSection .ingress.tlsSecret }}
 tls:
  - hosts:
      - {{ $host | quote }}
 {{- with .ingress.tlsSecret }}
    secretName: {{ . | quote }}
 {{- end }}
+{{- end }}
 rules:
  - host: {{ $host | quote }}
    http:
      paths:
-        - path: "/"
-          pathType: Prefix
+        - pathType: {{ .pathType }}
+          {{- with .path }}
+          path: {{ . }}
+          {{- end }}
          backend:
            service:
              name: {{ $svcName | quote }}