diff --git a/charts/backstage/Chart.yaml b/charts/backstage/Chart.yaml index 6d4bb148..dd435a58 100644 --- a/charts/backstage/Chart.yaml +++ b/charts/backstage/Chart.yaml @@ -44,4 +44,8 @@ sources: # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) +<<<<<<< HEAD version: 4.0.1 +======= +version: 3.1.1 +>>>>>>> b8d50e3 (chore: Update curl container securityContext settings) diff --git a/charts/backstage/README.md b/charts/backstage/README.md index 84a74e8b..d62f78ee 100644 --- a/charts/backstage/README.md +++ b/charts/backstage/README.md @@ -2,7 +2,11 @@ # RHDH Backstage Helm Chart for OpenShift (Community Version) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/rhdh-chart&style=flat-square)](https://artifacthub.io/packages/search?repo=rhdh-chart) +<<<<<<< HEAD ![Version: 4.0.1](https://img.shields.io/badge/Version-4.0.1-informational?style=flat-square) +======= +![Version: 3.1.1](https://img.shields.io/badge/Version-3.1.1-informational?style=flat-square) +>>>>>>> b8d50e3 (chore: Update curl container securityContext settings) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) A Helm chart for deploying Red Hat Developer Hub. @@ -219,10 +223,10 @@ Kubernetes: `>= 1.25.0-0` | route.tls.key | Key file contents | string | `""` | | route.tls.termination | Specify TLS termination. | string | `"edge"` | | route.wildcardPolicy | Wildcard policy if any for the route. Currently only 'Subdomain' or 'None' is allowed. | string | `"None"` | -| test | Test pod parameters | object | `{"enabled":true,"image":{"registry":"quay.io","repository":"curl/curl","tag":"latest"}}` | +| test | Test pod parameters | object | `{"enabled":true,"image":{"registry":"quay.io","repository":"fedora/fedora-minimal","tag":"latest"}}` | | test.enabled | Whether to enable the test-connection pod used for testing the Release using `helm test`. | bool | `true` | | test.image.registry | Test connection pod image registry | string | `"quay.io"` | -| test.image.repository | Test connection pod image repository. Note that the image needs to have both the `sh` and `curl` binaries in it. | string | `"curl/curl"` | +| test.image.repository | Test connection pod image repository. Note that the image needs to have both the `sh` and `curl` binaries in it. | string | `"fedora/fedora-minimal"` | | test.image.tag | Test connection pod image tag. Note that the image needs to have both the `sh` and `curl` binaries in it. | string | `"latest"` | | upstream | Upstream Backstage [chart configuration](https://github.com/backstage/charts/blob/main/charts/backstage/values.yaml) | object | Use Openshift compatible settings | | upstream.backstage.extraVolumes[0] | Ephemeral volume that will contain the dynamic plugins installed by the initContainer below at start. | object | `{"ephemeral":{"volumeClaimTemplate":{"spec":{"accessModes":["ReadWriteOnce"],"resources":{"requests":{"storage":"5Gi"}}}}},"name":"dynamic-plugins-root"}` | diff --git a/charts/backstage/templates/tests/test-connection.yaml b/charts/backstage/templates/tests/test-connection.yaml index b8aee686..3c59a411 100644 --- a/charts/backstage/templates/tests/test-connection.yaml +++ b/charts/backstage/templates/tests/test-connection.yaml @@ -18,7 +18,9 @@ spec: readOnlyRootFilesystem: true capabilities: drop: ["ALL"] - runAsNonRoot: false + runAsNonRoot: true + seccompProfile: + type: RuntimeDefault resources: requests: cpu: 10m diff --git a/charts/backstage/values.yaml b/charts/backstage/values.yaml index cd060d57..6f851ebb 100644 --- a/charts/backstage/values.yaml +++ b/charts/backstage/values.yaml @@ -339,7 +339,7 @@ test: registry: quay.io # -- Test connection pod image repository. Note that the image needs to have both the `sh` and `curl` binaries in it. - repository: curl/curl + repository: fedora/fedora-minimal # -- Test connection pod image tag. Note that the image needs to have both the `sh` and `curl` binaries in it. tag: latest