From 4fd1bc4387bb2a52dc007ab6763690a9a6ccd3bb Mon Sep 17 00:00:00 2001 From: Kevin Fox Date: Sat, 30 Dec 2023 04:55:27 -0800 Subject: [PATCH] Incorperate feedback --- .../spire/charts/spiffe-oidc-discovery-provider/README.md | 5 ++--- .../spire/charts/spiffe-oidc-discovery-provider/values.yaml | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/charts/spire/charts/spiffe-oidc-discovery-provider/README.md b/charts/spire/charts/spiffe-oidc-discovery-provider/README.md index 7db48f536..68423cfb6 100644 --- a/charts/spire/charts/spiffe-oidc-discovery-provider/README.md +++ b/charts/spire/charts/spiffe-oidc-discovery-provider/README.md @@ -63,9 +63,8 @@ A Helm chart to install the SPIFFE OIDC discovery provider. | `tls.certManager.certificate.issuerRef.name` | Name of the issuer to use. If unset, it will use the name of the built in issuer | `""` | | `insecureScheme.nginx.image.registry` | The OCI registry to pull the image from. Only used when TLS is disabled. | `docker.io` | | `insecureScheme.nginx.image.repository` | The repository within the registry. Only used when TLS is disabled. | `nginxinc/nginx-unprivileged` | -| `insecureScheme.nginx.image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `insecureScheme.nginx.image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | -| `insecureScheme.nginx.image.tag` | Overrides the image tag whose default is the chart appVersion | `1.25.3-alpine` | +| `insecureScheme.nginx.image.pullPolicy` | The image pull policy. Only used when TLS is disabled. | `IfNotPresent` | +| `insecureScheme.nginx.image.tag` | Overrides the image tag whose default is the chart appVersion. Only used when TLS is disabled. | `1.25.3-alpine` | | `insecureScheme.nginx.resources` | Resource requests and limits | `{}` | | `jwtIssuer` | Path to JWT issuer. Defaults to oidc-discovery.$trustDomain if unset | `""` | | `config.logLevel` | The log level, valid values are "debug", "info", "warn", and "error" | `info` | diff --git a/charts/spire/charts/spiffe-oidc-discovery-provider/values.yaml b/charts/spire/charts/spiffe-oidc-discovery-provider/values.yaml index fb867aadd..421b9790b 100644 --- a/charts/spire/charts/spiffe-oidc-discovery-provider/values.yaml +++ b/charts/spire/charts/spiffe-oidc-discovery-provider/values.yaml @@ -136,9 +136,8 @@ insecureScheme: nginx: ## @param insecureScheme.nginx.image.registry The OCI registry to pull the image from. Only used when TLS is disabled. ## @param insecureScheme.nginx.image.repository The repository within the registry. Only used when TLS is disabled. - ## @param insecureScheme.nginx.image.pullPolicy The image pull policy - ## @param insecureScheme.nginx.image.version This value is deprecated in favor of tag. (Will be removed in a future release) - ## @param insecureScheme.nginx.image.tag Overrides the image tag whose default is the chart appVersion + ## @param insecureScheme.nginx.image.pullPolicy The image pull policy. Only used when TLS is disabled. + ## @param insecureScheme.nginx.image.tag Overrides the image tag whose default is the chart appVersion. Only used when TLS is disabled. ## Example: ## chainguard image does not support the templates feature ## https://github.com/chainguard-images/nginx/issues/43 @@ -151,7 +150,6 @@ insecureScheme: registry: docker.io repository: nginxinc/nginx-unprivileged pullPolicy: IfNotPresent - version: "" tag: 1.25.3-alpine ## @param insecureScheme.nginx.resources Resource requests and limits resources: {}