Incorperate feedback

spiffe · Dec 30, 2023 · 4fd1bc4 · 4fd1bc4
1 parent 96c017c
commit 4fd1bc4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git 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
@@ -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: {}