From 3cfca5f147f91e468f660063a6dbaae8a13b1d17 Mon Sep 17 00:00:00 2001 From: carolina valencia Date: Tue, 6 Sep 2022 21:31:18 -0300 Subject: [PATCH 1/2] chore: merge main and update line --- .github/workflows/publish-chart.yaml | 6 +++--- helm/trivy/values.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-chart.yaml b/.github/workflows/publish-chart.yaml index 4d25b867850..8eebea8ec33 100644 --- a/.github/workflows/publish-chart.yaml +++ b/.github/workflows/publish-chart.yaml @@ -15,8 +15,8 @@ env: HELM_REP: helm-charts GH_OWNER: aquasecurity CHART_DIR: helm/trivy - KIND_VERSION: "v0.11.1" - KIND_IMAGE: "kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6" + KIND_VERSION: "v0.14.0" + KIND_IMAGE: "kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae" jobs: test-chart: runs-on: ubuntu-20.04 @@ -45,7 +45,7 @@ jobs: run: ct lint-and-install --validate-maintainers=false --charts helm/trivy - name: Run chart-testing (Ingress enabled) run: | - sed -i -e '117s,false,'true',g' ./helm/trivy/values.yaml + sed -i -e '133s,false,'true',g' ./helm/trivy/values.yaml ct lint-and-install --validate-maintainers=false --charts helm/trivy publish-chart: diff --git a/helm/trivy/values.yaml b/helm/trivy/values.yaml index f4063666226..c074c402eac 100644 --- a/helm/trivy/values.yaml +++ b/helm/trivy/values.yaml @@ -28,7 +28,7 @@ resources: rbac: create: true - pspEnabled: true + pspEnabled: false podSecurityContext: runAsUser: 65534 From f153516a39b33c1e3b81bcdad3cc9fff1fd9d2b7 Mon Sep 17 00:00:00 2001 From: carolina valencia Date: Tue, 6 Sep 2022 21:31:23 -0300 Subject: [PATCH 2/2] chore: merge main and update line --- .github/workflows/publish-chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-chart.yaml b/.github/workflows/publish-chart.yaml index 8eebea8ec33..c984dee56c8 100644 --- a/.github/workflows/publish-chart.yaml +++ b/.github/workflows/publish-chart.yaml @@ -45,7 +45,7 @@ jobs: run: ct lint-and-install --validate-maintainers=false --charts helm/trivy - name: Run chart-testing (Ingress enabled) run: | - sed -i -e '133s,false,'true',g' ./helm/trivy/values.yaml + sed -i -e '136s,false,'true',g' ./helm/trivy/values.yaml ct lint-and-install --validate-maintainers=false --charts helm/trivy publish-chart: