From 36263cc6df3a0fd969a408d29eadb8e491fa08f4 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 15 Apr 2023 05:02:41 +0000 Subject: [PATCH] moved $appvalues --- k8s/argoapps/templates/appvalues.yaml | 18 +++++++++ k8s/argoapps/templates/argoappset-apps.yaml | 4 +- k8s/argoapps/templates/charts-infra.yaml | 4 +- k8s/argoapps/templates/secrets.yaml | 2 +- k8s/argoapps/templates/storage.yaml | 4 +- k8s/argoapps/values.yaml | 4 ++ .../values/dev/global.yaml | 0 .../values/dev/ingresses.yaml | 0 .../values/prod/global.yaml | 0 .../values/prod/ingresses.yaml | 0 .../values/shared/global.yaml | 4 -- .../values/shared/infrastructureCharts.yaml | 0 .../values/shared/ingresses.yaml | 0 .../values/shared/secrets.yaml | 0 .../values/shared/storage.yaml | 0 k8s/argocd/templates/app-self.yaml | 39 +++++++------------ k8s/argocd/values.yaml | 3 ++ 17 files changed, 45 insertions(+), 37 deletions(-) create mode 100644 k8s/argoapps/templates/appvalues.yaml rename k8s/{argocd => argoapps}/values/dev/global.yaml (100%) rename k8s/{argocd => argoapps}/values/dev/ingresses.yaml (100%) rename k8s/{argocd => argoapps}/values/prod/global.yaml (100%) rename k8s/{argocd => argoapps}/values/prod/ingresses.yaml (100%) rename k8s/{argocd => argoapps}/values/shared/global.yaml (80%) rename k8s/{argocd => argoapps}/values/shared/infrastructureCharts.yaml (100%) rename k8s/{argocd => argoapps}/values/shared/ingresses.yaml (100%) rename k8s/{argocd => argoapps}/values/shared/secrets.yaml (100%) rename k8s/{argocd => argoapps}/values/shared/storage.yaml (100%) diff --git a/k8s/argoapps/templates/appvalues.yaml b/k8s/argoapps/templates/appvalues.yaml new file mode 100644 index 0000000..74eb71b --- /dev/null +++ b/k8s/argoapps/templates/appvalues.yaml @@ -0,0 +1,18 @@ +--- +{{ $currentScope := .}} +{{- $appvalues := dict -}} +{{ range $path, $_ := .Files.Glob "values/shared/**.yaml" }} + {{- with $currentScope }} + {{ $newobj := .Files.Get $path | fromYaml }} + {{ $appvalues := mergeOverwrite $appvalues $newobj }} + {{- end -}} +{{ end }} + +{{- $deploymentPath := printf "values/%s/**.yaml" .Values.deployment -}} +{{ range $path, $_ := .Files.Glob $deploymentPath }} + {{- with $currentScope }} + {{ $newobj := .Files.Get $path | fromYaml }} + {{ $appvalues := mergeOverwrite $appvalues $newobj }} + {{- end -}} +{{ end }} +--- \ No newline at end of file diff --git a/k8s/argoapps/templates/argoappset-apps.yaml b/k8s/argoapps/templates/argoappset-apps.yaml index d566f1e..2e57a9a 100644 --- a/k8s/argoapps/templates/argoappset-apps.yaml +++ b/k8s/argoapps/templates/argoappset-apps.yaml @@ -2,7 +2,7 @@ {{ include "homelab.argo.project" (dict "name" $argoappsetApps "description" "common applications")}} -{{ range $appName, $appProps := .Values.apps }} +{{ range $appName, $appProps := $appvalues.apps }} {{- $namespace := (printf "apps-%s" $appName) -}} @@ -26,7 +26,7 @@ spec: helm: valueFiles: - values.yaml - - values-{{$.Values.global.deployment}}.yaml + - values-{{$.Values.deployment}}.yaml values: |- {{- tpl $appProps $ | nindent 10 }} global: diff --git a/k8s/argoapps/templates/charts-infra.yaml b/k8s/argoapps/templates/charts-infra.yaml index 641b294..3438f9a 100644 --- a/k8s/argoapps/templates/charts-infra.yaml +++ b/k8s/argoapps/templates/charts-infra.yaml @@ -1,7 +1,7 @@ {{- $infraChartProjectName := "infrastructure-charts" -}} {{ include "homelab.argo.project" (dict "name" $infraChartProjectName "description" "infrastructure helm charts")}} -{{ range $chartName, $chartProps := .Values.infrastructureCharts }} +{{ range $chartName, $chartProps := $appvalues.infrastructureCharts }} {{- $namespace := (printf "chart-%s" $chartName) -}} @@ -24,7 +24,7 @@ spec: targetRevision: {{ $chartProps.targetRevision }} helm: values: |- - {{- tpl ($chartProps.values | default "") $ | nindent 8}} + {{- tpl ($chartProps.values | default "") $appvalues | nindent 8}} releaseName: {{ $chartName }} destination: server: https://kubernetes.default.svc diff --git a/k8s/argoapps/templates/secrets.yaml b/k8s/argoapps/templates/secrets.yaml index 4b3c34b..293990b 100644 --- a/k8s/argoapps/templates/secrets.yaml +++ b/k8s/argoapps/templates/secrets.yaml @@ -1,4 +1,4 @@ -{{ range $_, $secretsData := .Values.secrets }} +{{ range $_, $secretsData := $appvalues.secrets }} --- apiVersion: external-secrets.io/v1beta1 kind: ClusterSecretStore diff --git a/k8s/argoapps/templates/storage.yaml b/k8s/argoapps/templates/storage.yaml index 0d9c5d7..234c824 100644 --- a/k8s/argoapps/templates/storage.yaml +++ b/k8s/argoapps/templates/storage.yaml @@ -1,4 +1,4 @@ -{{ range $key, $value := .Values.storage }} +{{ range $key, $value := $appvalues.storage }} --- apiVersion: v1 kind: PersistentVolumeClaim @@ -6,7 +6,7 @@ metadata: name: {{ $value.name }} namespace: {{ $value.namespace }} spec: - storageClassName: {{ $.Values.global.nfs.storageClass }} + storageClassName: {{ $appvalues.global.nfs.storageClass }} accessModes: {{- $value.accessModes | toYaml | nindent 4 }} resources: diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index e69de29..7108424 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -0,0 +1,4 @@ +deployment: "" +gitops: + repo: "" + commit: "" diff --git a/k8s/argocd/values/dev/global.yaml b/k8s/argoapps/values/dev/global.yaml similarity index 100% rename from k8s/argocd/values/dev/global.yaml rename to k8s/argoapps/values/dev/global.yaml diff --git a/k8s/argocd/values/dev/ingresses.yaml b/k8s/argoapps/values/dev/ingresses.yaml similarity index 100% rename from k8s/argocd/values/dev/ingresses.yaml rename to k8s/argoapps/values/dev/ingresses.yaml diff --git a/k8s/argocd/values/prod/global.yaml b/k8s/argoapps/values/prod/global.yaml similarity index 100% rename from k8s/argocd/values/prod/global.yaml rename to k8s/argoapps/values/prod/global.yaml diff --git a/k8s/argocd/values/prod/ingresses.yaml b/k8s/argoapps/values/prod/ingresses.yaml similarity index 100% rename from k8s/argocd/values/prod/ingresses.yaml rename to k8s/argoapps/values/prod/ingresses.yaml diff --git a/k8s/argocd/values/shared/global.yaml b/k8s/argoapps/values/shared/global.yaml similarity index 80% rename from k8s/argocd/values/shared/global.yaml rename to k8s/argoapps/values/shared/global.yaml index dbce286..43b22f5 100644 --- a/k8s/argocd/values/shared/global.yaml +++ b/k8s/argoapps/values/shared/global.yaml @@ -1,5 +1,4 @@ global: - deployment: "" email: "ariel@sosnovsky.ca" timezone: America/Toronto domain: "" @@ -12,6 +11,3 @@ global: storageClass: "nfs-generic" server: "changme" share: "changeme" -gitops: - commit: "stable" - repo: "asosnovsky/homelab" \ No newline at end of file diff --git a/k8s/argocd/values/shared/infrastructureCharts.yaml b/k8s/argoapps/values/shared/infrastructureCharts.yaml similarity index 100% rename from k8s/argocd/values/shared/infrastructureCharts.yaml rename to k8s/argoapps/values/shared/infrastructureCharts.yaml diff --git a/k8s/argocd/values/shared/ingresses.yaml b/k8s/argoapps/values/shared/ingresses.yaml similarity index 100% rename from k8s/argocd/values/shared/ingresses.yaml rename to k8s/argoapps/values/shared/ingresses.yaml diff --git a/k8s/argocd/values/shared/secrets.yaml b/k8s/argoapps/values/shared/secrets.yaml similarity index 100% rename from k8s/argocd/values/shared/secrets.yaml rename to k8s/argoapps/values/shared/secrets.yaml diff --git a/k8s/argocd/values/shared/storage.yaml b/k8s/argoapps/values/shared/storage.yaml similarity index 100% rename from k8s/argocd/values/shared/storage.yaml rename to k8s/argoapps/values/shared/storage.yaml diff --git a/k8s/argocd/templates/app-self.yaml b/k8s/argocd/templates/app-self.yaml index d04c1de..609214f 100644 --- a/k8s/argocd/templates/app-self.yaml +++ b/k8s/argocd/templates/app-self.yaml @@ -1,21 +1,3 @@ ---- -{{ $currentScope := .}} -{{- $appvalues := dict -}} -{{ range $path, $_ := .Files.Glob "values/shared/**.yaml" }} - {{- with $currentScope }} - {{ $newobj := .Files.Get $path | fromYaml }} - {{ $appvalues := mergeOverwrite $appvalues $newobj }} - {{- end -}} -{{ end }} - -{{- $deploymentPath := printf "values/%s/**.yaml" .Values.selfapp.deployment -}} -{{ range $path, $_ := .Files.Glob $deploymentPath }} - {{- with $currentScope }} - {{ $newobj := .Files.Get $path | fromYaml }} - {{ $appvalues := mergeOverwrite $appvalues $newobj }} - {{- end -}} -{{ end }} - --- apiVersion: v1 kind: Secret @@ -25,10 +7,10 @@ metadata: labels: argocd.argoproj.io/secret-type: repository annotations: - link.argocd.argoproj.io/external-link: "https://github.com/{{ $appvalues.gitops.repo }}" + link.argocd.argoproj.io/external-link: "https://github.com/{{ .Values.gitops.repo }}" stringData: type: git - url: "git@github.com:{{ $appvalues.gitops.repo }}.git" + url: "git@github.com:{{ .Values.gitops.repo }}.git" sshPrivateKey: {{ .Values.selfapp.sshkey | quote }} @@ -42,8 +24,8 @@ metadata: spec: project: default source: - repoURL: "git@github.com:{{ $appvalues.gitops.repo }}.git" - targetRevision: "{{ $appvalues.gitops.commit }}" + repoURL: "git@github.com:{{ .Values.gitops.repo }}.git" + targetRevision: "{{ .Values.gitops.commit }}" path: k8s/argocd helm: valueFiles: @@ -69,14 +51,19 @@ metadata: spec: project: default source: - repoURL: "git@github.com:{{ $appvalues.gitops.repo }}.git" - targetRevision: "{{ $appvalues.gitops.commit }}" + repoURL: "git@github.com:{{ .Values.gitops.repo }}.git" + targetRevision: "{{ .Values.gitops.commit }}" path: k8s/argoapps helm: valueFiles: - values.yaml - values: |- - {{- $appvalues | toYaml | nindent 8 }} + parameters: + - name: "deployment" + value: {{ .Values.selfapp.deployment | quote }} + - name: "gitops.repo" + value: {{ .Values.gitops.repo | quote }} + - name: "gitops.commit" + value: {{ .Values.gitops.commit | quote }} destination: server: https://kubernetes.default.svc namespace: "{{ .Release.Namespace }}" diff --git a/k8s/argocd/values.yaml b/k8s/argocd/values.yaml index 1edb937..3fd966d 100644 --- a/k8s/argocd/values.yaml +++ b/k8s/argocd/values.yaml @@ -17,3 +17,6 @@ argo-cd: selfapp: deployment: "" sshkey: "" +gitops: + commit: "stable" + repo: "asosnovsky/homelab"