Skip to content

fix: a simple runtime application ends up being out-of-sync #1049

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

Open
ATGardner wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: a simple runtime application ends up being out-of-sync #1049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ Determine argocd redis url
{{- else }}
{{- printf "" }}
{{- end }}
{{- end}}
{{- end }}

{{/*
Determine argo worklofws server name
Expand Down
5 changes: 4 additions & 1 deletion charts/gitops-runtime/templates/argo-gateway/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{{- define "argo-gateway.resources.configmap.defaults" }}
argocd.server: {{ include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . }}
repo.server: {{ include "codefresh-gitops-runtime.argocd.reposerver.url" . }}
redis.server: {{ include "codefresh-gitops-runtime.argocd.redis.url" . }}
{{- $redisServer := (include "codefresh-gitops-runtime.argocd.redis.url" .) }}
{{- if $redisServer }}
redis.server: {{ $redisServer }}
{{- end }}
{{- end }}

{{- $defaultConfig := (include "argo-gateway.resources.configmap.defaults" . | fromYaml ) }}
Expand Down
5 changes: 4 additions & 1 deletion charts/gitops-runtime/templates/event-reporters/cluster-event-reporter/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{{- define "cluster-event-reporter.resources.configmap.defaults" }}
argocd.server: {{ include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . }}
redis.server: {{ include "codefresh-gitops-runtime.argocd.redis.url" . }}
repo.server: {{ include "codefresh-gitops-runtime.argocd.reposerver.url" . }}
{{- $redisServer := (include "codefresh-gitops-runtime.argocd.redis.url" .) }}
{{- if $redisServer }}
redis.server: {{ $redisServer }}
{{- end }}
argo-gateway.server: http://argo-gateway
resource.threadiness: '100'
app.queue.size: '1000'
Expand Down
5 changes: 4 additions & 1 deletion charts/gitops-runtime/templates/event-reporters/runtime-event-reporter/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{{- define "runtime-event-reporter.resources.configmap.defaults"}}
argocd.server: {{ include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . }}
redis.server: {{ include "codefresh-gitops-runtime.argocd.redis.url" . }}
repo.server: {{ include "codefresh-gitops-runtime.argocd.reposerver.url" . }}
{{- $redisServer := (include "codefresh-gitops-runtime.argocd.redis.url" .) }}
{{- if $redisServer }}
redis.server: {{ $redisServer }}
{{- end }}
argo-gateway.server: http://argo-gateway
resource.threadiness: '10'
app.queue.size: '1000'
Expand Down
3 changes: 1 addition & 2 deletions charts/gitops-runtime/tests/argo-api-gateway_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ tests:
- equal:
path: data["argocd.server"]
value: argo-cd-server:80
- equal:
- notExists:
path: data["redis.server"]
value: null
- equal:
path: data["repo.server"]
value: argo-cd-repo-server:8081
Expand Down
3 changes: 1 addition & 2 deletions charts/gitops-runtime/tests/event-reporters_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ tests:
- equal:
path: data["argocd.server"]
value: argo-cd-server:80
- equal:
- notExists:
path: data["redis.server"]
value: null
- equal:
path: data["repo.server"]
value: argo-cd-repo-server:8081
Expand Down