From 321b723228a3a7074cf851cea789d487ac895b14 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 15 Apr 2023 05:31:28 +0000 Subject: [PATCH] clean up --- bin/dryrun-app.sh | 12 +- .../templates/_helpers/appvalues.yaml | 18 --- k8s/argoapps/templates/argoappset-apps.yaml | 4 +- k8s/argoapps/templates/charts-infra.yaml | 5 +- k8s/argoapps/templates/secrets.yaml | 2 +- k8s/argoapps/templates/storage.yaml | 4 +- .../dev/global.yaml => values-dev.yaml} | 0 .../prod/global.yaml => values-prod.yaml} | 0 k8s/argoapps/values.yaml | 115 +++++++++++++++++- k8s/argoapps/values/dev/apps.yaml | 2 - k8s/argoapps/values/prod/apps.yaml | 2 - k8s/argoapps/values/shared/apps.yaml | 2 - k8s/argoapps/values/shared/global.yaml | 13 -- .../values/shared/infrastructureCharts.yaml | 84 ------------- k8s/argoapps/values/shared/secrets.yaml | 6 - k8s/argoapps/values/shared/storage.yaml | 9 -- k8s/argocd/templates/app-self.yaml | 3 +- 17 files changed, 124 insertions(+), 157 deletions(-) delete mode 100644 k8s/argoapps/templates/_helpers/appvalues.yaml rename k8s/argoapps/{values/dev/global.yaml => values-dev.yaml} (100%) rename k8s/argoapps/{values/prod/global.yaml => values-prod.yaml} (100%) delete mode 100644 k8s/argoapps/values/dev/apps.yaml delete mode 100644 k8s/argoapps/values/prod/apps.yaml delete mode 100644 k8s/argoapps/values/shared/apps.yaml delete mode 100644 k8s/argoapps/values/shared/global.yaml delete mode 100644 k8s/argoapps/values/shared/infrastructureCharts.yaml delete mode 100644 k8s/argoapps/values/shared/secrets.yaml delete mode 100644 k8s/argoapps/values/shared/storage.yaml diff --git a/bin/dryrun-app.sh b/bin/dryrun-app.sh index 6b1f1d1..bc35dd0 100755 --- a/bin/dryrun-app.sh +++ b/bin/dryrun-app.sh @@ -20,22 +20,12 @@ if [ -f "$tmp_path" ]; then mv $tmp_path $tmp_path".old" fi -extraArgs="" -for f in k8s/argocd/values/shared/*.yaml; do - full_file_path=$(realpath $f) - extraArgs=$extraArgs" --values ${full_file_path}" -done -for f in k8s/argocd/values/$deployment/*.yaml; do - full_file_path=$(realpath $f) - extraArgs=$extraArgs" --values ${full_file_path}" -done - echo $extraArgs helm template $app $full_path --namespace $app \ --debug \ --values $full_path/values.yaml \ - $extraArgs \ + --values $full_path/values-$deployment.yaml \ > $tmp_path echo "Wrote Template! --> $tmp_path" diff --git a/k8s/argoapps/templates/_helpers/appvalues.yaml b/k8s/argoapps/templates/_helpers/appvalues.yaml deleted file mode 100644 index 74eb71b..0000000 --- a/k8s/argoapps/templates/_helpers/appvalues.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -{{ $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 2e57a9a..d566f1e 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 := $appvalues.apps }} +{{ range $appName, $appProps := .Values.apps }} {{- $namespace := (printf "apps-%s" $appName) -}} @@ -26,7 +26,7 @@ spec: helm: valueFiles: - values.yaml - - values-{{$.Values.deployment}}.yaml + - values-{{$.Values.global.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 3438f9a..ab080cf 100644 --- a/k8s/argoapps/templates/charts-infra.yaml +++ b/k8s/argoapps/templates/charts-infra.yaml @@ -1,7 +1,8 @@ +--- {{- $infraChartProjectName := "infrastructure-charts" -}} {{ include "homelab.argo.project" (dict "name" $infraChartProjectName "description" "infrastructure helm charts")}} -{{ range $chartName, $chartProps := $appvalues.infrastructureCharts }} +{{ range $chartName, $chartProps := .Values.infrastructureCharts }} {{- $namespace := (printf "chart-%s" $chartName) -}} @@ -24,7 +25,7 @@ spec: targetRevision: {{ $chartProps.targetRevision }} helm: values: |- - {{- tpl ($chartProps.values | default "") $appvalues | nindent 8}} + {{- tpl ($chartProps.values | default "") $ | 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 293990b..4b3c34b 100644 --- a/k8s/argoapps/templates/secrets.yaml +++ b/k8s/argoapps/templates/secrets.yaml @@ -1,4 +1,4 @@ -{{ range $_, $secretsData := $appvalues.secrets }} +{{ range $_, $secretsData := .Values.secrets }} --- apiVersion: external-secrets.io/v1beta1 kind: ClusterSecretStore diff --git a/k8s/argoapps/templates/storage.yaml b/k8s/argoapps/templates/storage.yaml index 234c824..0d9c5d7 100644 --- a/k8s/argoapps/templates/storage.yaml +++ b/k8s/argoapps/templates/storage.yaml @@ -1,4 +1,4 @@ -{{ range $key, $value := $appvalues.storage }} +{{ range $key, $value := .Values.storage }} --- apiVersion: v1 kind: PersistentVolumeClaim @@ -6,7 +6,7 @@ metadata: name: {{ $value.name }} namespace: {{ $value.namespace }} spec: - storageClassName: {{ $appvalues.global.nfs.storageClass }} + storageClassName: {{ $.Values.global.nfs.storageClass }} accessModes: {{- $value.accessModes | toYaml | nindent 4 }} resources: diff --git a/k8s/argoapps/values/dev/global.yaml b/k8s/argoapps/values-dev.yaml similarity index 100% rename from k8s/argoapps/values/dev/global.yaml rename to k8s/argoapps/values-dev.yaml diff --git a/k8s/argoapps/values/prod/global.yaml b/k8s/argoapps/values-prod.yaml similarity index 100% rename from k8s/argoapps/values/prod/global.yaml rename to k8s/argoapps/values-prod.yaml diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index 7108424..ec1a32a 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -1,4 +1,117 @@ -deployment: "" gitops: repo: "" commit: "" +apps: + ingresses: "" +global: + email: "ariel@sosnovsky.ca" + timezone: America/Toronto + domain: "" + tls: + enabled: false + issuer: "" + acmeServer: "https://acme-staging-v02.api.letsencrypt.org/directory" + skipTLSVerify: "false" + nfs: + storageClass: "nfs-generic" + server: "changme" + share: "changeme" +infrastructureCharts: + cert-manager: + repoURL: "https://charts.jetstack.io" + targetRevision: "1.10.2" + values: |- + installCRDs: true + external-secrets: + repoURL: "https://charts.external-secrets.io" + targetRevision: "0.7.2" + values: |- + installCRDs: true + nfs-generic-storageclass: + chart: nfs-subdir-external-provisioner + repoURL: "https://kubernetes-sigs.github.io/nfs-subdir-external-provisioner/" + targetRevision: "v4.0.2" + values: |- + storageClass: + name: "{{ .Values.global.nfs.storageClass }}" + nfs: + server: "{{ .Values.global.nfs.server }}" + path: "{{ .Values.global.nfs.share }}" + kubernetes-secret-generator: + repoURL: "https://helm.mittwald.de" + targetRevision: "v3.4.0" + database: + chart: postgresql + repoURL: "https://charts.bitnami.com/bitnami" + targetRevision: "12.1.8" + values: |- + fullnameOverride: "postgres" + image: + tag: 15.1.0-debian-11-r19 + repository: bitnami/postgresql + pullPolicy: IfNotPresent + auth: + secretKeys: + adminPasswordKey: password + existingSecret: "{{ .Values.secrets.database.secrets.dbmain.name }}" + architecture: standalone + postgresqlDataDir: /bitnami/postgresql/data + primary: + persistence: + enabled: true + mountPath: /bitnami/postgresql + storageClass: "{{ .Values.global.nfs.storageClass }}" + existingClaim: "{{ .Values.storage.database.name }}" + accessModes: + - ReadWriteMany + readReplicas: + replicaCount: 0 + # monitoring: + # chart: prometheus + # repoURL: "https://prometheus-community.github.io/helm-charts" + # targetRevision: "20.2.0" + # values: |- + # configmapReload: + # prometheus: + # enabled: false + # alertmanager: + # persistence: + # enabled: true + # size: 8Gi + # storageClass: "local-path" + # ingress: + # enabled: false + # ingressClassName: traefik + # annotations: {} + # hosts: + # - host: "{{$prometheusHost}}.{{ .Values.global.domain }}" + # paths: + # - path: /alertmanager + # pathType: Prefix + # server: + # {{ if .Values.global.tls.enabled }} + # baseURL: "https://{{$prometheusHost}}.{{ .Values.global.domain }}" + # {{ else }} + # baseURL: "http://{{$prometheusHost}}.{{ .Values.global.domain }}" + # {{ end }} + # persistentVolume: + # enabled: true + # size: 8Gi + # storageClass: "local-path" + # ingress: + # enabled: false +secrets: + database: + namespace: chart-database + secrets: + dbmain: + name: "pg.password" +storage: + database: + name: primary-database + namespace: chart-database + accessModes: + - ReadWriteMany + resources: + requests: + storage: 8Gi diff --git a/k8s/argoapps/values/dev/apps.yaml b/k8s/argoapps/values/dev/apps.yaml deleted file mode 100644 index 967c0fc..0000000 --- a/k8s/argoapps/values/dev/apps.yaml +++ /dev/null @@ -1,2 +0,0 @@ -apps: - ingresses: "" diff --git a/k8s/argoapps/values/prod/apps.yaml b/k8s/argoapps/values/prod/apps.yaml deleted file mode 100644 index 967c0fc..0000000 --- a/k8s/argoapps/values/prod/apps.yaml +++ /dev/null @@ -1,2 +0,0 @@ -apps: - ingresses: "" diff --git a/k8s/argoapps/values/shared/apps.yaml b/k8s/argoapps/values/shared/apps.yaml deleted file mode 100644 index 967c0fc..0000000 --- a/k8s/argoapps/values/shared/apps.yaml +++ /dev/null @@ -1,2 +0,0 @@ -apps: - ingresses: "" diff --git a/k8s/argoapps/values/shared/global.yaml b/k8s/argoapps/values/shared/global.yaml deleted file mode 100644 index 43b22f5..0000000 --- a/k8s/argoapps/values/shared/global.yaml +++ /dev/null @@ -1,13 +0,0 @@ -global: - email: "ariel@sosnovsky.ca" - timezone: America/Toronto - domain: "" - tls: - enabled: false - issuer: "" - acmeServer: "https://acme-staging-v02.api.letsencrypt.org/directory" - skipTLSVerify: "false" - nfs: - storageClass: "nfs-generic" - server: "changme" - share: "changeme" diff --git a/k8s/argoapps/values/shared/infrastructureCharts.yaml b/k8s/argoapps/values/shared/infrastructureCharts.yaml deleted file mode 100644 index d0b3c7f..0000000 --- a/k8s/argoapps/values/shared/infrastructureCharts.yaml +++ /dev/null @@ -1,84 +0,0 @@ -infrastructureCharts: - cert-manager: - repoURL: "https://charts.jetstack.io" - targetRevision: "1.10.2" - values: |- - installCRDs: true - external-secrets: - repoURL: "https://charts.external-secrets.io" - targetRevision: "0.7.2" - values: |- - installCRDs: true - nfs-generic-storageclass: - chart: nfs-subdir-external-provisioner - repoURL: "https://kubernetes-sigs.github.io/nfs-subdir-external-provisioner/" - targetRevision: "v4.0.2" - values: |- - storageClass: - name: "{{ .Values.global.nfs.storageClass }}" - nfs: - server: "{{ .Values.global.nfs.server }}" - path: "{{ .Values.global.nfs.share }}" - kubernetes-secret-generator: - repoURL: "https://helm.mittwald.de" - targetRevision: "v3.4.0" - database: - chart: postgresql - repoURL: "https://charts.bitnami.com/bitnami" - targetRevision: "12.1.8" - values: |- - fullnameOverride: "postgres" - image: - tag: 15.1.0-debian-11-r19 - repository: bitnami/postgresql - pullPolicy: IfNotPresent - auth: - secretKeys: - adminPasswordKey: password - existingSecret: "{{ .Values.secrets.database.secrets.dbmain.name }}" - architecture: standalone - postgresqlDataDir: /bitnami/postgresql/data - primary: - persistence: - enabled: true - mountPath: /bitnami/postgresql - storageClass: "{{ .Values.global.nfs.storageClass }}" - existingClaim: "{{ .Values.storage.database.name }}" - accessModes: - - ReadWriteMany - readReplicas: - replicaCount: 0 - # monitoring: - # chart: prometheus - # repoURL: "https://prometheus-community.github.io/helm-charts" - # targetRevision: "20.2.0" - # values: |- - # configmapReload: - # prometheus: - # enabled: false - # alertmanager: - # persistence: - # enabled: true - # size: 8Gi - # storageClass: "local-path" - # ingress: - # enabled: false - # ingressClassName: traefik - # annotations: {} - # hosts: - # - host: "{{$prometheusHost}}.{{ .Values.global.domain }}" - # paths: - # - path: /alertmanager - # pathType: Prefix - # server: - # {{ if .Values.global.tls.enabled }} - # baseURL: "https://{{$prometheusHost}}.{{ .Values.global.domain }}" - # {{ else }} - # baseURL: "http://{{$prometheusHost}}.{{ .Values.global.domain }}" - # {{ end }} - # persistentVolume: - # enabled: true - # size: 8Gi - # storageClass: "local-path" - # ingress: - # enabled: false diff --git a/k8s/argoapps/values/shared/secrets.yaml b/k8s/argoapps/values/shared/secrets.yaml deleted file mode 100644 index 45b9c55..0000000 --- a/k8s/argoapps/values/shared/secrets.yaml +++ /dev/null @@ -1,6 +0,0 @@ -secrets: - database: - namespace: chart-database - secrets: - dbmain: - name: "pg.password" diff --git a/k8s/argoapps/values/shared/storage.yaml b/k8s/argoapps/values/shared/storage.yaml deleted file mode 100644 index 7ea42f6..0000000 --- a/k8s/argoapps/values/shared/storage.yaml +++ /dev/null @@ -1,9 +0,0 @@ -storage: - database: - name: primary-database - namespace: chart-database - accessModes: - - ReadWriteMany - resources: - requests: - storage: 8Gi diff --git a/k8s/argocd/templates/app-self.yaml b/k8s/argocd/templates/app-self.yaml index 609214f..d7d50f9 100644 --- a/k8s/argocd/templates/app-self.yaml +++ b/k8s/argocd/templates/app-self.yaml @@ -57,9 +57,8 @@ spec: helm: valueFiles: - values.yaml + - values-{{ .Values.selfapp.deployment }}.yaml parameters: - - name: "deployment" - value: {{ .Values.selfapp.deployment | quote }} - name: "gitops.repo" value: {{ .Values.gitops.repo | quote }} - name: "gitops.commit"