Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 23 additions & 1 deletion pkg/plugins/autodiscovery/argocd/application.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ type ArgoCDApplicationSpec struct {
Sources []ApplicationSourceSpec
Template struct {
Spec struct {
Source ApplicationSourceSpec
Source ApplicationSourceSpec
Sources []ApplicationSourceSpec
}
}
}
Expand Down Expand Up @@ -151,6 +152,27 @@ func (f ArgoCD) discoverArgoCDManifests() ([][]byte, error) {
manifests = append(manifests, manifest)
}
}

for i, source := range data.Spec.Template.Spec.Sources {
if source.IsZero() {
continue
}

manifest, err := f.generateManifestBySource(
source,
relativeFilepath,
fmt.Sprintf("$.spec.template.spec.sources[%d]", i),
documentIndex,
)
if err != nil {
logrus.Errorf("error discovering application source: %s", err)
continue
}

if manifest != nil {
manifests = append(manifests, manifest)
}
}
}
}

Expand Down
44 changes: 44 additions & 0 deletions pkg/plugins/autodiscovery/argocd/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,50 @@ targets:
key: '$.spec.source.targetRevision'
documentindex: 0
sourceid: 'nginx'
`},
},
{
name: "ArgoCD ApplicationSet manifests discovery with several sources",
rootDir: "testdata/appset-sealed-secrets_sources",
expectedPipelines: []string{`name: 'deps(helm): bump Helm chart "sealed-secrets" in ArgoCD manifest "manifest.yaml"'
sources:
sealed-secrets:
name: 'Get latest "sealed-secrets" Helm chart version'
kind: 'helmchart'
spec:
name: 'sealed-secrets'
url: 'https://bitnami-labs.github.io/sealed-secrets'
versionfilter:
kind: 'semver'
pattern: '*'
conditions:
sealed-secrets-name:
name: 'Ensure Helm chart name sealed-secrets is specified'
kind: 'yaml'
disablesourceinput: true
spec:
file: 'manifest.yaml'
key: '$.spec.template.spec.sources[0].chart'
documentindex: 0
value: 'sealed-secrets'
sealed-secrets-repository:
name: 'Ensure Helm chart repository https://bitnami-labs.github.io/sealed-secrets is specified'
kind: 'yaml'
disablesourceinput: true
spec:
file: 'manifest.yaml'
key: '$.spec.template.spec.sources[0].repoURL'
documentindex: 0
value: 'https://bitnami-labs.github.io/sealed-secrets'
targets:
sealed-secrets:
name: 'deps(helm): update Helm chart "sealed-secrets" to {{ source "sealed-secrets" }}'
kind: 'yaml'
spec:
file: 'manifest.yaml'
key: '$.spec.template.spec.sources[0].targetRevision'
documentindex: 0
sourceid: 'sealed-secrets'
`},
},
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
apiVersion: argoproj.io/v1alpha1
kind: ApplicationSet
metadata:
name: sealed-secrets
namespace: argocd
spec:
generators:
- list:
elements:
- cluster: cluster-1
url: https://kubernetes.default.svc
template:
metadata:
name: sealed-secrets-{{cluster}}
spec:
project: default
sources:
- chart: sealed-secrets
repoURL: https://bitnami-labs.github.io/sealed-secrets
targetRevision: 1.16.1
helm:
releaseName: sealed-secrets
- repoURL: 'https://git.example.com/org/value-files.git'
targetRevision: HEAD
ref: values
destination:
server: "{{url}}"
namespace: kubeseal
3 changes: 2 additions & 1 deletion pkg/plugins/autodiscovery/argocd/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ func readManifest(filename string) (map[int]*ArgoCDApplicationSpec, error) {
// Check if the document contains a source definition that we can use to generate an Updatecli manifest
if !data.Spec.Source.IsZero() ||
!data.Spec.Template.Spec.Source.IsZero() ||
len(data.Spec.Sources) > 0 {
len(data.Spec.Sources) > 0 ||
len(data.Spec.Template.Spec.Sources) > 0 {
result[docNum-1] = &data
}

Expand Down
1 change: 1 addition & 0 deletions pkg/plugins/autodiscovery/argocd/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ func TestSearchFiles(t *testing.T) {
}

expectedFiles := []string{
"testdata/appset-sealed-secrets_sources/manifest.yaml",
"testdata/empty/manifest.yaml",
"testdata/multi-release/manifest.yaml",
"testdata/oci-helm-source/manifest.yaml",
Expand Down
Loading