fix app-proxy cm and add script to adopt CRDs (#15)

* fix app-proxy cm

Author: ilia-medvedev-codefresh

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

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
 

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 }}

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

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
+