From bd7879a84c3dfbdcd674252d3a5e25e56ee616e1 Mon Sep 17 00:00:00 2001 From: Mariusz Sabath Date: Tue, 7 Nov 2023 16:54:10 -0500 Subject: [PATCH 1/2] Fix the typo in the production ingress README Signed-off-by: Mariusz Sabath --- examples/production/README.md | 2 +- ...=> values-expose-federation-https-spiffe-ingress-nginx.yaml} | 0 ...ml => values-expose-federation-https-web-ingress-nginx.yaml} | 0 ...es-expose-spiffe-oidc-discovery-provider-ingress-nginx.yaml} | 0 ...nginx.yaml => values-expose-spire-server-ingress-nginx.yaml} | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename examples/production/{values-export-federation-https-spiffe-ingress-nginx.yaml => values-expose-federation-https-spiffe-ingress-nginx.yaml} (100%) rename examples/production/{values-export-federation-https-web-ingress-nginx.yaml => values-expose-federation-https-web-ingress-nginx.yaml} (100%) rename examples/production/{values-export-spiffe-oidc-discovery-provider-ingress-nginx.yaml => values-expose-spiffe-oidc-discovery-provider-ingress-nginx.yaml} (100%) rename examples/production/{values-export-spire-server-ingress-nginx.yaml => values-expose-spire-server-ingress-nginx.yaml} (100%) diff --git a/examples/production/README.md b/examples/production/README.md index a8561e6..9d8d937 100644 --- a/examples/production/README.md +++ b/examples/production/README.md @@ -20,7 +20,7 @@ If your using ingress-nginx and want to expose the spiffe oidc discovery provide cluster, add the following to the end of the helm upgrade example: ```shell --f values-export-spiffe-oidc-discovery-provider-ingress-nginx.yaml +-f values-expose-spiffe-oidc-discovery-provider-ingress-nginx.yaml ``` If you want to expose your spire-server outside of Kubernetes and are using ingress-nginx, add following values file when running `helm template/install/upgrade`. diff --git a/examples/production/values-export-federation-https-spiffe-ingress-nginx.yaml b/examples/production/values-expose-federation-https-spiffe-ingress-nginx.yaml similarity index 100% rename from examples/production/values-export-federation-https-spiffe-ingress-nginx.yaml rename to examples/production/values-expose-federation-https-spiffe-ingress-nginx.yaml diff --git a/examples/production/values-export-federation-https-web-ingress-nginx.yaml b/examples/production/values-expose-federation-https-web-ingress-nginx.yaml similarity index 100% rename from examples/production/values-export-federation-https-web-ingress-nginx.yaml rename to examples/production/values-expose-federation-https-web-ingress-nginx.yaml diff --git a/examples/production/values-export-spiffe-oidc-discovery-provider-ingress-nginx.yaml b/examples/production/values-expose-spiffe-oidc-discovery-provider-ingress-nginx.yaml similarity index 100% rename from examples/production/values-export-spiffe-oidc-discovery-provider-ingress-nginx.yaml rename to examples/production/values-expose-spiffe-oidc-discovery-provider-ingress-nginx.yaml diff --git a/examples/production/values-export-spire-server-ingress-nginx.yaml b/examples/production/values-expose-spire-server-ingress-nginx.yaml similarity index 100% rename from examples/production/values-export-spire-server-ingress-nginx.yaml rename to examples/production/values-expose-spire-server-ingress-nginx.yaml From aaeca009c2d0cda5e239ba26617bcb1cb453a5a3 Mon Sep 17 00:00:00 2001 From: Kevin Fox Date: Wed, 8 Nov 2023 04:50:05 -0800 Subject: [PATCH 2/2] Fix tests after renaming files Signed-off-by: Kevin Fox --- examples/production/run-tests.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/production/run-tests.sh b/examples/production/run-tests.sh index 5ad1764..5ef92b6 100755 --- a/examples/production/run-tests.sh +++ b/examples/production/run-tests.sh @@ -112,9 +112,9 @@ install_and_test() { "${helm_install[@]}" spire "$1" \ --namespace "${ns}" \ --values "${SCRIPTPATH}/values.yaml" \ - --values "${SCRIPTPATH}/values-export-spiffe-oidc-discovery-provider-ingress-nginx.yaml" \ - --values "${SCRIPTPATH}/values-export-spire-server-ingress-nginx.yaml" \ - --values "${SCRIPTPATH}/values-export-federation-https-web-ingress-nginx.yaml" \ + --values "${SCRIPTPATH}/values-expose-spiffe-oidc-discovery-provider-ingress-nginx.yaml" \ + --values "${SCRIPTPATH}/values-expose-spire-server-ingress-nginx.yaml" \ + --values "${SCRIPTPATH}/values-expose-federation-https-web-ingress-nginx.yaml" \ --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 \