From 0f20a7b6fafbc0e168c8531748ca3a7301a40868 Mon Sep 17 00:00:00 2001 From: Ilia Medvedev Date: Sun, 12 Mar 2023 18:29:57 +0200 Subject: [PATCH 1/2] fix app-proxy cm --- charts/gitops-runtime/Chart.yaml | 2 +- charts/gitops-runtime/README.md | 2 +- .../templates/_components/cap-app-proxy/_config.yaml | 6 +++--- scripts/adopt-crds.sh | 7 +++++++ 4 files changed, 12 insertions(+), 5 deletions(-) create mode 100755 scripts/adopt-crds.sh diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index df9fe70b..5609e892 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v0.0.1 description: A Helm chart for Codefresh gitops runtime name: gitops-runtime -version: 0.2.0-alpha-7 +version: 0.2.0-alpha-8 home: https://github.com/codefresh-io/gitops-runtime-helm keywords: - codefresh diff --git a/charts/gitops-runtime/README.md b/charts/gitops-runtime/README.md index 5668a9af..946c9783 100644 --- a/charts/gitops-runtime/README.md +++ b/charts/gitops-runtime/README.md @@ -1,6 +1,6 @@ # gitops-runtime -![Version: 0.2.0-alpha-7](https://img.shields.io/badge/Version-0.2.0--alpha--7-informational?style=flat-square) ![AppVersion: v0.0.1](https://img.shields.io/badge/AppVersion-v0.0.1-informational?style=flat-square) +![Version: 0.2.0-alpha-8](https://img.shields.io/badge/Version-0.2.0--alpha--8-informational?style=flat-square) ![AppVersion: v0.0.1](https://img.shields.io/badge/AppVersion-v0.0.1-informational?style=flat-square) A Helm chart for Codefresh gitops runtime diff --git a/charts/gitops-runtime/templates/_components/cap-app-proxy/_config.yaml b/charts/gitops-runtime/templates/_components/cap-app-proxy/_config.yaml index e9818361..742b0f18 100644 --- a/charts/gitops-runtime/templates/_components/cap-app-proxy/_config.yaml +++ b/charts/gitops-runtime/templates/_components/cap-app-proxy/_config.yaml @@ -18,8 +18,8 @@ data: enrichmentConcurrencyCmKey: {{ $enrichmentValues.config.concurrencyCmKey }} enrichmentServiceAccountName: {{ $enrichmentValues.serviceAccount.name }} enrichmentPodGcStrategy: {{ $enrichmentValues.config.podGcStrategy }} - enrichmentTtlAfterCompletionInSeconds: {{ $enrichmentValues.config.ttlAfterCompletionInSeconds }} - enrichmentTtlActiveInSeconds: {{ $enrichmentValues.config.ttlActiveInSeconds }} - enrichmentClientHeartbeatIntervalInSeconds: {{ $enrichmentValues.config.clientHeartbeatIntervalInSeconds }} + enrichmentTtlAfterCompletionInSeconds: {{ $enrichmentValues.config.ttlAfterCompletionInSeconds | quote }} + enrichmentTtlActiveInSeconds: {{ $enrichmentValues.config.ttlActiveInSeconds | quote }} + enrichmentClientHeartbeatIntervalInSeconds: {{ $enrichmentValues.config.clientHeartbeatIntervalInSeconds | quote }} {{- end }} {{- end }} diff --git a/scripts/adopt-crds.sh b/scripts/adopt-crds.sh new file mode 100755 index 00000000..c9f6a88c --- /dev/null +++ b/scripts/adopt-crds.sh @@ -0,0 +1,7 @@ +#!/bin/sh +RELEASE=$1 +NAMESPACE=$2 +kubectl label --overwrite crds $(kubectl get crd | grep argoproj.io | awk '{print $1}' | xargs) app.kubernetes.io/managed-by=Helm +kubectl annotate --overwrite crds $(kubectl get crd | grep argoproj.io | awk '{print $1}' | xargs) meta.helm.sh/release-name=$RELEASE +kubectl annotate --overwrite crds $(kubectl get crd | grep argoproj.io | awk '{print $1}' | xargs) meta.helm.sh/release-namespace=$NAMESPACE + From 37bbec6972fae21f8705fa9245deb426be32ff1b Mon Sep 17 00:00:00 2001 From: Ilia Medvedev Date: Sun, 12 Mar 2023 18:36:48 +0200 Subject: [PATCH 2/2] fix app-proxy cm --- .../tests/app-proxy-image-enrichemnt_test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/gitops-runtime/tests/app-proxy-image-enrichemnt_test.yaml b/charts/gitops-runtime/tests/app-proxy-image-enrichemnt_test.yaml index 61eb5967..e03faf80 100644 --- a/charts/gitops-runtime/tests/app-proxy-image-enrichemnt_test.yaml +++ b/charts/gitops-runtime/tests/app-proxy-image-enrichemnt_test.yaml @@ -42,13 +42,13 @@ tests: value: test - equal: path: data.enrichmentTtlAfterCompletionInSeconds - value: 1 + value: "1" - equal: path: data.enrichmentTtlActiveInSeconds - value: 1 + value: "1" - equal: path: data.enrichmentClientHeartbeatIntervalInSeconds - value: 1 + value: "1" - equal: path: data.enrichmentServiceAccountName value: test