feat(helm): install system-upgrade

willianpaixao · Oct 28, 2024 · 8cd8b78 · 8cd8b78
1 parent 3500265
commit 8cd8b78
Show file tree

Hide file tree

Showing 23 changed files with 52 additions and 335 deletions.
diff --git a/bootstrap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/.mjfilter.py b/bootstrap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/.mjfilter.py
diff --git a/bootstrap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/app/helmrelease.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/app/helmrelease.yaml.j2
diff --git a/...trap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/app/kustomization.yaml.j2 b/...trap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/app/kustomization.yaml.j2
diff --git a/bootstrap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/ks.yaml.j2
diff --git a/bootstrap/templates/kubernetes/apps/system-upgrade/.mjfilter.py b/bootstrap/templates/kubernetes/apps/system-upgrade/.mjfilter.py
diff --git a/bootstrap/templates/kubernetes/apps/system-upgrade/k3s/app/plan.yaml.j2 b/bootstrap/templates/kubernetes/apps/system-upgrade/k3s/app/plan.yaml.j2
diff --git a/bootstrap/templates/kubernetes/apps/system-upgrade/k3s/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/system-upgrade/k3s/ks.yaml.j2
diff --git a/bootstrap/templates/kubernetes/apps/system-upgrade/kustomization.yaml.j2 b/bootstrap/templates/kubernetes/apps/system-upgrade/kustomization.yaml.j2
diff --git a/bootstrap/templates/kubernetes/apps/system-upgrade/namespace.yaml.j2 b/bootstrap/templates/kubernetes/apps/system-upgrade/namespace.yaml.j2
diff --git a/...emplates/kubernetes/apps/system-upgrade/system-upgrade-controller/app/helmrelease.yaml.j2 b/...emplates/kubernetes/apps/system-upgrade/system-upgrade-controller/app/helmrelease.yaml.j2
diff --git a/...plates/kubernetes/apps/system-upgrade/system-upgrade-controller/app/kustomization.yaml.j2 b/...plates/kubernetes/apps/system-upgrade/system-upgrade-controller/app/kustomization.yaml.j2
diff --git a/...strap/templates/kubernetes/apps/system-upgrade/system-upgrade-controller/app/rbac.yaml.j2 b/...strap/templates/kubernetes/apps/system-upgrade/system-upgrade-controller/app/rbac.yaml.j2
diff --git a/bootstrap/templates/kubernetes/apps/system-upgrade/system-upgrade-controller/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/system-upgrade/system-upgrade-controller/ks.yaml.j2
diff --git a/kubernetes/main/apps/system-upgrade/kustomization.yaml b/kubernetes/main/apps/system-upgrade/kustomization.yaml
diff --git a/...system-upgrade/k3s/app/kustomization.yaml → ...system-upgrade/k3s/app/kustomization.yaml b/...system-upgrade/k3s/app/kustomization.yaml → ...system-upgrade/k3s/app/kustomization.yaml
@@ -2,4 +2,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./plan.yaml
+  - plan.yaml
diff --git a/...ain/apps/system-upgrade/k3s/app/plan.yaml → ...aspberry/system-upgrade/k3s/app/plan.yaml b/...ain/apps/system-upgrade/k3s/app/plan.yaml → ...aspberry/system-upgrade/k3s/app/plan.yaml
@@ -3,6 +3,7 @@ apiVersion: upgrade.cattle.io/v1
 kind: Plan
 metadata:
   name: controllers
+  namespace: system-upgrade
 spec:
   version: "${KUBE_VERSION}"
   upgrade:
@@ -35,6 +36,7 @@ apiVersion: upgrade.cattle.io/v1
 kind: Plan
 metadata:
   name: workers
+  namespace: system-upgrade
 spec:
   version: "${KUBE_VERSION}"
   serviceAccountName: system-upgrade
@@ -46,5 +48,8 @@ spec:
   prepare:
     image: rancher/k3s-upgrade
     args: ["prepare", "controllers"]
+  drain:
+    force: true
+    skipWaitForDeleteTimeout: 60
   upgrade:
     image: rancher/k3s-upgrade
diff --git a/...etes/main/apps/system-upgrade/k3s/ks.yaml → ...etes/raspberry/system-upgrade/k3s/ks.yaml b/...etes/main/apps/system-upgrade/k3s/ks.yaml → ...etes/raspberry/system-upgrade/k3s/ks.yaml
@@ -12,13 +12,13 @@ spec:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: system-upgrade-controller
-  path: ./kubernetes/main/apps/system-upgrade/k3s/app
+  path: ./kubernetes/raspberry/system-upgrade/k3s/app
   prune: true
   sourceRef:
     kind: GitRepository
-    name: home-kubernetes
+    name: flux-system
   wait: false
-  interval: 30m
+  interval: 1h
   retryInterval: 1m
   timeout: 5m
   postBuild:

diff --git a/...tem-upgrade/k3s/app/kustomization.yaml.j2 → ...spberry/system-upgrade/kustomization.yaml b/...tem-upgrade/k3s/app/kustomization.yaml.j2 → ...spberry/system-upgrade/kustomization.yaml
@@ -2,4 +2,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./plan.yaml
+  - k3s/ks.yaml
+  - namespace.yaml
+  - system-upgrade-controller/ks.yaml
diff --git a/...s/main/apps/system-upgrade/namespace.yaml → ...s/raspberry/system-upgrade/namespace.yaml b/...s/main/apps/system-upgrade/namespace.yaml → ...s/raspberry/system-upgrade/namespace.yaml
@@ -5,3 +5,4 @@ metadata:
   name: system-upgrade
   labels:
     kustomize.toolkit.fluxcd.io/prune: disabled
+    pod-security.kubernetes.io/enforce: privileged