diff --git a/charts/spire/charts/spiffe-csi-driver/README.md b/charts/spire/charts/spiffe-csi-driver/README.md index f6297fb..cfcb628 100644 --- a/charts/spire/charts/spiffe-csi-driver/README.md +++ b/charts/spire/charts/spiffe-csi-driver/README.md @@ -31,7 +31,6 @@ A Helm chart to install the SPIFFE CSI driver. | `image.registry` | The OCI registry to pull the image from | `ghcr.io` | | `image.repository` | The repository within the registry | `spiffe/spiffe-csi-driver` | | `image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `image.tag` | Overrides the image tag whose default is the chart appVersion | `""` | | `resources` | Resource requests and limits for spiffe-csi-driver | `{}` | | `healthChecks.port` | The healthcheck port for spiffe-csi-driver | `9809` | @@ -55,7 +54,6 @@ A Helm chart to install the SPIFFE CSI driver. | `nodeDriverRegistrar.image.registry` | The OCI registry to pull the image from | `registry.k8s.io` | | `nodeDriverRegistrar.image.repository` | The repository within the registry | `sig-storage/csi-node-driver-registrar` | | `nodeDriverRegistrar.image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `nodeDriverRegistrar.image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `nodeDriverRegistrar.image.tag` | Overrides the image tag | `v2.9.3` | | `nodeDriverRegistrar.resources` | Resource requests and limits for CSI driver pods | `{}` | | `agentSocketPath` | The unix socket path to the spire-agent | `/run/spire/agent-sockets/spire-agent.sock` | diff --git a/charts/spire/charts/spiffe-csi-driver/values.yaml b/charts/spire/charts/spiffe-csi-driver/values.yaml index 84822f1..8eebf6f 100644 --- a/charts/spire/charts/spiffe-csi-driver/values.yaml +++ b/charts/spire/charts/spiffe-csi-driver/values.yaml @@ -12,14 +12,12 @@ pluginName: csi.spiffe.io ## @param image.registry The OCI registry to pull the image from ## @param image.repository The repository within the registry ## @param image.pullPolicy The image pull policy -## @param image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param image.tag Overrides the image tag whose default is the chart appVersion ## image: registry: ghcr.io repository: spiffe/spiffe-csi-driver pullPolicy: IfNotPresent - version: "" tag: "" ## @param resources [object] Resource requests and limits for spiffe-csi-driver @@ -102,14 +100,12 @@ nodeDriverRegistrar: ## @param nodeDriverRegistrar.image.registry The OCI registry to pull the image from ## @param nodeDriverRegistrar.image.repository The repository within the registry ## @param nodeDriverRegistrar.image.pullPolicy The image pull policy - ## @param nodeDriverRegistrar.image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param nodeDriverRegistrar.image.tag Overrides the image tag ## image: registry: registry.k8s.io repository: sig-storage/csi-node-driver-registrar pullPolicy: IfNotPresent - version: "" tag: v2.9.3 ## @param nodeDriverRegistrar.resources Resource requests and limits for CSI driver pods resources: {} diff --git a/charts/spire/charts/spiffe-oidc-discovery-provider/README.md b/charts/spire/charts/spiffe-oidc-discovery-provider/README.md index 5b4babe..7ba8d5c 100644 --- a/charts/spire/charts/spiffe-oidc-discovery-provider/README.md +++ b/charts/spire/charts/spiffe-oidc-discovery-provider/README.md @@ -35,7 +35,6 @@ A Helm chart to install the SPIFFE OIDC discovery provider. | `image.registry` | The OCI registry to pull the image from | `ghcr.io` | | `image.repository` | The repository within the registry | `spiffe/oidc-discovery-provider` | | `image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `image.tag` | Overrides the image tag whose default is the chart appVersion | `""` | | `resources` | Resource requests and limits | `{}` | | `service.type` | Service type | `ClusterIP` | @@ -95,7 +94,6 @@ A Helm chart to install the SPIFFE OIDC discovery provider. | `telemetry.prometheus.nginxExporter.image.registry` | The OCI registry to pull the image from | `docker.io` | | `telemetry.prometheus.nginxExporter.image.repository` | The repository within the registry | `nginx/nginx-prometheus-exporter` | | `telemetry.prometheus.nginxExporter.image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `telemetry.prometheus.nginxExporter.image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `telemetry.prometheus.nginxExporter.image.tag` | Overrides the image tag whose default is the chart appVersion | `1.0.0` | | `telemetry.prometheus.nginxExporter.resources` | Resource requests and limits | `{}` | | `ingress.enabled` | Flag to enable ingress | `false` | @@ -112,30 +110,24 @@ A Helm chart to install the SPIFFE OIDC discovery provider. | `tests.bash.image.registry` | The OCI registry to pull the image from | `cgr.dev` | | `tests.bash.image.repository` | The repository within the registry | `chainguard/bash` | | `tests.bash.image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `tests.bash.image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `tests.bash.image.tag` | Overrides the image tag whose default is the chart appVersion | `latest@sha256:07d2662ef699e9ceafab3f39624083193dfcb7b768ee86860dbdd5cb4473dcea` | | `tests.toolkit.image.registry` | The OCI registry to pull the image from | `cgr.dev` | | `tests.toolkit.image.repository` | The repository within the registry | `chainguard/slim-toolkit-debug` | | `tests.toolkit.image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `tests.toolkit.image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `tests.toolkit.image.tag` | Overrides the image tag whose default is the chart appVersion | `latest@sha256:9cb7fff3f1b11f2b8f699abb33e287b3edec0dd1efc81d085550f7c88731ec12` | | `tests.step.image.registry` | The OCI registry to pull the image from | `docker.io` | | `tests.step.image.repository` | The repository within the registry | `smallstep/step-cli` | | `tests.step.image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `tests.step.image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `tests.step.image.tag` | Overrides the image tag whose default is the chart appVersion | `0.25.1` | | `tests.busybox.image.registry` | The OCI registry to pull the image from | `""` | | `tests.busybox.image.repository` | The repository within the registry | `busybox` | | `tests.busybox.image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `tests.busybox.image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `tests.busybox.image.tag` | Overrides the image tag whose default is the chart appVersion | `1.36.1-uclibc` | | `tests.agent.image.registry` | The OCI registry to pull the image from | `ghcr.io` | | `tests.agent.image.repository` | The repository within the registry | `spiffe/spire-agent` | | `tests.agent.image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `tests.agent.image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `tests.agent.image.tag` | Overrides the image tag whose default is the chart appVersion | `""` | | `tools.kubectl.image.registry` | The OCI registry to pull the image from | `docker.io` | | `tools.kubectl.image.repository` | The repository within the registry | `rancher/kubectl` | | `tools.kubectl.image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `tools.kubectl.image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `tools.kubectl.image.tag` | Overrides the image tag whose default is the chart appVersion | `""` | diff --git a/charts/spire/charts/spiffe-oidc-discovery-provider/values.yaml b/charts/spire/charts/spiffe-oidc-discovery-provider/values.yaml index ee5f859..80fcc5d 100644 --- a/charts/spire/charts/spiffe-oidc-discovery-provider/values.yaml +++ b/charts/spire/charts/spiffe-oidc-discovery-provider/values.yaml @@ -24,13 +24,11 @@ image: ## @param image.registry The OCI registry to pull the image from ## @param image.repository The repository within the registry ## @param image.pullPolicy The image pull policy - ## @param image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param image.tag Overrides the image tag whose default is the chart appVersion ## registry: ghcr.io repository: spiffe/oidc-discovery-provider pullPolicy: IfNotPresent - version: "" tag: "" ## @param resources [object] Resource requests and limits @@ -244,14 +242,12 @@ telemetry: ## @param telemetry.prometheus.nginxExporter.image.registry The OCI registry to pull the image from ## @param telemetry.prometheus.nginxExporter.image.repository The repository within the registry ## @param telemetry.prometheus.nginxExporter.image.pullPolicy The image pull policy - ## @param telemetry.prometheus.nginxExporter.image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param telemetry.prometheus.nginxExporter.image.tag Overrides the image tag whose default is the chart appVersion ## image: registry: docker.io repository: nginx/nginx-prometheus-exporter pullPolicy: IfNotPresent - version: "" tag: "1.0.0" ## @param telemetry.prometheus.nginxExporter.resources [object] Resource requests and limits @@ -312,70 +308,60 @@ tests: ## @param tests.bash.image.registry The OCI registry to pull the image from ## @param tests.bash.image.repository The repository within the registry ## @param tests.bash.image.pullPolicy The image pull policy - ## @param tests.bash.image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param tests.bash.image.tag Overrides the image tag whose default is the chart appVersion ## image: registry: cgr.dev repository: chainguard/bash pullPolicy: IfNotPresent - version: "" tag: latest@sha256:07d2662ef699e9ceafab3f39624083193dfcb7b768ee86860dbdd5cb4473dcea toolkit: ## @param tests.toolkit.image.registry The OCI registry to pull the image from ## @param tests.toolkit.image.repository The repository within the registry ## @param tests.toolkit.image.pullPolicy The image pull policy - ## @param tests.toolkit.image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param tests.toolkit.image.tag Overrides the image tag whose default is the chart appVersion ## image: registry: cgr.dev repository: chainguard/slim-toolkit-debug pullPolicy: IfNotPresent - version: "" tag: latest@sha256:9cb7fff3f1b11f2b8f699abb33e287b3edec0dd1efc81d085550f7c88731ec12 step: ## @param tests.step.image.registry The OCI registry to pull the image from ## @param tests.step.image.repository The repository within the registry ## @param tests.step.image.pullPolicy The image pull policy - ## @param tests.step.image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param tests.step.image.tag Overrides the image tag whose default is the chart appVersion ## image: registry: "docker.io" repository: smallstep/step-cli pullPolicy: IfNotPresent - version: "" tag: 0.25.1 busybox: ## @param tests.busybox.image.registry The OCI registry to pull the image from ## @param tests.busybox.image.repository The repository within the registry ## @param tests.busybox.image.pullPolicy The image pull policy - ## @param tests.busybox.image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param tests.busybox.image.tag Overrides the image tag whose default is the chart appVersion ## image: registry: "" repository: busybox pullPolicy: IfNotPresent - version: "" tag: 1.36.1-uclibc agent: ## @param tests.agent.image.registry The OCI registry to pull the image from ## @param tests.agent.image.repository The repository within the registry ## @param tests.agent.image.pullPolicy The image pull policy - ## @param tests.agent.image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param tests.agent.image.tag Overrides the image tag whose default is the chart appVersion ## image: registry: ghcr.io repository: spiffe/spire-agent pullPolicy: IfNotPresent - version: "" tag: "" tools: @@ -383,12 +369,10 @@ tools: ## @param tools.kubectl.image.registry The OCI registry to pull the image from ## @param tools.kubectl.image.repository The repository within the registry ## @param tools.kubectl.image.pullPolicy The image pull policy - ## @param tools.kubectl.image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param tools.kubectl.image.tag Overrides the image tag whose default is the chart appVersion ## image: registry: docker.io repository: rancher/kubectl pullPolicy: IfNotPresent - version: "" tag: "" diff --git a/charts/spire/charts/spire-agent/README.md b/charts/spire/charts/spire-agent/README.md index 20038b3..a178397 100644 --- a/charts/spire/charts/spire-agent/README.md +++ b/charts/spire/charts/spire-agent/README.md @@ -30,7 +30,6 @@ A Helm chart to install the SPIRE agent. | `image.registry` | The OCI registry to pull the image from | `ghcr.io` | | `image.repository` | The repository within the registry | `spiffe/spire-agent` | | `image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `image.tag` | Overrides the image tag whose default is the chart appVersion | `""` | | `imagePullSecrets` | Pull secrets for images | `[]` | | `nameOverride` | Name override | `""` | @@ -63,13 +62,11 @@ A Helm chart to install the SPIRE agent. | `waitForIt.image.registry` | The OCI registry to pull the image from | `cgr.dev` | | `waitForIt.image.repository` | The repository within the registry | `chainguard/wait-for-it` | | `waitForIt.image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `waitForIt.image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `waitForIt.image.tag` | Overrides the image tag whose default is the chart appVersion | `latest@sha256:fdd8d70cdb1e0383f77b6f7820552f0b330a526d967ed996b01ee30cc026f4fb` | | `waitForIt.resources` | Resource requests and limits | `{}` | | `fsGroupFix.image.registry` | The OCI registry to pull the image from | `cgr.dev` | | `fsGroupFix.image.repository` | The repository within the registry | `chainguard/bash` | | `fsGroupFix.image.pullPolicy` | The image pull policy | `Always` | -| `fsGroupFix.image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `fsGroupFix.image.tag` | Overrides the image tag whose default is the chart appVersion | `latest@sha256:07d2662ef699e9ceafab3f39624083193dfcb7b768ee86860dbdd5cb4473dcea` | | `fsGroupFix.resources` | Specify resource needs as per https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ | `{}` | | `workloadAttestors.unix.enabled` | Enables the Unix workload attestor | `false` | diff --git a/charts/spire/charts/spire-agent/values.yaml b/charts/spire/charts/spire-agent/values.yaml index 6690daf..c3115ac 100644 --- a/charts/spire/charts/spire-agent/values.yaml +++ b/charts/spire/charts/spire-agent/values.yaml @@ -9,14 +9,12 @@ global: {} ## @param image.registry The OCI registry to pull the image from ## @param image.repository The repository within the registry ## @param image.pullPolicy The image pull policy -## @param image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param image.tag Overrides the image tag whose default is the chart appVersion ## image: registry: ghcr.io repository: spiffe/spire-agent pullPolicy: IfNotPresent - version: "" tag: "" ## @param imagePullSecrets [array] Pull secrets for images @@ -126,14 +124,12 @@ waitForIt: ## @param waitForIt.image.registry The OCI registry to pull the image from ## @param waitForIt.image.repository The repository within the registry ## @param waitForIt.image.pullPolicy The image pull policy - ## @param waitForIt.image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param waitForIt.image.tag Overrides the image tag whose default is the chart appVersion ## image: registry: cgr.dev repository: chainguard/wait-for-it pullPolicy: IfNotPresent - version: "" tag: latest@sha256:fdd8d70cdb1e0383f77b6f7820552f0b330a526d967ed996b01ee30cc026f4fb ## @param waitForIt.resources [object] Resource requests and limits @@ -145,14 +141,12 @@ fsGroupFix: ## @param fsGroupFix.image.registry The OCI registry to pull the image from ## @param fsGroupFix.image.repository The repository within the registry ## @param fsGroupFix.image.pullPolicy The image pull policy - ## @param fsGroupFix.image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param fsGroupFix.image.tag Overrides the image tag whose default is the chart appVersion ## image: registry: cgr.dev repository: chainguard/bash pullPolicy: Always - version: "" tag: latest@sha256:07d2662ef699e9ceafab3f39624083193dfcb7b768ee86860dbdd5cb4473dcea ## @param fsGroupFix.resources Specify resource needs as per https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ diff --git a/charts/spire/charts/spire-server/README.md b/charts/spire/charts/spire-server/README.md index 2cd2dc1..a9d6ff0 100644 --- a/charts/spire/charts/spire-server/README.md +++ b/charts/spire/charts/spire-server/README.md @@ -85,7 +85,6 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr | `image.registry` | The OCI registry to pull the image from | `ghcr.io` | | `image.repository` | The repository within the registry | `spiffe/spire-server` | | `image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `image.tag` | Overrides the image tag whose default is the chart appVersion | `""` | | `imagePullSecrets` | Pull secrets for images | `[]` | | `nameOverride` | Name override | `""` | @@ -216,7 +215,6 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr | `controllerManager.image.registry` | The OCI registry to pull the image from | `ghcr.io` | | `controllerManager.image.repository` | The repository within the registry | `spiffe/spire-controller-manager` | | `controllerManager.image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `controllerManager.image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `controllerManager.image.tag` | Overrides the image tag whose default is the chart appVersion | `0.4.0` | | `controllerManager.resources` | Resource requests and limits for controller manager | `{}` | | `controllerManager.securityContext` | Security context | `{}` | @@ -249,7 +247,6 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr | `tools.kubectl.image.registry` | The OCI registry to pull the image from | `docker.io` | | `tools.kubectl.image.repository` | The repository within the registry | `rancher/kubectl` | | `tools.kubectl.image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `tools.kubectl.image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `tools.kubectl.image.tag` | Overrides the image tag whose default is the chart appVersion | `""` | | `telemetry.prometheus.enabled` | Flag to enable prometheus monitoring | `false` | | `telemetry.prometheus.podMonitor.enabled` | Enable podMonitor for prometheus | `false` | @@ -282,7 +279,6 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr | `tornjak.image.registry` | The OCI registry to pull the image from | `ghcr.io` | | `tornjak.image.repository` | The repository within the registry | `spiffe/tornjak-backend` | | `tornjak.image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `tornjak.image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `tornjak.image.tag` | Overrides the image tag to be whatever you need it to be. It will always be the flag you set without modifications | `""` | | `tornjak.image.defaultTag` | Sets the default image to use when image.tag is not set. It will automatically be updated with a ubi- prefix if on OpenShift. | `v1.4.2` | | `tornjak.service.type` | Type of service resource | `ClusterIP` | @@ -323,5 +319,4 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr | `tests.bash.image.registry` | The OCI registry to pull the image from | `cgr.dev` | | `tests.bash.image.repository` | The repository within the registry | `chainguard/bash` | | `tests.bash.image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `tests.bash.image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `tests.bash.image.tag` | Overrides the image tag whose default is the chart appVersion | `latest@sha256:07d2662ef699e9ceafab3f39624083193dfcb7b768ee86860dbdd5cb4473dcea` | diff --git a/charts/spire/charts/spire-server/values.yaml b/charts/spire/charts/spire-server/values.yaml index 8a2b827..3f5b4e5 100644 --- a/charts/spire/charts/spire-server/values.yaml +++ b/charts/spire/charts/spire-server/values.yaml @@ -12,14 +12,12 @@ replicaCount: 1 ## @param image.registry The OCI registry to pull the image from ## @param image.repository The repository within the registry ## @param image.pullPolicy The image pull policy -## @param image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param image.tag Overrides the image tag whose default is the chart appVersion ## image: registry: ghcr.io repository: spiffe/spire-server pullPolicy: IfNotPresent - version: "" tag: "" ## @param imagePullSecrets [array] Pull secrets for images @@ -393,14 +391,12 @@ controllerManager: ## @param controllerManager.image.registry The OCI registry to pull the image from ## @param controllerManager.image.repository The repository within the registry ## @param controllerManager.image.pullPolicy The image pull policy - ## @param controllerManager.image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param controllerManager.image.tag Overrides the image tag whose default is the chart appVersion ## image: registry: ghcr.io repository: spiffe/spire-controller-manager pullPolicy: IfNotPresent - version: "" tag: "0.4.0" ## @param controllerManager.resources [object] Resource requests and limits for controller manager @@ -534,14 +530,12 @@ tools: ## @param tools.kubectl.image.registry The OCI registry to pull the image from ## @param tools.kubectl.image.repository The repository within the registry ## @param tools.kubectl.image.pullPolicy The image pull policy - ## @param tools.kubectl.image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param tools.kubectl.image.tag Overrides the image tag whose default is the chart appVersion ## image: registry: docker.io repository: rancher/kubectl pullPolicy: IfNotPresent - version: "" tag: "" telemetry: @@ -624,7 +618,6 @@ tornjak: ## @param tornjak.image.registry The OCI registry to pull the image from ## @param tornjak.image.repository The repository within the registry ## @param tornjak.image.pullPolicy The image pull policy - ## @param tornjak.image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param tornjak.image.tag Overrides the image tag to be whatever you need it to be. It will always be the flag you set without modifications ## @param tornjak.image.defaultTag Sets the default image to use when image.tag is not set. It will automatically be updated with a ubi- prefix if on OpenShift. ## @@ -632,7 +625,6 @@ tornjak: registry: ghcr.io repository: spiffe/tornjak-backend pullPolicy: IfNotPresent - version: "" tag: "" defaultTag: "v1.4.2" @@ -768,12 +760,10 @@ tests: ## @param tests.bash.image.registry The OCI registry to pull the image from ## @param tests.bash.image.repository The repository within the registry ## @param tests.bash.image.pullPolicy The image pull policy - ## @param tests.bash.image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param tests.bash.image.tag Overrides the image tag whose default is the chart appVersion ## image: registry: cgr.dev repository: chainguard/bash pullPolicy: IfNotPresent - version: "" tag: latest@sha256:07d2662ef699e9ceafab3f39624083193dfcb7b768ee86860dbdd5cb4473dcea diff --git a/charts/spire/charts/tornjak-frontend/README.md b/charts/spire/charts/tornjak-frontend/README.md index 1fdaef9..b8c947a 100644 --- a/charts/spire/charts/tornjak-frontend/README.md +++ b/charts/spire/charts/tornjak-frontend/README.md @@ -60,7 +60,6 @@ port forwarding. See the chart NOTES output for more details. | `image.registry` | The OCI registry to pull the image from | `ghcr.io` | | `image.repository` | The repository within the registry | `spiffe/tornjak-frontend` | | `image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `image.tag` | Overrides the image tag whose default is the chart appVersion | `""` | | `imagePullSecrets` | Pull secrets for images | `[]` | | `nameOverride` | Name override | `""` | @@ -99,5 +98,4 @@ port forwarding. See the chart NOTES output for more details. | `tests.bash.image.registry` | The OCI registry to pull the image from | `cgr.dev` | | `tests.bash.image.repository` | The repository within the registry | `chainguard/bash` | | `tests.bash.image.pullPolicy` | The image pull policy | `IfNotPresent` | -| `tests.bash.image.version` | This value is deprecated in favor of tag. (Will be removed in a future release) | `""` | | `tests.bash.image.tag` | Overrides the image tag whose default is the chart appVersion | `latest@sha256:07d2662ef699e9ceafab3f39624083193dfcb7b768ee86860dbdd5cb4473dcea` | diff --git a/charts/spire/charts/tornjak-frontend/values.yaml b/charts/spire/charts/tornjak-frontend/values.yaml index d1bbf5b..bdac7e5 100644 --- a/charts/spire/charts/tornjak-frontend/values.yaml +++ b/charts/spire/charts/tornjak-frontend/values.yaml @@ -9,14 +9,12 @@ global: {} ## @param image.registry The OCI registry to pull the image from ## @param image.repository The repository within the registry ## @param image.pullPolicy The image pull policy -## @param image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param image.tag Overrides the image tag whose default is the chart appVersion ## image: registry: ghcr.io repository: spiffe/tornjak-frontend pullPolicy: IfNotPresent - version: "" tag: "" ## @param imagePullSecrets [array] Pull secrets for images @@ -150,12 +148,10 @@ tests: ## @param tests.bash.image.registry The OCI registry to pull the image from ## @param tests.bash.image.repository The repository within the registry ## @param tests.bash.image.pullPolicy The image pull policy - ## @param tests.bash.image.version This value is deprecated in favor of tag. (Will be removed in a future release) ## @param tests.bash.image.tag Overrides the image tag whose default is the chart appVersion ## image: registry: cgr.dev repository: chainguard/bash pullPolicy: IfNotPresent - version: "" tag: latest@sha256:07d2662ef699e9ceafab3f39624083193dfcb7b768ee86860dbdd5cb4473dcea diff --git a/charts/spire/templates/_spire-lib.tpl b/charts/spire/templates/_spire-lib.tpl index 614e05e..99a2e07 100644 --- a/charts/spire/templates/_spire-lib.tpl +++ b/charts/spire/templates/_spire-lib.tpl @@ -51,7 +51,7 @@ {{- define "spire-lib.image" -}} {{- $registry := include "spire-lib.registry" . }} {{- $repo := .image.repository }} -{{- $tag := (default .image.tag .image.version) | toString }} +{{- $tag := .image.tag | toString }} {{- if eq (substr 0 7 $tag) "sha256:" }} {{- printf "%s/%s@%s" $registry $repo $tag }} {{- else if .appVersion }} @@ -169,7 +169,7 @@ rules: {{- define "spire-lib.kubectl-image" }} {{- $root := deepCopy . }} -{{- $tag := (default $root.image.tag $root.image.version) | toString }} +{{- $tag := $root.image.tag | toString }} {{- if eq (len $tag) 0 }} {{- $_ := set $root.image "tag" (regexReplaceAll "^(v?\\d+\\.\\d+\\.\\d+).*" $root.KubeVersion "${1}") }} {{- end }}