diff --git a/.vscode/settings.json b/.vscode/settings.json index 9e26dfe..d1f596b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1 +1,5 @@ -{} \ No newline at end of file +{ + "yaml.schemas": { + "https://json.schemastore.org/helmfile.json": "file:///workspaces/homelab/k8s/argocd/templates/configurations.yaml" + } +} \ No newline at end of file diff --git a/bin/dryrun-app.sh b/bin/dryrun-app.sh index b36b4be..6b1f1d1 100755 --- a/bin/dryrun-app.sh +++ b/bin/dryrun-app.sh @@ -6,11 +6,8 @@ deployment=${2:-dev} app=$(basename $full_path) location=$(dirname $full_path) tmp_path=".tmp/$location/$deployment-$app.yaml" -argocd_values_path=$(realpath k8s/argocd/values.yaml) -argocd_values_deployment_path=$(realpath k8s/argocd/values-$deployment.yaml) -echo "> writing $location/$app to $tmp_path" -echo "> using argo values of $argocd_values_path" -cat $argocd_values_path | yq + + mkdir -p $(dirname $tmp_path) pushd $full_path &> /dev/null @@ -23,12 +20,28 @@ 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 $argocd_values_path \ - --values $argocd_values_deployment_path \ --values $full_path/values.yaml \ - --values $full_path/values-$deployment.yaml \ + $extraArgs \ > $tmp_path -echo $tmp_path \ No newline at end of file +echo "Wrote Template! --> $tmp_path" +echo "===============" + +if [ -f "$tmp_path.old" ]; then + echo " -> creating diff -- $tmp_path.diff" + diff -u $tmp_path".old" $tmp_path > "$tmp_path.diff" +fi \ No newline at end of file diff --git a/bin/dryrun-argo.sh b/bin/dryrun-argo.sh index 8b3d03d..88f7a73 100755 --- a/bin/dryrun-argo.sh +++ b/bin/dryrun-argo.sh @@ -1,12 +1,36 @@ #!/bin/bash - mkdir -p .tmp -helm template argocd k8s/argocd \ - --namespace argocd \ +deployment=${1:-dev} +app=argocd +location=k8s/$app +full_path=$(realpath $location) +tmp_path=".tmp/$location/$deployment-$app.yaml" +mkdir -p $(dirname $tmp_path) + +pushd $full_path &> /dev/null +helm dependency update &> /dev/null +popd &> /dev/null + +if [ -f "$tmp_path" ]; then + echo "Found existing file" + echo " -> Renaming old file to "$tmp_path".old" + mv $tmp_path $tmp_path".old" +fi + +helm template $app $full_path --namespace $app \ + --debug \ --create-namespace \ --values k8s/argocd/values.yaml \ - --values k8s/argocd/values-dev.yaml \ + --set selfapp.deployment="${deployment}" \ --set selfapp.enabled="true" \ --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" \ - > .tmp/argocd.yaml \ No newline at end of file + > $tmp_path + +echo "Wrote Template! --> $tmp_path" +echo "===============" + +if [ -f "$tmp_path.old" ]; then + echo " -> creating diff -- $tmp_path.diff" + diff -u $tmp_path".old" $tmp_path > "$tmp_path.diff" +fi \ No newline at end of file diff --git a/bin/install-argo.sh b/bin/install-argo.sh index 88ca17f..be8913f 100755 --- a/bin/install-argo.sh +++ b/bin/install-argo.sh @@ -13,7 +13,6 @@ helm install argocd k8s/argocd \ --namespace argocd \ --create-namespace \ --values k8s/argocd/values.yaml \ - --values k8s/argocd/values-$DEPLOYMENT.yaml \ --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" watch -n1 "kubectl -n argocd get all" @@ -26,7 +25,6 @@ helm upgrade argocd k8s/argocd \ --namespace argocd \ --create-namespace \ --values k8s/argocd/values.yaml \ - --values k8s/argocd/values-$DEPLOYMENT.yaml \ --set selfapp.enabled="true" \ --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" diff --git a/bin/make-new-chart.sh b/bin/make-new-chart.sh index fb8ed8c..9442695 100755 --- a/bin/make-new-chart.sh +++ b/bin/make-new-chart.sh @@ -8,7 +8,6 @@ typeofapp=$(basename $location) mkdir -p $full_path/templates touch $full_path/values.yaml -touch $full_path/values-{dev,prod}.yaml cat <> $full_path/Chart.yaml apiVersion: v2 name: $app diff --git a/k8s/argoapps/Chart.yaml b/k8s/argoapps/Chart.yaml new file mode 100644 index 0000000..58d62a7 --- /dev/null +++ b/k8s/argoapps/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v2 +name: argoapps +description: An k8s service for homelab +type: application +version: 0.1.0 +dependencies: [] diff --git a/k8s/argocd/templates/project-infra.yaml b/k8s/argoapps/templates/_helpers/project.yaml similarity index 60% rename from k8s/argocd/templates/project-infra.yaml rename to k8s/argoapps/templates/_helpers/project.yaml index 792814c..0251227 100644 --- a/k8s/argocd/templates/project-infra.yaml +++ b/k8s/argoapps/templates/_helpers/project.yaml @@ -1,18 +1,17 @@ -{{- if .Values.selfapp.enabled -}} +{{ define "homelab.argo.project" }} --- apiVersion: argoproj.io/v1alpha1 kind: AppProject metadata: - name: infrastructure - namespace: "{{ .Release.Namespace }}" + name: {{ .name }} finalizers: - resources-finalizer.argocd.argoproj.io spec: - description: "infrastructure services" + description: {{ .description }} orphanedResources: warn: false sourceRepos: - - "git@github.com:{{ .Values.selfapp.repo }}.git" + - "git@github.com:{{ .Values.gitops.repo }}.git" destinations: - server: "*" namespace: '*' @@ -20,4 +19,4 @@ spec: clusterResourceWhitelist: - group: "*" kind: "*" -{{- end -}} \ No newline at end of file +{{ end }} \ No newline at end of file diff --git a/k8s/argoapps/templates/charts-infra.yaml b/k8s/argoapps/templates/charts-infra.yaml new file mode 100644 index 0000000..f03595f --- /dev/null +++ b/k8s/argoapps/templates/charts-infra.yaml @@ -0,0 +1,35 @@ +{{- $infraChartProjectName := "infrastructure-charts" -}} +{{ include "homelab.argo.project" (dict "Values" $.Values "name" $infraChartProjectName "description" "infrastructure helm charts")}} + +{{ range $chartName, $chartProps := .Values.infrastructureCharts }} + +{{- $namespace := (printf "chart-%s" $chartName) -}} + +--- +apiVersion: v1 +kind: Namespace +metadata: + name: "{{ $namespace }}" + +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: chart-{{ $chartName }} +spec: + project: {{ $infraChartProjectName }} + source: + chart: {{ $chartProps.chart | default $chartName }} + repoURL: {{ $chartProps.repoURL }} + targetRevision: {{ $chartProps.targetRevision }} + helm: + values: |- + {{- tpl ($chartProps.values | default "") $ | nindent 8}} + releaseName: {{ $chartName }} + destination: + server: https://kubernetes.default.svc + namespace: {{ $namespace }} + syncPolicy: + automated: + selfHeal: true +{{ end }} \ No newline at end of file diff --git a/k8s/infra/dashboard/values.yaml b/k8s/argoapps/values.yaml similarity index 100% rename from k8s/infra/dashboard/values.yaml rename to k8s/argoapps/values.yaml diff --git a/k8s/argocd/templates/app-self.yaml b/k8s/argocd/templates/app-self.yaml index dd49212..701a86c 100644 --- a/k8s/argocd/templates/app-self.yaml +++ b/k8s/argocd/templates/app-self.yaml @@ -1,4 +1,38 @@ -{{- if .Values.selfapp.enabled -}} +--- +{{ $currentScope := .}} +{{- $appvalues := dict -}} +{{ range $path, $_ := .Files.Glob "values/shared/**.yaml" }} + {{- with $currentScope }} + {{ $newobj := .Files.Get $path | fromYaml }} + {{ $appvalues := merge $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 := merge $appvalues $newobj }} + {{- end -}} +{{ end }} + +--- +apiVersion: v1 +kind: Secret +metadata: + name: argo-repo-main + namespace: "{{ .Release.Namespace }}" + labels: + argocd.argoproj.io/secret-type: repository + annotations: + link.argocd.argoproj.io/external-link: "https://github.com/{{ $appvalues.gitops.repo }}" +stringData: + type: git + url: "git@github.com:{{ $appvalues.gitops.repo }}.git" + sshPrivateKey: {{ .Values.selfapp.sshkey | quote }} + + +{{ if .Values.selfapp.enabled }} --- apiVersion: argoproj.io/v1alpha1 kind: Application @@ -8,13 +42,12 @@ metadata: spec: project: default source: - repoURL: "git@github.com:{{ .Values.selfapp.repo }}.git" - targetRevision: "{{ .Values.selfapp.commit }}" + repoURL: "git@github.com:{{ $appvalues.gitops.repo }}.git" + targetRevision: "{{ $appvalues.gitops.commit }}" path: k8s/argocd helm: valueFiles: - values.yaml - - values-{{ .Values.global.deployment }}.yaml parameters: - name: "selfapp.enabled" value: "true" @@ -23,4 +56,27 @@ spec: destination: server: https://kubernetes.default.svc namespace: "{{ .Release.Namespace }}" + + +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: "argoapps" + namespace: "{{ .Release.Namespace }}" +spec: + project: default + source: + repoURL: "git@github.com:{{ $appvalues.gitops.repo }}.git" + targetRevision: "{{ $appvalues.gitops.commit }}" + path: k8s/argoapps + helm: + valueFiles: + - values.yaml + values: |- + {{- $appvalues | toYaml | nindent 8 }} + destination: + server: https://kubernetes.default.svc + namespace: "{{ .Release.Namespace }}" + {{- end -}} \ No newline at end of file diff --git a/k8s/argocd/values.yaml b/k8s/argocd/values.yaml index bea1f0f..1edb937 100644 --- a/k8s/argocd/values.yaml +++ b/k8s/argocd/values.yaml @@ -14,20 +14,6 @@ argo-cd: enabled: false ingressGrpc: enabled: false -debugger: - enabled: false selfapp: - commit: "stable" - repo: "asosnovsky/homelab" - sshkey: "" -global: - email: "ariel@sosnovsky.ca" - tls: - enabled: false - issuer: "" - secretName: "" - domain: "" deployment: "" - nfs: - server: "changme" - timezone: America/Toronto + sshkey: "" diff --git a/k8s/argocd/values/dev/global.yaml b/k8s/argocd/values/dev/global.yaml new file mode 100644 index 0000000..71b3518 --- /dev/null +++ b/k8s/argocd/values/dev/global.yaml @@ -0,0 +1,4 @@ +global: + deployment: dev + ingress: + domain: "me.local" diff --git a/k8s/argocd/values/prod/global.yaml b/k8s/argocd/values/prod/global.yaml new file mode 100644 index 0000000..7f9195f --- /dev/null +++ b/k8s/argocd/values/prod/global.yaml @@ -0,0 +1,10 @@ +global: + deployment: prod + ingress: + domain: "home.sosnovsky.ca" + tls: + enabled: true + issuer: "letsencrypt" + nfs: + server: "192.168.8.107" + share: "/mnt/EightTerra/k3s-cluster" diff --git a/k8s/argocd/values/shared/global.yaml b/k8s/argocd/values/shared/global.yaml new file mode 100644 index 0000000..6f7fb6b --- /dev/null +++ b/k8s/argocd/values/shared/global.yaml @@ -0,0 +1,16 @@ +global: + deployment: "" + email: "ariel@sosnovsky.ca" + timezone: America/Toronto + ingress: + domain: "" + tls: + enabled: false + issuer: "" + nfs: + 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/argocd/values/shared/infrastructureCharts.yaml new file mode 100644 index 0000000..f62cf59 --- /dev/null +++ b/k8s/argocd/values/shared/infrastructureCharts.yaml @@ -0,0 +1,24 @@ +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" diff --git a/legacy/bin/dryrun-app.sh b/legacy/bin/dryrun-app.sh new file mode 100755 index 0000000..b36b4be --- /dev/null +++ b/legacy/bin/dryrun-app.sh @@ -0,0 +1,34 @@ +#!/bin/bash +set -e + +full_path=${1} +deployment=${2:-dev} +app=$(basename $full_path) +location=$(dirname $full_path) +tmp_path=".tmp/$location/$deployment-$app.yaml" +argocd_values_path=$(realpath k8s/argocd/values.yaml) +argocd_values_deployment_path=$(realpath k8s/argocd/values-$deployment.yaml) +echo "> writing $location/$app to $tmp_path" +echo "> using argo values of $argocd_values_path" +cat $argocd_values_path | yq +mkdir -p $(dirname $tmp_path) + +pushd $full_path &> /dev/null +helm dependency update &> /dev/null +popd &> /dev/null + +if [ -f "$tmp_path" ]; then + echo "found existing file" + echo "renaming old file to "$tmp_path".old" + mv $tmp_path $tmp_path".old" +fi + +helm template $app $full_path --namespace $app \ + --debug \ + --values $argocd_values_path \ + --values $argocd_values_deployment_path \ + --values $full_path/values.yaml \ + --values $full_path/values-$deployment.yaml \ + > $tmp_path + +echo $tmp_path \ No newline at end of file diff --git a/legacy/bin/dryrun-argo.sh b/legacy/bin/dryrun-argo.sh new file mode 100755 index 0000000..8b3d03d --- /dev/null +++ b/legacy/bin/dryrun-argo.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +mkdir -p .tmp + +helm template argocd k8s/argocd \ + --namespace argocd \ + --create-namespace \ + --values k8s/argocd/values.yaml \ + --values k8s/argocd/values-dev.yaml \ + --set selfapp.enabled="true" \ + --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" \ + > .tmp/argocd.yaml \ No newline at end of file diff --git a/legacy/bin/install-argo.sh b/legacy/bin/install-argo.sh new file mode 100755 index 0000000..88ca17f --- /dev/null +++ b/legacy/bin/install-argo.sh @@ -0,0 +1,33 @@ +#!/bin/bash +set -e + +pushd k8s/argocd + +helm dependency update + +DEPLOYMENT=${1:-dev} + +popd + +helm install argocd k8s/argocd \ + --namespace argocd \ + --create-namespace \ + --values k8s/argocd/values.yaml \ + --values k8s/argocd/values-$DEPLOYMENT.yaml \ + --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" + +watch -n1 "kubectl -n argocd get all" + +argocd login cd.argoproj.io --core +kubectl config set-context --current --namespace argocd +argocd admin initial-password + +helm upgrade argocd k8s/argocd \ + --namespace argocd \ + --create-namespace \ + --values k8s/argocd/values.yaml \ + --values k8s/argocd/values-$DEPLOYMENT.yaml \ + --set selfapp.enabled="true" \ + --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" + +argocd app sync argocd/argocd \ No newline at end of file diff --git a/bin/start-minikube.sh b/legacy/bin/start-minikube.sh similarity index 100% rename from bin/start-minikube.sh rename to legacy/bin/start-minikube.sh diff --git a/bin/upgrade-app.sh b/legacy/bin/upgrade-app.sh similarity index 100% rename from bin/upgrade-app.sh rename to legacy/bin/upgrade-app.sh diff --git a/bin/upgrade-argo.sh b/legacy/bin/upgrade-argo.sh similarity index 100% rename from bin/upgrade-argo.sh rename to legacy/bin/upgrade-argo.sh diff --git a/k8s/applications/nextcloud/Chart.yaml b/legacy/k8s/applications/nextcloud/Chart.yaml similarity index 100% rename from k8s/applications/nextcloud/Chart.yaml rename to legacy/k8s/applications/nextcloud/Chart.yaml diff --git a/k8s/applications/nextcloud/templates/secret-db.yaml b/legacy/k8s/applications/nextcloud/templates/secret-db.yaml similarity index 100% rename from k8s/applications/nextcloud/templates/secret-db.yaml rename to legacy/k8s/applications/nextcloud/templates/secret-db.yaml diff --git a/k8s/applications/nextcloud/templates/secret-nc-default-creds.yaml b/legacy/k8s/applications/nextcloud/templates/secret-nc-default-creds.yaml similarity index 100% rename from k8s/applications/nextcloud/templates/secret-nc-default-creds.yaml rename to legacy/k8s/applications/nextcloud/templates/secret-nc-default-creds.yaml diff --git a/k8s/applications/nextcloud/values-dev.yaml b/legacy/k8s/applications/nextcloud/values-dev.yaml similarity index 100% rename from k8s/applications/nextcloud/values-dev.yaml rename to legacy/k8s/applications/nextcloud/values-dev.yaml diff --git a/k8s/applications/nextcloud/values-prod.yaml b/legacy/k8s/applications/nextcloud/values-prod.yaml similarity index 100% rename from k8s/applications/nextcloud/values-prod.yaml rename to legacy/k8s/applications/nextcloud/values-prod.yaml diff --git a/k8s/applications/nextcloud/values.yaml b/legacy/k8s/applications/nextcloud/values.yaml similarity index 100% rename from k8s/applications/nextcloud/values.yaml rename to legacy/k8s/applications/nextcloud/values.yaml diff --git a/k8s/applications/videohosting/Chart.yaml b/legacy/k8s/applications/videohosting/Chart.yaml similarity index 100% rename from k8s/applications/videohosting/Chart.yaml rename to legacy/k8s/applications/videohosting/Chart.yaml diff --git a/k8s/applications/videohosting/templates/sts-linuxservices.yaml b/legacy/k8s/applications/videohosting/templates/sts-linuxservices.yaml similarity index 100% rename from k8s/applications/videohosting/templates/sts-linuxservices.yaml rename to legacy/k8s/applications/videohosting/templates/sts-linuxservices.yaml diff --git a/k8s/applications/videohosting/templates/sts-plex.yaml b/legacy/k8s/applications/videohosting/templates/sts-plex.yaml similarity index 100% rename from k8s/applications/videohosting/templates/sts-plex.yaml rename to legacy/k8s/applications/videohosting/templates/sts-plex.yaml diff --git a/k8s/applications/videohosting/values-dev.yaml b/legacy/k8s/applications/videohosting/values-dev.yaml similarity index 100% rename from k8s/applications/videohosting/values-dev.yaml rename to legacy/k8s/applications/videohosting/values-dev.yaml diff --git a/k8s/applications/videohosting/values-prod.yaml b/legacy/k8s/applications/videohosting/values-prod.yaml similarity index 100% rename from k8s/applications/videohosting/values-prod.yaml rename to legacy/k8s/applications/videohosting/values-prod.yaml diff --git a/k8s/applications/videohosting/values.yaml b/legacy/k8s/applications/videohosting/values.yaml similarity index 100% rename from k8s/applications/videohosting/values.yaml rename to legacy/k8s/applications/videohosting/values.yaml diff --git a/k8s/charts/values-dev.yaml b/legacy/k8s/argocd/.gitkeep similarity index 100% rename from k8s/charts/values-dev.yaml rename to legacy/k8s/argocd/.gitkeep diff --git a/k8s/infra/dashboard/.helmignore b/legacy/k8s/argocd/.helmignore similarity index 100% rename from k8s/infra/dashboard/.helmignore rename to legacy/k8s/argocd/.helmignore diff --git a/legacy/k8s/argocd/Chart.yaml b/legacy/k8s/argocd/Chart.yaml new file mode 100644 index 0000000..9895401 --- /dev/null +++ b/legacy/k8s/argocd/Chart.yaml @@ -0,0 +1,9 @@ +apiVersion: v2 +name: argocd +description: Homelab Infra +type: application +version: 0.1.0 +dependencies: + - name: argo-cd + version: 5.22.1 + repository: https://argoproj.github.io/argo-helm \ No newline at end of file diff --git a/k8s/argocd/templates/app-charts.yaml b/legacy/k8s/argocd/templates/app-charts.yaml similarity index 100% rename from k8s/argocd/templates/app-charts.yaml rename to legacy/k8s/argocd/templates/app-charts.yaml diff --git a/legacy/k8s/argocd/templates/app-self.yaml b/legacy/k8s/argocd/templates/app-self.yaml new file mode 100644 index 0000000..dd49212 --- /dev/null +++ b/legacy/k8s/argocd/templates/app-self.yaml @@ -0,0 +1,26 @@ +{{- if .Values.selfapp.enabled -}} +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: "{{ .Release.Name }}" + namespace: "{{ .Release.Namespace }}" +spec: + project: default + source: + repoURL: "git@github.com:{{ .Values.selfapp.repo }}.git" + targetRevision: "{{ .Values.selfapp.commit }}" + path: k8s/argocd + helm: + valueFiles: + - values.yaml + - values-{{ .Values.global.deployment }}.yaml + parameters: + - name: "selfapp.enabled" + value: "true" + - name: "selfapp.sshkey" + value: {{ .Values.selfapp.sshkey | quote }} + destination: + server: https://kubernetes.default.svc + namespace: "{{ .Release.Namespace }}" +{{- end -}} \ No newline at end of file diff --git a/k8s/argocd/templates/appset-applications.yaml b/legacy/k8s/argocd/templates/appset-applications.yaml similarity index 100% rename from k8s/argocd/templates/appset-applications.yaml rename to legacy/k8s/argocd/templates/appset-applications.yaml diff --git a/k8s/argocd/templates/appset-infra.yaml b/legacy/k8s/argocd/templates/appset-infra.yaml similarity index 100% rename from k8s/argocd/templates/appset-infra.yaml rename to legacy/k8s/argocd/templates/appset-infra.yaml diff --git a/k8s/argocd/templates/deploy-debugger.yaml b/legacy/k8s/argocd/templates/deploy-debugger.yaml similarity index 100% rename from k8s/argocd/templates/deploy-debugger.yaml rename to legacy/k8s/argocd/templates/deploy-debugger.yaml diff --git a/k8s/argocd/templates/project-applications.yaml b/legacy/k8s/argocd/templates/project-applications.yaml similarity index 100% rename from k8s/argocd/templates/project-applications.yaml rename to legacy/k8s/argocd/templates/project-applications.yaml diff --git a/k8s/argocd/templates/project-metainfra.yaml b/legacy/k8s/argocd/templates/project-metainfra.yaml similarity index 100% rename from k8s/argocd/templates/project-metainfra.yaml rename to legacy/k8s/argocd/templates/project-metainfra.yaml diff --git a/k8s/argocd/templates/secret-repo-main.yaml b/legacy/k8s/argocd/templates/secret-repo-main.yaml similarity index 100% rename from k8s/argocd/templates/secret-repo-main.yaml rename to legacy/k8s/argocd/templates/secret-repo-main.yaml diff --git a/k8s/argocd/values-dev.yaml b/legacy/k8s/argocd/values-dev.yaml similarity index 100% rename from k8s/argocd/values-dev.yaml rename to legacy/k8s/argocd/values-dev.yaml diff --git a/k8s/argocd/values-prod.yaml b/legacy/k8s/argocd/values-prod.yaml similarity index 100% rename from k8s/argocd/values-prod.yaml rename to legacy/k8s/argocd/values-prod.yaml diff --git a/legacy/k8s/argocd/values.yaml b/legacy/k8s/argocd/values.yaml new file mode 100644 index 0000000..bea1f0f --- /dev/null +++ b/legacy/k8s/argocd/values.yaml @@ -0,0 +1,33 @@ +argo-cd: + configs: + cm: + exec.enabled: true + params: + server.insecure: true + server.basehref: / + server.rootpath: "" + crds: + install: true + keep: false + server: + ingress: + enabled: false + ingressGrpc: + enabled: false +debugger: + enabled: false +selfapp: + commit: "stable" + repo: "asosnovsky/homelab" + sshkey: "" +global: + email: "ariel@sosnovsky.ca" + tls: + enabled: false + issuer: "" + secretName: "" + domain: "" + deployment: "" + nfs: + server: "changme" + timezone: America/Toronto diff --git a/k8s/charts/Chart.yaml b/legacy/k8s/charts/Chart.yaml similarity index 100% rename from k8s/charts/Chart.yaml rename to legacy/k8s/charts/Chart.yaml diff --git a/k8s/charts/templates/app-cert-manager.yaml b/legacy/k8s/charts/templates/app-cert-manager.yaml similarity index 100% rename from k8s/charts/templates/app-cert-manager.yaml rename to legacy/k8s/charts/templates/app-cert-manager.yaml diff --git a/k8s/charts/templates/app-external-secrets.yaml b/legacy/k8s/charts/templates/app-external-secrets.yaml similarity index 100% rename from k8s/charts/templates/app-external-secrets.yaml rename to legacy/k8s/charts/templates/app-external-secrets.yaml diff --git a/k8s/charts/templates/app-nfs-storage.yaml b/legacy/k8s/charts/templates/app-nfs-storage.yaml similarity index 100% rename from k8s/charts/templates/app-nfs-storage.yaml rename to legacy/k8s/charts/templates/app-nfs-storage.yaml diff --git a/k8s/charts/templates/app-prometheus.yaml b/legacy/k8s/charts/templates/app-prometheus.yaml similarity index 100% rename from k8s/charts/templates/app-prometheus.yaml rename to legacy/k8s/charts/templates/app-prometheus.yaml diff --git a/k8s/charts/templates/app-secrets-generator.yaml b/legacy/k8s/charts/templates/app-secrets-generator.yaml similarity index 100% rename from k8s/charts/templates/app-secrets-generator.yaml rename to legacy/k8s/charts/templates/app-secrets-generator.yaml diff --git a/k8s/infra/authentik/values-dev.yaml b/legacy/k8s/charts/values-dev.yaml similarity index 100% rename from k8s/infra/authentik/values-dev.yaml rename to legacy/k8s/charts/values-dev.yaml diff --git a/k8s/charts/values-prod.yaml b/legacy/k8s/charts/values-prod.yaml similarity index 100% rename from k8s/charts/values-prod.yaml rename to legacy/k8s/charts/values-prod.yaml diff --git a/k8s/charts/values.yaml b/legacy/k8s/charts/values.yaml similarity index 100% rename from k8s/charts/values.yaml rename to legacy/k8s/charts/values.yaml diff --git a/k8s/infra/authelia/Chart.yaml b/legacy/k8s/infra/authelia/Chart.yaml similarity index 100% rename from k8s/infra/authelia/Chart.yaml rename to legacy/k8s/infra/authelia/Chart.yaml diff --git a/k8s/infra/authelia/templates/certificate.yaml b/legacy/k8s/infra/authelia/templates/certificate.yaml similarity index 100% rename from k8s/infra/authelia/templates/certificate.yaml rename to legacy/k8s/infra/authelia/templates/certificate.yaml diff --git a/k8s/infra/authelia/templates/postfix.yaml b/legacy/k8s/infra/authelia/templates/postfix.yaml similarity index 100% rename from k8s/infra/authelia/templates/postfix.yaml rename to legacy/k8s/infra/authelia/templates/postfix.yaml diff --git a/k8s/infra/authelia/templates/secert-authellia.yaml b/legacy/k8s/infra/authelia/templates/secert-authellia.yaml similarity index 100% rename from k8s/infra/authelia/templates/secert-authellia.yaml rename to legacy/k8s/infra/authelia/templates/secert-authellia.yaml diff --git a/k8s/infra/authelia/values-dev.yaml b/legacy/k8s/infra/authelia/values-dev.yaml similarity index 100% rename from k8s/infra/authelia/values-dev.yaml rename to legacy/k8s/infra/authelia/values-dev.yaml diff --git a/k8s/infra/authelia/values-prod.yaml b/legacy/k8s/infra/authelia/values-prod.yaml similarity index 100% rename from k8s/infra/authelia/values-prod.yaml rename to legacy/k8s/infra/authelia/values-prod.yaml diff --git a/k8s/infra/authelia/values.yaml b/legacy/k8s/infra/authelia/values.yaml similarity index 100% rename from k8s/infra/authelia/values.yaml rename to legacy/k8s/infra/authelia/values.yaml diff --git a/k8s/infra/authentik/Chart.yaml b/legacy/k8s/infra/authentik/Chart.yaml similarity index 100% rename from k8s/infra/authentik/Chart.yaml rename to legacy/k8s/infra/authentik/Chart.yaml diff --git a/k8s/infra/authentik/templates/secert-db.yaml b/legacy/k8s/infra/authentik/templates/secert-db.yaml similarity index 100% rename from k8s/infra/authentik/templates/secert-db.yaml rename to legacy/k8s/infra/authentik/templates/secert-db.yaml diff --git a/k8s/infra/dashboard/values-dev.yaml b/legacy/k8s/infra/authentik/values-dev.yaml similarity index 100% rename from k8s/infra/dashboard/values-dev.yaml rename to legacy/k8s/infra/authentik/values-dev.yaml diff --git a/k8s/infra/authentik/values-prod.yaml b/legacy/k8s/infra/authentik/values-prod.yaml similarity index 100% rename from k8s/infra/authentik/values-prod.yaml rename to legacy/k8s/infra/authentik/values-prod.yaml diff --git a/k8s/infra/authentik/values.yaml b/legacy/k8s/infra/authentik/values.yaml similarity index 100% rename from k8s/infra/authentik/values.yaml rename to legacy/k8s/infra/authentik/values.yaml diff --git a/k8s/infra/ingresses/.helmignore b/legacy/k8s/infra/dashboard/.helmignore similarity index 100% rename from k8s/infra/ingresses/.helmignore rename to legacy/k8s/infra/dashboard/.helmignore diff --git a/k8s/infra/dashboard/Chart.yaml b/legacy/k8s/infra/dashboard/Chart.yaml similarity index 100% rename from k8s/infra/dashboard/Chart.yaml rename to legacy/k8s/infra/dashboard/Chart.yaml diff --git a/k8s/infra/database/values-dev.yaml b/legacy/k8s/infra/dashboard/values-dev.yaml similarity index 100% rename from k8s/infra/database/values-dev.yaml rename to legacy/k8s/infra/dashboard/values-dev.yaml diff --git a/k8s/infra/dashboard/values-prod.yaml b/legacy/k8s/infra/dashboard/values-prod.yaml similarity index 100% rename from k8s/infra/dashboard/values-prod.yaml rename to legacy/k8s/infra/dashboard/values-prod.yaml diff --git a/k8s/infra/database/values-prod.yaml b/legacy/k8s/infra/dashboard/values.yaml similarity index 100% rename from k8s/infra/database/values-prod.yaml rename to legacy/k8s/infra/dashboard/values.yaml diff --git a/k8s/infra/database/Chart.yaml b/legacy/k8s/infra/database/Chart.yaml similarity index 100% rename from k8s/infra/database/Chart.yaml rename to legacy/k8s/infra/database/Chart.yaml diff --git a/k8s/infra/database/templates/secret-db-psswd.yaml b/legacy/k8s/infra/database/templates/secret-db-psswd.yaml similarity index 100% rename from k8s/infra/database/templates/secret-db-psswd.yaml rename to legacy/k8s/infra/database/templates/secret-db-psswd.yaml diff --git a/k8s/infra/database/templates/secret-store.yaml b/legacy/k8s/infra/database/templates/secret-store.yaml similarity index 100% rename from k8s/infra/database/templates/secret-store.yaml rename to legacy/k8s/infra/database/templates/secret-store.yaml diff --git a/k8s/infra/database/templates/user-generation/entry.sh.tpl b/legacy/k8s/infra/database/templates/user-generation/entry.sh.tpl similarity index 100% rename from k8s/infra/database/templates/user-generation/entry.sh.tpl rename to legacy/k8s/infra/database/templates/user-generation/entry.sh.tpl diff --git a/k8s/infra/database/templates/user-generation/rbac.yml b/legacy/k8s/infra/database/templates/user-generation/rbac.yml similarity index 100% rename from k8s/infra/database/templates/user-generation/rbac.yml rename to legacy/k8s/infra/database/templates/user-generation/rbac.yml diff --git a/k8s/infra/database/templates/user-generation/terraform.tf.tpl b/legacy/k8s/infra/database/templates/user-generation/terraform.tf.tpl similarity index 100% rename from k8s/infra/database/templates/user-generation/terraform.tf.tpl rename to legacy/k8s/infra/database/templates/user-generation/terraform.tf.tpl diff --git a/k8s/infra/database/templates/user-generation/users-job.yaml b/legacy/k8s/infra/database/templates/user-generation/users-job.yaml similarity index 100% rename from k8s/infra/database/templates/user-generation/users-job.yaml rename to legacy/k8s/infra/database/templates/user-generation/users-job.yaml diff --git a/k8s/infra/database/templates/user-generation/users-secret.yaml b/legacy/k8s/infra/database/templates/user-generation/users-secret.yaml similarity index 100% rename from k8s/infra/database/templates/user-generation/users-secret.yaml rename to legacy/k8s/infra/database/templates/user-generation/users-secret.yaml diff --git a/k8s/infra/secrets/values-dev.yaml b/legacy/k8s/infra/database/values-dev.yaml similarity index 100% rename from k8s/infra/secrets/values-dev.yaml rename to legacy/k8s/infra/database/values-dev.yaml diff --git a/k8s/infra/secrets/values-prod.yaml b/legacy/k8s/infra/database/values-prod.yaml similarity index 100% rename from k8s/infra/secrets/values-prod.yaml rename to legacy/k8s/infra/database/values-prod.yaml diff --git a/k8s/infra/database/values.yaml b/legacy/k8s/infra/database/values.yaml similarity index 100% rename from k8s/infra/database/values.yaml rename to legacy/k8s/infra/database/values.yaml diff --git a/legacy/k8s/infra/ingresses/.helmignore b/legacy/k8s/infra/ingresses/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/legacy/k8s/infra/ingresses/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/k8s/infra/ingresses/Chart.yaml b/legacy/k8s/infra/ingresses/Chart.yaml similarity index 100% rename from k8s/infra/ingresses/Chart.yaml rename to legacy/k8s/infra/ingresses/Chart.yaml diff --git a/k8s/infra/ingresses/templates/_helpers/ingress.yaml b/legacy/k8s/infra/ingresses/templates/_helpers/ingress.yaml similarity index 100% rename from k8s/infra/ingresses/templates/_helpers/ingress.yaml rename to legacy/k8s/infra/ingresses/templates/_helpers/ingress.yaml diff --git a/k8s/infra/ingresses/templates/clusterissuer.yaml b/legacy/k8s/infra/ingresses/templates/clusterissuer.yaml similarity index 100% rename from k8s/infra/ingresses/templates/clusterissuer.yaml rename to legacy/k8s/infra/ingresses/templates/clusterissuer.yaml diff --git a/k8s/infra/ingresses/templates/dummy-pod.yaml b/legacy/k8s/infra/ingresses/templates/dummy-pod.yaml similarity index 100% rename from k8s/infra/ingresses/templates/dummy-pod.yaml rename to legacy/k8s/infra/ingresses/templates/dummy-pod.yaml diff --git a/k8s/infra/ingresses/templates/middleware-common.yaml b/legacy/k8s/infra/ingresses/templates/middleware-common.yaml similarity index 100% rename from k8s/infra/ingresses/templates/middleware-common.yaml rename to legacy/k8s/infra/ingresses/templates/middleware-common.yaml diff --git a/k8s/infra/ingresses/templates/middleware-nextcloud.yaml b/legacy/k8s/infra/ingresses/templates/middleware-nextcloud.yaml similarity index 100% rename from k8s/infra/ingresses/templates/middleware-nextcloud.yaml rename to legacy/k8s/infra/ingresses/templates/middleware-nextcloud.yaml diff --git a/k8s/infra/ingresses/templates/reverse-proxy.yaml b/legacy/k8s/infra/ingresses/templates/reverse-proxy.yaml similarity index 100% rename from k8s/infra/ingresses/templates/reverse-proxy.yaml rename to legacy/k8s/infra/ingresses/templates/reverse-proxy.yaml diff --git a/k8s/infra/ingresses/templates/services.yaml b/legacy/k8s/infra/ingresses/templates/services.yaml similarity index 100% rename from k8s/infra/ingresses/templates/services.yaml rename to legacy/k8s/infra/ingresses/templates/services.yaml diff --git a/k8s/infra/ingresses/values-dev.yaml b/legacy/k8s/infra/ingresses/values-dev.yaml similarity index 100% rename from k8s/infra/ingresses/values-dev.yaml rename to legacy/k8s/infra/ingresses/values-dev.yaml diff --git a/k8s/infra/ingresses/values-prod.yaml b/legacy/k8s/infra/ingresses/values-prod.yaml similarity index 100% rename from k8s/infra/ingresses/values-prod.yaml rename to legacy/k8s/infra/ingresses/values-prod.yaml diff --git a/k8s/infra/ingresses/values.yaml b/legacy/k8s/infra/ingresses/values.yaml similarity index 100% rename from k8s/infra/ingresses/values.yaml rename to legacy/k8s/infra/ingresses/values.yaml diff --git a/k8s/infra/secrets/Chart.yaml b/legacy/k8s/infra/secrets/Chart.yaml similarity index 100% rename from k8s/infra/secrets/Chart.yaml rename to legacy/k8s/infra/secrets/Chart.yaml diff --git a/k8s/infra/secrets/templates/secret-store.yaml b/legacy/k8s/infra/secrets/templates/secret-store.yaml similarity index 100% rename from k8s/infra/secrets/templates/secret-store.yaml rename to legacy/k8s/infra/secrets/templates/secret-store.yaml diff --git a/k8s/infra/secrets/templates/smtp.yaml b/legacy/k8s/infra/secrets/templates/smtp.yaml similarity index 100% rename from k8s/infra/secrets/templates/smtp.yaml rename to legacy/k8s/infra/secrets/templates/smtp.yaml diff --git a/legacy/k8s/infra/secrets/values-dev.yaml b/legacy/k8s/infra/secrets/values-dev.yaml new file mode 100644 index 0000000..e69de29 diff --git a/legacy/k8s/infra/secrets/values-prod.yaml b/legacy/k8s/infra/secrets/values-prod.yaml new file mode 100644 index 0000000..e69de29 diff --git a/k8s/infra/secrets/values.yaml b/legacy/k8s/infra/secrets/values.yaml similarity index 100% rename from k8s/infra/secrets/values.yaml rename to legacy/k8s/infra/secrets/values.yaml