Simple ingress support (#48)

Co-authored-by: Faisal Memon <[email protected]>

examples/production/example-your-values.yaml

@@ -10,36 +10,15 @@ spire-server:
     organization: Production
     common_name: production.other
 
-  ingress:
-    hosts:
-      - host: spire-server.production.other
-        paths:
-          - path: /
-            pathType: Prefix
-    tls:
-      - hosts:
-          - spire-server.production.other
-  federation:
-    ingress:
-      hosts:
-        - host: spire-server-federation.production.other
-          paths:
-            - path: /
-              pathType: Prefix
-      tls:
-        - hosts:
-            - spire-server-federation.production.other
-          secretName: tls-cert
+#  ingress:
+#    host: spire-server
+#  federation:
+#     ingress:
+#       host: spire-server-federation
+#       tlsSecret: tls-cert
 
-spiffe-oidc-discovery-provider:
-  ingress:
-    hosts:
-      - host: oidc-discovery.production.other
-        paths:
-          - path: /
-            pathType: Prefix
-    tls:
-      - secretName: tls-cert
-        hosts:
-          - oidc-discovery.production.other
+# spiffe-oidc-discovery-provider:
+#   ingress:
+#     host: oidc-discovery
+#     tlsSecret: tls-cert
 

examples/production/run-tests.sh

@@ -117,6 +117,7 @@ install_and_test() {
     --values /tmp/dummydns \
     --set spiffe-oidc-discovery-provider.tests.tls.customCA=tls-cert,spire-server.tests.tls.customCA=tls-cert \
     --set spire-agent.server.address=spire-server.production.other,spire-agent.server.port=443 \
+    --set spire-server.federation.ingress.tlsSecret=tls-cert,spiffe-oidc-discovery-provider.ingress.tlsSecret=tls-cert \
     --values "${SCRIPTPATH}/example-your-values.yaml" \
     $2 \
     --wait

examples/production/values-export-federation-https-spiffe-ingress-nginx.yaml

@@ -8,12 +8,3 @@ spire-server:
         nginx.ingress.kubernetes.io/ssl-passthrough: "true"
 
       # className: nginx
- 
-      hosts:
-        - host: spire-server-federation.example.org
-          paths:
-            - path: /
-              pathType: Prefix
-      tls:
-        - hosts:
-            - spire-server-federation.example.org

examples/production/values-export-federation-https-web-ingress-nginx.yaml

@@ -10,12 +10,4 @@ spire-server:
 
       # className: nginx
  
-      hosts:
-        - host: spire-server-federation.example.org
-          paths:
-            - path: /
-              pathType: Prefix
-      tls:
-        - hosts:
-            - spire-server-federation.example.org
-          secretName: spire-server-federation-tls
+      tlsSecret: spire-server-federation-tls

examples/production/values-export-spiffe-oidc-discovery-provider-ingress-nginx.yaml

@@ -8,14 +8,5 @@ spiffe-oidc-discovery-provider:
       
     # className: nginx
 
-    # You must override these in your own values file with the appropriate hostname
-    # and secret or it wont start.
-    hosts:
-      - host: oidc-discovery.example.org
-        paths:
-          - path: /
-            pathType: Prefix
-    tls:
-      - secretName: tls-cert
-        hosts:
-          - oidc-discovery.example.org
+    # You must override these in your own values file with the appropriate secret or it wont start.
+    tlsSecret: tls-cert

examples/production/values-export-spire-server-ingress-nginx.yaml

@@ -4,14 +4,3 @@ spire-server:
     controllerType: ingress-nginx
 
     # className: nginx
-
-    # You must override these in your own values file with the appropriate hostname
-    # and secret or it wont start.
-    hosts:
-      - host: spire-server.example.org
-        paths:
-          - path: /
-            pathType: Prefix
-    tls:
-      - hosts:
-          - spire-server.example.org