From 8d0e290ae93d8b7db86aacb33c20d74c8854f98e Mon Sep 17 00:00:00 2001 From: Kevin Fox Date: Sun, 17 Sep 2023 18:13:32 -0700 Subject: [PATCH] Fix merge conflict Signed-off-by: Kevin Fox --- charts/spire/charts/spire-server/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/spire/charts/spire-server/README.md b/charts/spire/charts/spire-server/README.md index 9222c7ac6..f6b59ccea 100644 --- a/charts/spire/charts/spire-server/README.md +++ b/charts/spire/charts/spire-server/README.md @@ -153,7 +153,7 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr | `federation.ingress.annotations` | Annotations for the ingress object | `{}` | | `federation.ingress.hosts` | Host paths for ingress object | `[]` | | `federation.ingress.tls` | Secrets containining TLS certs to enable https on ingress | `[]` | -| `ca_subject.country` | Country for Spire server CA | `NL` | +| `ca_subject.country` | Country for Spire server CA | `ARPA` | | `ca_subject.organization` | Organization for Spire server CA | `Example` | | `ca_subject.common_name` | Common Name for Spire server CA | `example.org` | | `keyManager.disk.enabled` | Flag to enable keyManager on disk | `true` |