refactor!: project updates (#1326)

* refactor!: flux is required again Signed-off-by: Devin Buhl <devin@buhl.casa> * fix: delimiter that chomps Signed-off-by: Devin Buhl <devin@buhl.casa> * fix: bootstrap_cloudflare logic Signed-off-by: Devin Buhl <devin@buhl.casa> * fix: update tests Signed-off-by: Devin Buhl <devin@buhl.casa> * fix: remove last quote Signed-off-by: Devin Buhl <devin@buhl.casa> * chore: update readme Signed-off-by: Devin Buhl <devin@buhl.casa> --------- Signed-off-by: Devin Buhl <devin@buhl.casa>
2024-02-15 20:03:24 -05:00
1 parent 04ff4ef994
commit c17d543b21
@@ -1 +1 @@
-main = lambda data: data.get("distribution", {}).get("type", "k3s") in ["k3s"]
+main = lambda data: data.get("bootstrap_distribution", "k3s") in ["k3s"]
@@ -3,12 +3,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
  - ./namespace.yaml
-  {% if distribution.type in ['k3s', 'talos'] %}
+  #% if bootstrap_distribution in ['k3s', 'talos'] %#
  - ./system-upgrade-controller/ks.yaml
-  {% endif %}
-  {% if distribution.type in ["k3s"] %}
+  #% endif %#
+  #% if bootstrap_distribution in ["k3s"] %#
  - ./k3s/ks.yaml
-  {% endif %}
-  {% if distribution.type in ["talos"] and distribution.talos.schematicID %}
+  #% endif %#
+  #% if bootstrap_distribution in ["talos"] and bootstrap_talos.schematic_id %#
  - ./talos/ks.yaml
-  {% endif %}
+  #% endif %#
@@ -1 +1 @@
-main = lambda data: data.get("distribution", {}).get("type", "k3s") in ['k3s', 'talos']
+main = lambda data: data.get("bootstrap_distribution", "k3s") in ["k3s", "talos"]
@@ -11,7 +11,7 @@ subjects:
  - kind: ServiceAccount
    name: system-upgrade
    namespace: system-upgrade
-{% if distribution.type in ["talos"] %}
+#% if bootstrap_distribution in ["talos"] %#
 ---
 apiVersion: talos.dev/v1alpha1
 kind: ServiceAccount
@@ -20,4 +20,4 @@ metadata:
 spec:
  roles:
    - os:admin
-{% endif %}
+#% endif %#
@@ -1,6 +1,4 @@
 main = lambda data: (
-    data.get("distribution", {}).get("type", "k3s") in ["talos"] and
-        data.get("distribution", {})
-            .get("talos", {})
-            .get("schematicID", {})
+    data.get("bootstrap_distribution", "k3s") in ["talos"] and
+        data.get("talos", {}).get("schematic_id", {})
 )
@@ -88,6 +88,6 @@ spec:
    args:
      - --nodes=$(NODE_IP)
      - upgrade
-      - --image=factory.talos.dev/installer/{{ distribution.talos.schematicID }}:$(SYSTEM_UPGRADE_PLAN_LATEST_VERSION)
+      - --image=factory.talos.dev/installer/#{ bootstrap_talos.schematic_id }#:$(SYSTEM_UPGRADE_PLAN_LATEST_VERSION)
      - --preserve=true
      - --wait=false