Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 12, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f20a7b
fix app-proxy cm
ilia-medvedev-codefresh Mar 12, 2023
37bbec6
fix app-proxy cm
ilia-medvedev-codefresh Mar 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/gitops-runtime/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/gitops-runtime/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/_components/cap-app-proxy/_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
6 changes: 3 additions & 3 deletions charts/gitops-runtime/tests/app-proxy-image-enrichemnt_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions scripts/adopt-crds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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