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: skip ArgoCD Application plugin if not set #365

Merged
merged 2 commits into from
Dec 27, 2024
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#@data/values
---
argocd:
app:
source:
plugin: null
2 changes: 2 additions & 0 deletions examples/integration-tests/envs/dev/env-data.ytt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ environment:
#! applications: # already defined one level above
#! - proto: httpbingo # already defined one level above
applications:
- proto: ytt-render-test
name: argocd-tests
- proto: helm-render-test
name: helm-installation
- proto: per-chart-override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: app-mykso-dev-argocd-tests
namespace: system-argocd
finalizers:
- resources-finalizer.argocd.argoproj.io
spec:
project: env-mykso-dev
destination:
name: mykso-dev
namespace: argocd-tests
source:
path: examples/integration-tests/rendered/envs/mykso-dev/argocd-tests
repoURL: [email protected]:mykso/myks.git
targetRevision: main
syncPolicy:
automated:
prune: true
selfHeal: true
syncOptions:
- CreateNamespace=true
- ServerSideApply=true
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: rendering
metadata:
name: base
outputYaml:
fromPrototype: true
fromPrototypeAppData: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: rendering
metadata:
name: proto
outputYaml:
fromPrototypeOverride: true
fromPrototypeOverrideFromAppData: true
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ spec:
namespace: httpbingo
source:
path: examples/simple/rendered/envs/mykso-dev/httpbingo
plugin: null
repoURL: [email protected]:mykso/myks.git
targetRevision: main
syncPolicy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ spec:
namespace: httpbingo
source:
path: examples/simple/rendered/envs/mykso-prod/httpbingo
plugin: null
repoURL: [email protected]:mykso/myks.git
targetRevision: main
syncPolicy:
Expand Down
1 change: 1 addition & 0 deletions internal/myks/templates/argocd/application.ytt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ spec:
namespace: #@ a.app.destination.namespace or a.app.name
source:
path: #@ a.app.source.path
#@ if/end a.app.source.plugin:
plugin: #@ a.app.source.plugin
repoURL: #@ a.app.source.repoURL
targetRevision: #@ a.app.source.targetRevision
Expand Down
Loading