From 31dbea7ef4db7bdfbf10276098bff58e77a223ef Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Sun, 19 Apr 2026 18:08:37 -0700 Subject: [PATCH 1/2] feat(platform): consume bootstrap OCI charts --- clusters/platform/bootstrap.yaml | 41 +++++++++++++++----------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/clusters/platform/bootstrap.yaml b/clusters/platform/bootstrap.yaml index cb4f3ca..9a84e80 100644 --- a/clusters/platform/bootstrap.yaml +++ b/clusters/platform/bootstrap.yaml @@ -8,15 +8,14 @@ metadata: spec: project: default source: - repoURL: https://github.com/GilmanLab/platform.git - targetRevision: e9a2ed85255af83f8435c35b0086fe6a42f5aebe - path: bootstrap/cilium - directory: - recurse: false - include: "*.yaml" + repoURL: ghcr.io/gilmanlab/platform/bootstrap + chart: cilium + targetRevision: 1.1.0 + helm: + releaseName: cilium destination: server: https://kubernetes.default.svc - namespace: argocd + namespace: kube-system syncPolicy: automated: prune: true @@ -33,12 +32,11 @@ metadata: spec: project: default source: - repoURL: https://github.com/GilmanLab/platform.git - targetRevision: e9a2ed85255af83f8435c35b0086fe6a42f5aebe - path: bootstrap/argocd - directory: - recurse: false - include: "*.yaml" + repoURL: ghcr.io/gilmanlab/platform/bootstrap + chart: argocd + targetRevision: 1.0.1 + helm: + releaseName: argocd destination: server: https://kubernetes.default.svc namespace: argocd @@ -47,7 +45,7 @@ spec: prune: true selfHeal: true syncOptions: - - CreateNamespace=false + - CreateNamespace=true - ServerSideApply=true --- apiVersion: argoproj.io/v1alpha1 @@ -58,19 +56,18 @@ metadata: spec: project: default source: - repoURL: https://github.com/GilmanLab/platform.git - targetRevision: e9a2ed85255af83f8435c35b0086fe6a42f5aebe - path: bootstrap/kro - directory: - recurse: false - include: "*.yaml" + repoURL: ghcr.io/gilmanlab/platform/bootstrap + chart: kro + targetRevision: 1.0.1 + helm: + releaseName: kro destination: server: https://kubernetes.default.svc - namespace: argocd + namespace: kro-system syncPolicy: automated: prune: true selfHeal: true syncOptions: - - CreateNamespace=false + - CreateNamespace=true - ServerSideApply=true From 8d01c28c323f0ac5ea91781e3a225842ed7c841b Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Sun, 19 Apr 2026 19:00:06 -0700 Subject: [PATCH 2/2] feat(argocd): seed platform bootstrap root app --- clusters/platform/bootstrap.yaml | 6 +++--- platform/argocd/bootstrap.yaml | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 platform/argocd/bootstrap.yaml diff --git a/clusters/platform/bootstrap.yaml b/clusters/platform/bootstrap.yaml index 9a84e80..b56abdb 100644 --- a/clusters/platform/bootstrap.yaml +++ b/clusters/platform/bootstrap.yaml @@ -10,7 +10,7 @@ spec: source: repoURL: ghcr.io/gilmanlab/platform/bootstrap chart: cilium - targetRevision: 1.1.0 + targetRevision: 1.2.0 helm: releaseName: cilium destination: @@ -34,7 +34,7 @@ spec: source: repoURL: ghcr.io/gilmanlab/platform/bootstrap chart: argocd - targetRevision: 1.0.1 + targetRevision: 1.1.0 helm: releaseName: argocd destination: @@ -58,7 +58,7 @@ spec: source: repoURL: ghcr.io/gilmanlab/platform/bootstrap chart: kro - targetRevision: 1.0.1 + targetRevision: 1.1.0 helm: releaseName: kro destination: diff --git a/platform/argocd/bootstrap.yaml b/platform/argocd/bootstrap.yaml new file mode 100644 index 0000000..b91f20b --- /dev/null +++ b/platform/argocd/bootstrap.yaml @@ -0,0 +1,24 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: platform-bootstrap-root + namespace: argocd +spec: + project: default + source: + repoURL: https://github.com/GilmanLab/gitops.git + targetRevision: master + path: clusters/platform + directory: + recurse: false + include: bootstrap.yaml + destination: + server: https://kubernetes.default.svc + namespace: argocd + syncPolicy: + automated: + prune: true + selfHeal: true + syncOptions: + - CreateNamespace=false + - ServerSideApply=true