diff --git a/helm-valueFiles-glob/Chart.yaml b/helm-valueFiles-glob/Chart.yaml new file mode 100644 index 0000000000..841612b50b --- /dev/null +++ b/helm-valueFiles-glob/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: demo-app +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "1.16.0" diff --git a/helm-valueFiles-glob/apps/app-01.yaml b/helm-valueFiles-glob/apps/app-01.yaml new file mode 100644 index 0000000000..a4f006fe21 --- /dev/null +++ b/helm-valueFiles-glob/apps/app-01.yaml @@ -0,0 +1,16 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: glob-single-star +spec: + source: + repoURL: https://github.com/argoproj/argocd-example-apps.git + targetRevision: HEAD + path: helm-valueFiles-glob + helm: + valueFiles: + - values/single-star/*.yaml + destination: + server: https://kubernetes.default.svc + namespace: default + project: default \ No newline at end of file diff --git a/helm-valueFiles-glob/apps/app-02.yaml b/helm-valueFiles-glob/apps/app-02.yaml new file mode 100644 index 0000000000..e18ba46682 --- /dev/null +++ b/helm-valueFiles-glob/apps/app-02.yaml @@ -0,0 +1,16 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: glob-double-star +spec: + source: + repoURL: https://github.com/argoproj/argocd-example-apps.git + targetRevision: HEAD + path: helm-valueFiles-glob + helm: + valueFiles: + - values/double-star/**/*.yaml # a.yaml, b.yaml, nested/c.yaml + destination: + server: https://kubernetes.default.svc + namespace: default + project: default \ No newline at end of file diff --git a/helm-valueFiles-glob/apps/app-03.yaml b/helm-valueFiles-glob/apps/app-03.yaml new file mode 100644 index 0000000000..b080ddec1c --- /dev/null +++ b/helm-valueFiles-glob/apps/app-03.yaml @@ -0,0 +1,16 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: glob-numeric-prefix +spec: + source: + repoURL: https://github.com/argoproj/argocd-example-apps.git + targetRevision: HEAD + path: helm-valueFiles-glob + helm: + valueFiles: + - values/numeric-prefix/*.yaml # 00-, 10-, 20- will be applied in that order + destination: + server: https://kubernetes.default.svc + namespace: default + project: default \ No newline at end of file diff --git a/helm-valueFiles-glob/apps/app-04.yaml b/helm-valueFiles-glob/apps/app-04.yaml new file mode 100644 index 0000000000..401cea598b --- /dev/null +++ b/helm-valueFiles-glob/apps/app-04.yaml @@ -0,0 +1,16 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: glob-multi-key +spec: + source: + repoURL: https://github.com/argoproj/argocd-example-apps.git + targetRevision: HEAD + path: helm-valueFiles-glob + helm: + valueFiles: + - values/multi-key/*.yaml # a.yaml, b.yaml will be applied in that order + destination: + server: https://kubernetes.default.svc + namespace: default + project: default \ No newline at end of file diff --git a/helm-valueFiles-glob/apps/app-05.yaml b/helm-valueFiles-glob/apps/app-05.yaml new file mode 100644 index 0000000000..58fba6d40b --- /dev/null +++ b/helm-valueFiles-glob/apps/app-05.yaml @@ -0,0 +1,18 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: glob-multi-entry +spec: + source: + repoURL: https://github.com/argoproj/argocd-example-apps.git + targetRevision: HEAD + path: helm-valueFiles-glob + helm: + valueFiles: + - values/multi-entry/base.yaml + - values/multi-entry/overrides/*.yaml # x.yaml and y.yaml + - values/multi-entry/final.yaml + destination: + server: https://kubernetes.default.svc + namespace: default + project: default \ No newline at end of file diff --git a/helm-valueFiles-glob/apps/app-06.yaml b/helm-valueFiles-glob/apps/app-06.yaml new file mode 100644 index 0000000000..936f840a69 --- /dev/null +++ b/helm-valueFiles-glob/apps/app-06.yaml @@ -0,0 +1,16 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: glob-char-class +spec: + source: + repoURL: https://github.com/argoproj/argocd-example-apps.git + targetRevision: HEAD + path: helm-valueFiles-glob + helm: + valueFiles: + - values/char-class/[a-b].yaml # a.yaml, b.yaml (c.yaml will be ignored) + destination: + server: https://kubernetes.default.svc + namespace: default + project: default \ No newline at end of file diff --git a/helm-valueFiles-glob/apps/app-07.yaml b/helm-valueFiles-glob/apps/app-07.yaml new file mode 100644 index 0000000000..20cb347977 --- /dev/null +++ b/helm-valueFiles-glob/apps/app-07.yaml @@ -0,0 +1,16 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: glob-single-char-wildcard +spec: + source: + repoURL: https://github.com/argoproj/argocd-example-apps.git + targetRevision: HEAD + path: helm-valueFiles-glob + helm: + valueFiles: + - values/single-char-wildcard/e?.yaml # ea.yaml and eb.yaml (eab.yaml will be ignored) + destination: + server: https://kubernetes.default.svc + namespace: default + project: default \ No newline at end of file diff --git a/helm-valueFiles-glob/apps/app-08.yaml b/helm-valueFiles-glob/apps/app-08.yaml new file mode 100644 index 0000000000..940cefa372 --- /dev/null +++ b/helm-valueFiles-glob/apps/app-08.yaml @@ -0,0 +1,18 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: glob-ignore-missing +spec: + source: + repoURL: https://github.com/argoproj/argocd-example-apps.git + targetRevision: HEAD + path: helm-valueFiles-glob + helm: + ignoreMissingValueFiles: true + valueFiles: + # no files will be matched, but since ignoreMissingValueFiles is true, it will not error out + # hence default values will be used for the helm chart + - values/no-match/staging-*.yaml + server: https://kubernetes.default.svc + namespace: default + project: default diff --git a/helm-valueFiles-glob/templates/cm.yaml b/helm-valueFiles-glob/templates/cm.yaml new file mode 100644 index 0000000000..d2a795ec1a --- /dev/null +++ b/helm-valueFiles-glob/templates/cm.yaml @@ -0,0 +1,7 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: my-config +data: + foo: {{ .Values.foo }} + bar: {{ .Values.bar }} diff --git a/helm-valueFiles-glob/values.yaml b/helm-valueFiles-glob/values.yaml new file mode 100644 index 0000000000..9254562929 --- /dev/null +++ b/helm-valueFiles-glob/values.yaml @@ -0,0 +1,2 @@ +foo: default +bar: default diff --git a/helm-valueFiles-glob/values/char-class/a.yaml b/helm-valueFiles-glob/values/char-class/a.yaml new file mode 100644 index 0000000000..cab5d41486 --- /dev/null +++ b/helm-valueFiles-glob/values/char-class/a.yaml @@ -0,0 +1 @@ +foo: a-value \ No newline at end of file diff --git a/helm-valueFiles-glob/values/char-class/b.yaml b/helm-valueFiles-glob/values/char-class/b.yaml new file mode 100644 index 0000000000..720fd44836 --- /dev/null +++ b/helm-valueFiles-glob/values/char-class/b.yaml @@ -0,0 +1 @@ +foo: b-value \ No newline at end of file diff --git a/helm-valueFiles-glob/values/char-class/c.yaml b/helm-valueFiles-glob/values/char-class/c.yaml new file mode 100644 index 0000000000..62b52cf0ca --- /dev/null +++ b/helm-valueFiles-glob/values/char-class/c.yaml @@ -0,0 +1 @@ +foo: c-value \ No newline at end of file diff --git a/helm-valueFiles-glob/values/double-star/a.yaml b/helm-valueFiles-glob/values/double-star/a.yaml new file mode 100644 index 0000000000..cab5d41486 --- /dev/null +++ b/helm-valueFiles-glob/values/double-star/a.yaml @@ -0,0 +1 @@ +foo: a-value \ No newline at end of file diff --git a/helm-valueFiles-glob/values/double-star/b.yaml b/helm-valueFiles-glob/values/double-star/b.yaml new file mode 100644 index 0000000000..720fd44836 --- /dev/null +++ b/helm-valueFiles-glob/values/double-star/b.yaml @@ -0,0 +1 @@ +foo: b-value \ No newline at end of file diff --git a/helm-valueFiles-glob/values/double-star/nested/c.yaml b/helm-valueFiles-glob/values/double-star/nested/c.yaml new file mode 100644 index 0000000000..62b52cf0ca --- /dev/null +++ b/helm-valueFiles-glob/values/double-star/nested/c.yaml @@ -0,0 +1 @@ +foo: c-value \ No newline at end of file diff --git a/helm-valueFiles-glob/values/ignore-missing/real.yaml b/helm-valueFiles-glob/values/ignore-missing/real.yaml new file mode 100644 index 0000000000..3af4ceac2e --- /dev/null +++ b/helm-valueFiles-glob/values/ignore-missing/real.yaml @@ -0,0 +1 @@ +foo: real-value \ No newline at end of file diff --git a/helm-valueFiles-glob/values/multi-entry/base.yaml b/helm-valueFiles-glob/values/multi-entry/base.yaml new file mode 100644 index 0000000000..e4716c1d28 --- /dev/null +++ b/helm-valueFiles-glob/values/multi-entry/base.yaml @@ -0,0 +1 @@ +foo: base-value \ No newline at end of file diff --git a/helm-valueFiles-glob/values/multi-entry/final.yaml b/helm-valueFiles-glob/values/multi-entry/final.yaml new file mode 100644 index 0000000000..757856b5e5 --- /dev/null +++ b/helm-valueFiles-glob/values/multi-entry/final.yaml @@ -0,0 +1 @@ +foo: final-value \ No newline at end of file diff --git a/helm-valueFiles-glob/values/multi-entry/overrides/x.yaml b/helm-valueFiles-glob/values/multi-entry/overrides/x.yaml new file mode 100644 index 0000000000..85ba144949 --- /dev/null +++ b/helm-valueFiles-glob/values/multi-entry/overrides/x.yaml @@ -0,0 +1 @@ +foo: x-value \ No newline at end of file diff --git a/helm-valueFiles-glob/values/multi-entry/overrides/y.yaml b/helm-valueFiles-glob/values/multi-entry/overrides/y.yaml new file mode 100644 index 0000000000..f8bec276ce --- /dev/null +++ b/helm-valueFiles-glob/values/multi-entry/overrides/y.yaml @@ -0,0 +1 @@ +foo: y-value \ No newline at end of file diff --git a/helm-valueFiles-glob/values/multi-key/a.yaml b/helm-valueFiles-glob/values/multi-key/a.yaml new file mode 100644 index 0000000000..09368cf07a --- /dev/null +++ b/helm-valueFiles-glob/values/multi-key/a.yaml @@ -0,0 +1 @@ +foo: foo-from-a \ No newline at end of file diff --git a/helm-valueFiles-glob/values/multi-key/b.yaml b/helm-valueFiles-glob/values/multi-key/b.yaml new file mode 100644 index 0000000000..b146a090b5 --- /dev/null +++ b/helm-valueFiles-glob/values/multi-key/b.yaml @@ -0,0 +1 @@ +bar: bar-from-b \ No newline at end of file diff --git a/helm-valueFiles-glob/values/no-match/real.yaml b/helm-valueFiles-glob/values/no-match/real.yaml new file mode 100644 index 0000000000..3af4ceac2e --- /dev/null +++ b/helm-valueFiles-glob/values/no-match/real.yaml @@ -0,0 +1 @@ +foo: real-value \ No newline at end of file diff --git a/helm-valueFiles-glob/values/numeric-prefix/00-base.yaml b/helm-valueFiles-glob/values/numeric-prefix/00-base.yaml new file mode 100644 index 0000000000..b54f5d320c --- /dev/null +++ b/helm-valueFiles-glob/values/numeric-prefix/00-base.yaml @@ -0,0 +1 @@ +foo: base \ No newline at end of file diff --git a/helm-valueFiles-glob/values/numeric-prefix/10-region.yaml b/helm-valueFiles-glob/values/numeric-prefix/10-region.yaml new file mode 100644 index 0000000000..a437bbed4e --- /dev/null +++ b/helm-valueFiles-glob/values/numeric-prefix/10-region.yaml @@ -0,0 +1 @@ +foo: region \ No newline at end of file diff --git a/helm-valueFiles-glob/values/numeric-prefix/20-env.yaml b/helm-valueFiles-glob/values/numeric-prefix/20-env.yaml new file mode 100644 index 0000000000..7ab70e08eb --- /dev/null +++ b/helm-valueFiles-glob/values/numeric-prefix/20-env.yaml @@ -0,0 +1 @@ +foo: dev \ No newline at end of file diff --git a/helm-valueFiles-glob/values/single-char-wildcard/ea.yaml b/helm-valueFiles-glob/values/single-char-wildcard/ea.yaml new file mode 100644 index 0000000000..1d7638fd3d --- /dev/null +++ b/helm-valueFiles-glob/values/single-char-wildcard/ea.yaml @@ -0,0 +1 @@ +foo: from-ea \ No newline at end of file diff --git a/helm-valueFiles-glob/values/single-char-wildcard/eab.yaml b/helm-valueFiles-glob/values/single-char-wildcard/eab.yaml new file mode 100644 index 0000000000..b5f52e1a00 --- /dev/null +++ b/helm-valueFiles-glob/values/single-char-wildcard/eab.yaml @@ -0,0 +1,2 @@ +foo: overriden-by-eab +bar: overriden-by-eab \ No newline at end of file diff --git a/helm-valueFiles-glob/values/single-char-wildcard/eb.yaml b/helm-valueFiles-glob/values/single-char-wildcard/eb.yaml new file mode 100644 index 0000000000..f4aa5e796b --- /dev/null +++ b/helm-valueFiles-glob/values/single-char-wildcard/eb.yaml @@ -0,0 +1 @@ +bar: from-eb \ No newline at end of file diff --git a/helm-valueFiles-glob/values/single-star/a.yaml b/helm-valueFiles-glob/values/single-star/a.yaml new file mode 100644 index 0000000000..cab5d41486 --- /dev/null +++ b/helm-valueFiles-glob/values/single-star/a.yaml @@ -0,0 +1 @@ +foo: a-value \ No newline at end of file diff --git a/helm-valueFiles-glob/values/single-star/b.yaml b/helm-valueFiles-glob/values/single-star/b.yaml new file mode 100644 index 0000000000..720fd44836 --- /dev/null +++ b/helm-valueFiles-glob/values/single-star/b.yaml @@ -0,0 +1 @@ +foo: b-value \ No newline at end of file