Fix tests

Signed-off-by: Kevin Fox <[email protected]>

Co-authored-by: Marco Franssen <[email protected]>

.github/tests/spire-oidc-insecure/pre-install.sh

@@ -1,3 +1,4 @@
-#!/bin/bash
-helm install ingress-nginx ingress-nginx --version 4.5.2 --repo https://kubernetes.github.io/ingress-nginx -n "$VALUES" --set controller.extraArgs.enable-ssl-passthrough=
-kubectl wait --namespace ingress-nginx   --for=condition=ready pod   --selector=app.kubernetes.io/component=controller -n "$VALUES"
+#!/usr/bin/env bash
+
+helm install ingress-nginx ingress-nginx --version 4.5.2 --repo https://kubernetes.github.io/ingress-nginx -n "$scenario" --set controller.extraArgs.enable-ssl-passthrough=
+kubectl wait --namespace ingress-nginx   --for=condition=ready pod   --selector=app.kubernetes.io/component=controller -n "$scenario"

.github/tests/spire-oidc-insecure/values.yaml

@@ -13,7 +13,7 @@ spiffe-oidc-discovery-provider:
 
   ingress:
     enabled: true
-    className: "nginx"
+    className: nginx
     hosts:
     - host: ingress-nginx-controller
       paths:

charts/spire/charts/spiffe-oidc-discovery-provider/README.md

@@ -37,7 +37,7 @@ A Helm chart to install the SPIFFE OIDC discovery provider.
 | ingress.annotations | object | `{}` |  |
 | ingress.className | string | `""` |  |
 | ingress.enabled | bool | `false` |  |
-| ingress.hosts[0].host | string | `"chart-example.local"` |  |
+| ingress.hosts[0].host | string | `"oidc-discovery.example.org"` |  |
 | ingress.hosts[0].paths[0].path | string | `"/"` |  |
 | ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
 | ingress.tls | list | `[]` |  |

charts/spire/charts/spiffe-oidc-discovery-provider/templates/ingress.yaml

@@ -5,6 +5,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ include "spiffe-oidc-discovery-provider.namespace" . }}
   labels:
     {{- include "spiffe-oidc-discovery-provider.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}

charts/spire/charts/spiffe-oidc-discovery-provider/templates/tests/test-connection.yaml

@@ -29,11 +29,11 @@ spec:
       args: ['-O', '/dev/null', '{{ include "spiffe-oidc-discovery-provider.fullname" . }}.{{ include "spiffe-oidc-discovery-provider.namespace" . }}.svc.cluster.local:{{ .Values.service.port }}/.well-known/openid-configuration']
       securityContext:
         {{- toYaml .Values.securityContext | nindent 8 }}
-    {{- if and .Values.ingress.enabled .Values.ingress.test.enabled }}
+    {{- if .Values.ingress.enabled }}
     - name: wget-ingress
       image: busybox
       command: ['wget']
-      args: ['{{ index .Values.config.domains 0 }}/.well-known/openid-configuration']
+      args: ['-O', '/dev/null', '{{ index .Values.config.domains 0 }}/.well-known/openid-configuration']
       securityContext:
         {{- toYaml .Values.securityContext | nindent 8 }}
     {{- end }}