diff --git a/.github/tests/images.json b/.github/tests/images.json index 2c05c82..9df5b9f 100644 --- a/.github/tests/images.json +++ b/.github/tests/images.json @@ -7,8 +7,8 @@ }, { "query": "chown.image", - "filter": "LATESTSHA", - "sort-flags": [] + "filter": "^[0-9]\\+\\.[0-9]\\+\\.[0-9]\\+-uclibc$", + "sort-flags": ["-t", ".", "-k1,1n", "-k2,2n", "-k3,3n"] }, { "query": "tools.busybox.image", diff --git a/charts/spire/charts/spire-server/README.md b/charts/spire/charts/spire-server/README.md index 52cf13a..70c6366 100644 --- a/charts/spire/charts/spire-server/README.md +++ b/charts/spire/charts/spire-server/README.md @@ -466,10 +466,10 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr | `customPlugins.nodeAttestor` | Custom plugins of type NodeAttestor are configured here | `{}` | | `customPlugins.upstreamAuthority` | Custom plugins of type upstreamAuthority are configured here | `{}` | | `customPlugins.notifier` | Custom plugins of type notifier are configured here | `{}` | -| `chown.image.registry` | The OCI registry to pull the image from | `cgr.dev` | -| `chown.image.repository` | The repository within the registry | `chainguard/bash` | +| `chown.image.registry` | The OCI registry to pull the image from | `""` | +| `chown.image.repository` | The repository within the registry | `busybox` | | `chown.image.pullPolicy` | The image pull policy | `Always` | -| `chown.image.tag` | Overrides the image tag whose default is the chart appVersion | `latest@sha256:28c83a645bb2d55d617d9bc8874ac62362b07cc6ad446bdd5c3d53177da21edc` | +| `chown.image.tag` | Overrides the image tag whose default is the chart appVersion | `1.37.0-uclibc` | | `chown.resources` | Specify resource needs as per https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ | `{}` | | `experimental.enabled` | Allow configuration of experimental features | `false` | | `experimental.cacheReloadInterval` | The amount of time between two reloads of the in-memory entry cache. | `5s` | diff --git a/charts/spire/charts/spire-server/templates/server-resource.yaml b/charts/spire/charts/spire-server/templates/server-resource.yaml index ab5c718..51087bd 100644 --- a/charts/spire/charts/spire-server/templates/server-resource.yaml +++ b/charts/spire/charts/spire-server/templates/server-resource.yaml @@ -180,7 +180,7 @@ spec: - name: chown image: {{ template "spire-lib.image" (dict "image" .Values.chown.image "global" .Values.global) }} imagePullPolicy: {{ .Values.chown.image.pullPolicy }} - command: ["bash", "-c"] + command: ["sh", "-c"] args: - | chown -R {{ $podSecurityContext.runAsUser }}:{{ $podSecurityContext.runAsGroup }} /var/lib/spire diff --git a/charts/spire/charts/spire-server/values.yaml b/charts/spire/charts/spire-server/values.yaml index 69ebd1f..e9ed90c 100644 --- a/charts/spire/charts/spire-server/values.yaml +++ b/charts/spire/charts/spire-server/values.yaml @@ -1191,10 +1191,10 @@ chown: ## @param chown.image.tag Overrides the image tag whose default is the chart appVersion ## image: - registry: cgr.dev - repository: chainguard/bash + registry: "" + repository: busybox pullPolicy: Always - tag: latest@sha256:28c83a645bb2d55d617d9bc8874ac62362b07cc6ad446bdd5c3d53177da21edc + tag: 1.37.0-uclibc ## @param chown.resources Specify resource needs as per https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ resources: {}