diff --git a/clusters/cl01tl/deployment/stack/values.yaml b/clusters/cl01tl/deployment/stack/values.yaml index dbf3bcf73..c04bd74ff 100644 --- a/clusters/cl01tl/deployment/stack/values.yaml +++ b/clusters/cl01tl/deployment/stack/values.yaml @@ -14,14 +14,3 @@ applicationSet: prune: true syncOptions: serverSideApply: true - - name: storage - ignoreDifferences: - - group: "" - kind: Service - jqPathExpressions: - - .spec.externalName - syncPolicy: - automated: - prune: true - syncOptions: - serverSideApply: true diff --git a/clusters/cl01tl/helm/cilium/Chart.lock b/clusters/cl01tl/helm/cilium/Chart.lock new file mode 100644 index 000000000..51d671768 --- /dev/null +++ b/clusters/cl01tl/helm/cilium/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: cilium + repository: https://helm.cilium.io/ + version: 1.18.4 +digest: sha256:e38eb92ee87c9a52b0f45a2451142ade02bac7d484b246d32379eacce3800bc8 +generated: "2025-12-02T17:17:49.043599-06:00" diff --git a/clusters/cl01tl/standalone/cilium/Chart.yaml b/clusters/cl01tl/helm/cilium/Chart.yaml similarity index 100% rename from clusters/cl01tl/standalone/cilium/Chart.yaml rename to clusters/cl01tl/helm/cilium/Chart.yaml diff --git a/clusters/cl01tl/standalone/cilium/templates/cilium-bgp-advertisement.yaml b/clusters/cl01tl/helm/cilium/templates/cilium-bgp-advertisement.yaml similarity index 100% rename from clusters/cl01tl/standalone/cilium/templates/cilium-bgp-advertisement.yaml rename to clusters/cl01tl/helm/cilium/templates/cilium-bgp-advertisement.yaml diff --git a/clusters/cl01tl/standalone/cilium/templates/cilium-bgp-cluster-config.yaml b/clusters/cl01tl/helm/cilium/templates/cilium-bgp-cluster-config.yaml similarity index 100% rename from clusters/cl01tl/standalone/cilium/templates/cilium-bgp-cluster-config.yaml rename to clusters/cl01tl/helm/cilium/templates/cilium-bgp-cluster-config.yaml diff --git a/clusters/cl01tl/standalone/cilium/templates/cilium-bgp-peer-config.yaml b/clusters/cl01tl/helm/cilium/templates/cilium-bgp-peer-config.yaml similarity index 100% rename from clusters/cl01tl/standalone/cilium/templates/cilium-bgp-peer-config.yaml rename to clusters/cl01tl/helm/cilium/templates/cilium-bgp-peer-config.yaml diff --git a/clusters/cl01tl/standalone/cilium/templates/cilium-load-balancer-ip-pool.yaml b/clusters/cl01tl/helm/cilium/templates/cilium-load-balancer-ip-pool.yaml similarity index 100% rename from clusters/cl01tl/standalone/cilium/templates/cilium-load-balancer-ip-pool.yaml rename to clusters/cl01tl/helm/cilium/templates/cilium-load-balancer-ip-pool.yaml diff --git a/clusters/cl01tl/standalone/cilium/templates/gateway.yaml b/clusters/cl01tl/helm/cilium/templates/gateway.yaml similarity index 100% rename from clusters/cl01tl/standalone/cilium/templates/gateway.yaml rename to clusters/cl01tl/helm/cilium/templates/gateway.yaml diff --git a/clusters/cl01tl/standalone/cilium/templates/http-route.yaml b/clusters/cl01tl/helm/cilium/templates/http-route.yaml similarity index 100% rename from clusters/cl01tl/standalone/cilium/templates/http-route.yaml rename to clusters/cl01tl/helm/cilium/templates/http-route.yaml diff --git a/clusters/cl01tl/standalone/cilium/values.yaml b/clusters/cl01tl/helm/cilium/values.yaml similarity index 100% rename from clusters/cl01tl/standalone/cilium/values.yaml rename to clusters/cl01tl/helm/cilium/values.yaml diff --git a/clusters/cl01tl/helm/coredns/Chart.lock b/clusters/cl01tl/helm/coredns/Chart.lock new file mode 100644 index 000000000..ba6c9b29b --- /dev/null +++ b/clusters/cl01tl/helm/coredns/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: coredns + repository: https://coredns.github.io/helm + version: 1.45.0 +digest: sha256:cfcb22a7d0bce4d6000800706597ae43faec74255f1deb5cc3279b2d0a81f6c6 +generated: "2025-12-02T17:17:52.206039-06:00" diff --git a/clusters/cl01tl/standalone/coredns/Chart.yaml b/clusters/cl01tl/helm/coredns/Chart.yaml similarity index 100% rename from clusters/cl01tl/standalone/coredns/Chart.yaml rename to clusters/cl01tl/helm/coredns/Chart.yaml diff --git a/clusters/cl01tl/standalone/coredns/values.yaml b/clusters/cl01tl/helm/coredns/values.yaml similarity index 100% rename from clusters/cl01tl/standalone/coredns/values.yaml rename to clusters/cl01tl/helm/coredns/values.yaml diff --git a/clusters/cl01tl/helm/kubelet-serving-cert-approver/Chart.lock b/clusters/cl01tl/helm/kubelet-serving-cert-approver/Chart.lock new file mode 100644 index 000000000..a6065826e --- /dev/null +++ b/clusters/cl01tl/helm/kubelet-serving-cert-approver/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: app-template + repository: https://bjw-s-labs.github.io/helm-charts/ + version: 4.4.0 +digest: sha256:3a7aa84837ff6fe008d5eb3b39aeafa0abb7be470db2b6aac78e190365a75c0c +generated: "2025-12-02T17:18:28.155875-06:00" diff --git a/clusters/cl01tl/standalone/kubelet-serving-cert-approver/Chart.yaml b/clusters/cl01tl/helm/kubelet-serving-cert-approver/Chart.yaml similarity index 100% rename from clusters/cl01tl/standalone/kubelet-serving-cert-approver/Chart.yaml rename to clusters/cl01tl/helm/kubelet-serving-cert-approver/Chart.yaml diff --git a/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/cluster-role-binding.yaml b/clusters/cl01tl/helm/kubelet-serving-cert-approver/templates/cluster-role-binding.yaml similarity index 100% rename from clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/cluster-role-binding.yaml rename to clusters/cl01tl/helm/kubelet-serving-cert-approver/templates/cluster-role-binding.yaml diff --git a/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/cluster-role.yaml b/clusters/cl01tl/helm/kubelet-serving-cert-approver/templates/cluster-role.yaml similarity index 100% rename from clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/cluster-role.yaml rename to clusters/cl01tl/helm/kubelet-serving-cert-approver/templates/cluster-role.yaml diff --git a/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/namespace.yaml b/clusters/cl01tl/helm/kubelet-serving-cert-approver/templates/namespace.yaml similarity index 100% rename from clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/namespace.yaml rename to clusters/cl01tl/helm/kubelet-serving-cert-approver/templates/namespace.yaml diff --git a/clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/role-binding.yaml b/clusters/cl01tl/helm/kubelet-serving-cert-approver/templates/role-binding.yaml similarity index 100% rename from clusters/cl01tl/standalone/kubelet-serving-cert-approver/templates/role-binding.yaml rename to clusters/cl01tl/helm/kubelet-serving-cert-approver/templates/role-binding.yaml diff --git a/clusters/cl01tl/standalone/kubelet-serving-cert-approver/values.yaml b/clusters/cl01tl/helm/kubelet-serving-cert-approver/values.yaml similarity index 100% rename from clusters/cl01tl/standalone/kubelet-serving-cert-approver/values.yaml rename to clusters/cl01tl/helm/kubelet-serving-cert-approver/values.yaml diff --git a/clusters/cl01tl/helm/metrics-server/Chart.lock b/clusters/cl01tl/helm/metrics-server/Chart.lock new file mode 100644 index 000000000..6d84b56ff --- /dev/null +++ b/clusters/cl01tl/helm/metrics-server/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: metrics-server + repository: https://kubernetes-sigs.github.io/metrics-server/ + version: 3.13.0 +digest: sha256:ada810d4bcaa68d1dfd2c7d4c8f3e8cd25bbdff004261f09115d58a48fee59dd +generated: "2025-12-02T17:18:42.831894-06:00" diff --git a/clusters/cl01tl/standalone/metrics-server/Chart.yaml b/clusters/cl01tl/helm/metrics-server/Chart.yaml similarity index 100% rename from clusters/cl01tl/standalone/metrics-server/Chart.yaml rename to clusters/cl01tl/helm/metrics-server/Chart.yaml diff --git a/clusters/cl01tl/standalone/metrics-server/values.yaml b/clusters/cl01tl/helm/metrics-server/values.yaml similarity index 100% rename from clusters/cl01tl/standalone/metrics-server/values.yaml rename to clusters/cl01tl/helm/metrics-server/values.yaml diff --git a/clusters/cl01tl/helm/prometheus-operator-crds/Chart.lock b/clusters/cl01tl/helm/prometheus-operator-crds/Chart.lock new file mode 100644 index 000000000..824129db8 --- /dev/null +++ b/clusters/cl01tl/helm/prometheus-operator-crds/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: prometheus-operator-crds + repository: oci://ghcr.io/prometheus-community/charts + version: 25.0.0 +digest: sha256:9d103810351095faa83536eb9de22b45a80ea2cf9ccfe9add3d2f5f294ab30c0 +generated: "2025-12-02T17:19:01.082597-06:00" diff --git a/clusters/cl01tl/standalone/prometheus-operator-crds/Chart.yaml b/clusters/cl01tl/helm/prometheus-operator-crds/Chart.yaml similarity index 100% rename from clusters/cl01tl/standalone/prometheus-operator-crds/Chart.yaml rename to clusters/cl01tl/helm/prometheus-operator-crds/Chart.yaml diff --git a/clusters/cl01tl/helm/stack/templates/application-set.yaml b/clusters/cl01tl/helm/stack/templates/application-set.yaml index cf553edd9..fba81ac42 100644 --- a/clusters/cl01tl/helm/stack/templates/application-set.yaml +++ b/clusters/cl01tl/helm/stack/templates/application-set.yaml @@ -20,6 +20,16 @@ spec: - path: clusters/cl01tl/manifests/* - path: clusters/cl01tl/manifests/stack exclude: true + - path: clusters/cl01tl/manifests/cilium + exclude: true + - path: clusters/cl01tl/manifests/coredns + exclude: true + - path: clusters/cl01tl/manifests/metrics-server + exclude: true + - path: clusters/cl01tl/manifests/kubelet-serving-cert-approver + exclude: true + - path: clusters/cl01tl/manifests/prometheus-operator-crds + exclude: true template: metadata: name: '{{ `{{path.basename}}` }}' diff --git a/clusters/cl01tl/helm/stack/templates/application.yaml b/clusters/cl01tl/helm/stack/templates/application.yaml index 47544eaba..43ec678c0 100644 --- a/clusters/cl01tl/helm/stack/templates/application.yaml +++ b/clusters/cl01tl/helm/stack/templates/application.yaml @@ -35,3 +35,199 @@ spec: - ServerSideApply=true - PruneLast=true - RespectIgnoreDifferences=true + +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: cilium + namespace: argocd + labels: + app.kubernetes.io/name: cilium + app.kubernetes.io/instance: argocd + app.kubernetes.io/part-of: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: default + source: + repoURL: http://gitea-http.gitea:3000/alexlebens/infrastructure + targetRevision: manifests + path: clusters/cl01tl/manifests/cilium + destination: + name: in-cluster + namespace: kube-system + revisionHistoryLimit: 3 + ignoreDifferences: + - group: monitoring.coreos.com + kind: ServiceMonitor + jqPathExpressions: + - .spec.endpoints[]?.relabelings[]?.action + syncPolicy: + automated: + prune: true + selfHeal: false + retry: + limit: 3 + backoff: + duration: 1m + factor: 2 + maxDuration: 15m + syncOptions: + - CreateNamespace=false + - ApplyOutOfSyncOnly=true + - ServerSideApply=true + - PruneLast=true + - RespectIgnoreDifferences=true + +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: coredns + namespace: argocd + labels: + app.kubernetes.io/name: coredns + app.kubernetes.io/instance: argocd + app.kubernetes.io/part-of: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: default + source: + repoURL: http://gitea-http.gitea:3000/alexlebens/infrastructure + targetRevision: manifests + path: clusters/cl01tl/manifests/coredns + destination: + name: in-cluster + namespace: kube-system + revisionHistoryLimit: 3 + syncPolicy: + automated: + prune: true + selfHeal: true + retry: + limit: 3 + backoff: + duration: 1m + factor: 2 + maxDuration: 15m + syncOptions: + - CreateNamespace=false + - ApplyOutOfSyncOnly=true + - ServerSideApply=true + - PruneLast=true + +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: metrics-server + namespace: argocd + labels: + app.kubernetes.io/name: metrics-server + app.kubernetes.io/instance: argocd + app.kubernetes.io/part-of: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: default + source: + repoURL: http://gitea-http.gitea:3000/alexlebens/infrastructure + targetRevision: manifests + path: clusters/cl01tl/manifests/metrics-server + destination: + name: in-cluster + namespace: kube-system + revisionHistoryLimit: 3 + syncPolicy: + automated: + prune: true + selfHeal: true + retry: + limit: 3 + backoff: + duration: 1m + factor: 2 + maxDuration: 15m + syncOptions: + - CreateNamespace=false + - ApplyOutOfSyncOnly=true + - ServerSideApply=true + - PruneLast=true + +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: kubelet-serving-cert-approver + namespace: argocd + labels: + app.kubernetes.io/name: kubelet-serving-cert-approver + app.kubernetes.io/instance: argocd + app.kubernetes.io/part-of: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: default + source: + repoURL: http://gitea-http.gitea:3000/alexlebens/infrastructure + targetRevision: manifests + path: clusters/cl01tl/manifests/kubelet-serving-cert-approver + destination: + name: in-cluster + namespace: kubelet-serving-cert-approver + revisionHistoryLimit: 3 + syncPolicy: + automated: + prune: true + selfHeal: false + retry: + limit: 3 + backoff: + duration: 1m + factor: 2 + maxDuration: 15m + syncOptions: + - CreateNamespace=true + - ApplyOutOfSyncOnly=true + - ServerSideApply=true + - PruneLast=true + +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: prometheus-operator-crds + namespace: argocd + labels: + app.kubernetes.io/name: prometheus-operator-crds + app.kubernetes.io/instance: argocd + app.kubernetes.io/part-of: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: default + source: + repoURL: http://gitea-http.gitea:3000/alexlebens/infrastructure + targetRevision: manifests + path: clusters/cl01tl/manifests/prometheus-operator-crds + destination: + name: in-cluster + namespace: kube-system + revisionHistoryLimit: 3 + syncPolicy: + automated: + prune: true + selfHeal: false + retry: + limit: 3 + backoff: + duration: 1m + factor: 2 + maxDuration: 15m + syncOptions: + - CreateNamespace=false + - ApplyOutOfSyncOnly=true + - ServerSideApply=true + - PruneLast=true