Skip to content

Fix volumes when configManagementPlugins is set #93

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

Closed
sector2000 wants to merge 1 commit into from
Closed

Fix volumes when configManagementPlugins is set #93

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
4 changes: 2 additions & 2 deletions .github/workflows/helm-unittest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ on: [push, pull_request]

jobs:
build:
name: Run helm lint over the chart
name: Run helm unittest over the chart
# It has to be 24.04 because -latest has a podman version that is too old
runs-on: ubuntu-24.04

steps:
- name: Checkout Code
uses: actions/checkout@v6

- name: Run make helmlint
- name: Run make helmunittest
run: |
make helm-unittest
19 changes: 9 additions & 10 deletions templates/plumbing/argocd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,15 @@ spec:
name: trusted-hub-bundle
- emptyDir: {}
name: ca-bundles
{{- if len $.Values.clusterGroup.argoCD.configManagementPlugins }}
- emptyDir: {}
name: cmp-tmp
{{- range $cmp := $.Values.clusterGroup.argoCD.configManagementPlugins }}
- configMap:
name: "argocd-cmp-{{ $cmp.name }}"
name: {{ $cmp.name }}
{{- end }}
{{- end }}
{{- if len $.Values.clusterGroup.argoCD.configManagementPlugins }}
sidecarContainers:
{{- range $cmp := $.Values.clusterGroup.argoCD.configManagementPlugins }}
Expand All @@ -125,16 +134,6 @@ spec:
{{- end }}
{{- end }}
{{- end }}
{{- if len $.Values.clusterGroup.argoCD.configManagementPlugins }}
volumes:
- emptyDir: {}
name: cmp-tmp
{{- range $cmp := $.Values.clusterGroup.argoCD.configManagementPlugins }}
- configMap:
name: "argocd-cmp-{{ $cmp.name }}"
name: {{ $cmp.name }}
{{- end }}
{{- end }}
{{- if $.Values.clusterGroup.argoCD.resourceExclusions }}
resourceExclusions: {{- $.Values.clusterGroup.argoCD.resourceExclusions | toYaml | indent 2 }}
{{- end }}
Expand Down
29 changes: 29 additions & 0 deletions tests/argocd_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,3 +203,32 @@ tests:
- echo
image: test
name: test

- it: should render volumes correctly when configManagementPlugins is set
set:
clusterGroup:
argoCD:
configManagementPlugins:
- name: test
image: test
pluginConfig: |
test
documentIndex: 0
asserts:
- contains:
path: spec.repo.volumes
content:
configMap:
name: kube-root-ca.crt
name: kube-root-ca
- contains:
path: spec.repo.volumes
content:
emptyDir: {}
name: cmp-tmp
- contains:
path: spec.repo.volumes
content:
configMap:
name: argocd-cmp-test
name: test