Skip to content
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.

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

fix(argo-cd): Pass commit.server parameter to the application controller to account for the commitServer service name. #3185

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

Conversation

daftping
Copy link
Contributor

@daftping daftping commented Mar 1, 2025

  • pass commit.server parameter to the application controller to account for the commitServer service name.
  • align service definition for commitServer with rest of the chart
  • respect global log settings in commitserver component

Diff

diff --recursive .tmp/manifests_old/argo-cd/templates/argocd-application-controller/statefulset.yaml .tmp/manifests_new/argo-cd/templates/argocd-application-controller/statefulset.yaml
27c27
<         checksum/cmd-params: 7f9ab655f97c07d18371fb74e1eed52ab343b2e05812ea40bae8b868fcae8d37
---
>         checksum/cmd-params: 8292fa4e5925f6f9c66e744f6d44187809f0f9d851e09b24506c6fab32061f91
75a76,81
>                 optional: true
>           - name: ARGOCD_APPLICATION_CONTROLLER_COMMIT_SERVER
>             valueFrom:
>               configMapKeyRef:
>                 name: argocd-cmd-params-cm
>                 key: commit.server
diff --recursive .tmp/manifests_old/argo-cd/templates/argocd-applicationset/deployment.yaml .tmp/manifests_new/argo-cd/templates/argocd-applicationset/deployment.yaml
26c26
<         checksum/cmd-params: 7f9ab655f97c07d18371fb74e1eed52ab343b2e05812ea40bae8b868fcae8d37
---
>         checksum/cmd-params: 8292fa4e5925f6f9c66e744f6d44187809f0f9d851e09b24506c6fab32061f91
diff --recursive .tmp/manifests_old/argo-cd/templates/argocd-commit-server/service.yaml .tmp/manifests_new/argo-cd/templates/argocd-commit-server/service.yaml
21c21
<     targetPort: 8086
---
>     targetPort: server
diff --recursive .tmp/manifests_old/argo-cd/templates/argocd-configs/argocd-cmd-params-cm.yaml .tmp/manifests_new/argo-cd/templates/argocd-configs/argocd-cmd-params-cm.yaml
23a24,26
>   commit.server: test-argocd-commit-server:8086
>   commitserver.log.format: text
>   commitserver.log.level: info
diff --recursive .tmp/manifests_old/argo-cd/templates/argocd-repo-server/deployment.yaml .tmp/manifests_new/argo-cd/templates/argocd-repo-server/deployment.yaml
26c26
<         checksum/cmd-params: 7f9ab655f97c07d18371fb74e1eed52ab343b2e05812ea40bae8b868fcae8d37
---
>         checksum/cmd-params: 8292fa4e5925f6f9c66e744f6d44187809f0f9d851e09b24506c6fab32061f91
diff --recursive .tmp/manifests_old/argo-cd/templates/argocd-server/deployment.yaml .tmp/manifests_new/argo-cd/templates/argocd-server/deployment.yaml
26c26
<         checksum/cmd-params: 7f9ab655f97c07d18371fb74e1eed52ab343b2e05812ea40bae8b868fcae8d37
---
>         checksum/cmd-params: 8292fa4e5925f6f9c66e744f6d44187809f0f9d851e09b24506c6fab32061f91
diff --recursive .tmp/manifests_old/argo-cd/templates/dex/deployment.yaml .tmp/manifests_new/argo-cd/templates/dex/deployment.yaml
26c26
<         checksum/cmd-params: 7f9ab655f97c07d18371fb74e1eed52ab343b2e05812ea40bae8b868fcae8d37
---
>         checksum/cmd-params: 8292fa4e5925f6f9c66e744f6d44187809f0f9d851e09b24506c6fab32061f91

Checklist:

  • I have bumped the chart version according to versioning
  • I have updated the documentation according to documentation
  • I have updated the chart changelog with all the changes that come with this pull request according to changelog.
  • Any new values are backwards compatible and/or have sensible default.
  • I have signed off all my commits as required by DCO.
  • My build is green (troubleshooting builds).

…ler to account for the commitServer service name.

Signed-off-by: daftping <[email protected]>
@yu-croco
Copy link
Collaborator

yu-croco commented Mar 3, 2025

Hi @daftping , thank you for your PR.
Since we follow upstream's manifest, can you please make PR in upstream at first?

I findARGOCD_APPLICATION_CONTROLLER_COMMIT_SERVER in Golang logic here, but not in manifests/ .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants