From 6e6917a00b48b60d99b7aa680ad3ac9106ea41a8 Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Tue, 2 Dec 2025 22:41:58 -0600 Subject: [PATCH] migrate argocd --- clusters/cl01tl/deployment/stack/Chart.yaml | 16 ----- .../stack/templates/application-set.yaml | 59 ------------------- clusters/cl01tl/deployment/stack/values.yaml | 16 ----- clusters/cl01tl/helm/argocd/Chart.lock | 6 ++ .../{deployment => helm}/argocd/Chart.yaml | 0 .../argocd/templates/external-secret.yaml | 0 .../argocd/templates/http-route.yaml | 0 .../{deployment => helm}/argocd/values.yaml | 0 8 files changed, 6 insertions(+), 91 deletions(-) delete mode 100644 clusters/cl01tl/deployment/stack/Chart.yaml delete mode 100644 clusters/cl01tl/deployment/stack/templates/application-set.yaml delete mode 100644 clusters/cl01tl/deployment/stack/values.yaml create mode 100644 clusters/cl01tl/helm/argocd/Chart.lock rename clusters/cl01tl/{deployment => helm}/argocd/Chart.yaml (100%) rename clusters/cl01tl/{deployment => helm}/argocd/templates/external-secret.yaml (100%) rename clusters/cl01tl/{deployment => helm}/argocd/templates/http-route.yaml (100%) rename clusters/cl01tl/{deployment => helm}/argocd/values.yaml (100%) diff --git a/clusters/cl01tl/deployment/stack/Chart.yaml b/clusters/cl01tl/deployment/stack/Chart.yaml deleted file mode 100644 index 8bc54ecd2..000000000 --- a/clusters/cl01tl/deployment/stack/Chart.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v2 -name: stack -version: 1.0.0 -description: Stack -keywords: - - argo-cd - - stack - - deployment -home: https://wiki.alexlebens.dev/s/0c2d1896-710d-4972-9bc8-08d71987428a -sources: - - https://github.com/argoproj/argo-cd - - https://gitea.alexlebens.dev/alexlebens/infrastructure -maintainers: - - name: alexlebens -icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/argo-cd.png -appVersion: 1.0.0 diff --git a/clusters/cl01tl/deployment/stack/templates/application-set.yaml b/clusters/cl01tl/deployment/stack/templates/application-set.yaml deleted file mode 100644 index 0cafa7044..000000000 --- a/clusters/cl01tl/deployment/stack/templates/application-set.yaml +++ /dev/null @@ -1,59 +0,0 @@ -{{- range $index, $stack := .Values.applicationSet }} ---- -apiVersion: argoproj.io/v1alpha1 -kind: ApplicationSet -metadata: - name: {{ $stack.name }} - namespace: {{ $.Release.Namespace }} - labels: - app.kubernetes.io/name: {{ $stack.name }} - app.kubernetes.io/instance: {{ $stack.name }} - app.kubernetes.io/part-of: {{ $.Release.Name }} - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - syncPolicy: - applicationsSync: create-update - preserveResourcesOnDeletion: true - generators: - - git: - repoURL: {{ $.Values.git.repo }} - revision: {{ $.Values.git.revision }} - directories: - - path: "clusters/{{ $.Values.cluster.name }}/{{ $stack.name }}/*" - template: - metadata: - name: '{{ `{{path.basename}}` }}' - spec: - destination: - name: in-cluster - namespace: '{{ $stack.namespace | default `{{path.basename}}` }}' - project: default - revisionHistoryLimit: 3 - source: - repoURL: {{ $.Values.git.repo }} - targetRevision: {{ $.Values.git.revision }} - path: '{{ `{{path}}` }}' - helm: - releaseName: "{{ `{{path.basename}}` }}" - {{- if $stack.ignoreDifferences }} - ignoreDifferences: - {{- toYaml $stack.ignoreDifferences | nindent 8 }} - {{ end }} - syncPolicy: - automated: - prune: {{ $stack.syncPolicy.automated.prune | default false }} - selfHeal: {{ $stack.syncPolicy.automated.selfHeal | default false }} - retry: - limit: 3 - backoff: - duration: 1m - factor: 2 - maxDuration: 15m - syncOptions: - - CreateNamespace={{ $stack.syncPolicy.syncOptions.createNamespace | default true }} - - ApplyOutOfSyncOnly={{ $stack.syncPolicy.syncOptions.applyOutOfSyncOnly | default true }} - - ServerSideApply={{ $stack.syncPolicy.syncOptions.serverSideApply | default true }} - - PruneLast={{ $stack.syncPolicy.syncOptions.pruneLast | default true }} - - RespectIgnoreDifferences={{ $stack.syncPolicy.syncOptions.respectIgnoreDifferences | default true }} -{{- end }} diff --git a/clusters/cl01tl/deployment/stack/values.yaml b/clusters/cl01tl/deployment/stack/values.yaml deleted file mode 100644 index c04bd74ff..000000000 --- a/clusters/cl01tl/deployment/stack/values.yaml +++ /dev/null @@ -1,16 +0,0 @@ -cluster: - name: cl01tl -git: - # repo: git@github.com:alexlebens/infrastructure.git - # repo: https://github.com/alexlebens/infrastructure.git - repo: http://gitea-http.gitea:3000/alexlebens/infrastructure - # repo: ssh://git@gitea-ssh.gitea/alexlebens/infrastructure - revision: HEAD -applicationSet: - - name: deployment - namespace: argocd - syncPolicy: - automated: - prune: true - syncOptions: - serverSideApply: true diff --git a/clusters/cl01tl/helm/argocd/Chart.lock b/clusters/cl01tl/helm/argocd/Chart.lock new file mode 100644 index 000000000..133e544ab --- /dev/null +++ b/clusters/cl01tl/helm/argocd/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: argo-cd + repository: https://argoproj.github.io/argo-helm + version: 9.1.5 +digest: sha256:07f7f6d369af426cdd213ddbc58373a4e5b4f54724efd4612662d7da0315232d +generated: "2025-12-02T21:27:41.876154-06:00" diff --git a/clusters/cl01tl/deployment/argocd/Chart.yaml b/clusters/cl01tl/helm/argocd/Chart.yaml similarity index 100% rename from clusters/cl01tl/deployment/argocd/Chart.yaml rename to clusters/cl01tl/helm/argocd/Chart.yaml diff --git a/clusters/cl01tl/deployment/argocd/templates/external-secret.yaml b/clusters/cl01tl/helm/argocd/templates/external-secret.yaml similarity index 100% rename from clusters/cl01tl/deployment/argocd/templates/external-secret.yaml rename to clusters/cl01tl/helm/argocd/templates/external-secret.yaml diff --git a/clusters/cl01tl/deployment/argocd/templates/http-route.yaml b/clusters/cl01tl/helm/argocd/templates/http-route.yaml similarity index 100% rename from clusters/cl01tl/deployment/argocd/templates/http-route.yaml rename to clusters/cl01tl/helm/argocd/templates/http-route.yaml diff --git a/clusters/cl01tl/deployment/argocd/values.yaml b/clusters/cl01tl/helm/argocd/values.yaml similarity index 100% rename from clusters/cl01tl/deployment/argocd/values.yaml rename to clusters/cl01tl/helm/argocd/values.yaml