From fc97042854a5ac70638efedbb7bf74022dcd15e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?c=C4=83t=C4=83lin?= <catalin@roboces.dev>
Date: Sun, 18 Feb 2024 11:04:10 +0100
Subject: [PATCH] feat: remove system-upgrade service

---
 k8s/argo-apps/system-upgrade-controller.yml | 20 ---------
 k8s/services/miniflux/ingress.yaml          | 28 ++++++------
 k8s/services/system-upgrade/plan.yaml       | 50 ---------------------
 3 files changed, 13 insertions(+), 85 deletions(-)
 delete mode 100644 k8s/argo-apps/system-upgrade-controller.yml
 delete mode 100644 k8s/services/system-upgrade/plan.yaml

diff --git a/k8s/argo-apps/system-upgrade-controller.yml b/k8s/argo-apps/system-upgrade-controller.yml
deleted file mode 100644
index abc633d..0000000
--- a/k8s/argo-apps/system-upgrade-controller.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: system-upgrade
-  namespace: argocd
-spec:
-  destination:
-    name: ''
-    namespace: 'system-upgrade'
-    server: "https://kubernetes.default.svc"
-  sources:
-    - repoURL: https://github.com/rancher/system-upgrade-controller.git
-      targetRevision: v0.13.2
-      path: manifests/
-    - repoURL: https://git.roboces.dev/catalin/fukuops.git
-      path: k8s/services/argo
-      targetRevision: main
-  syncPolicy:
-    automated: { }
-  project: management
\ No newline at end of file
diff --git a/k8s/services/miniflux/ingress.yaml b/k8s/services/miniflux/ingress.yaml
index c1c0e4c..1583819 100644
--- a/k8s/services/miniflux/ingress.yaml
+++ b/k8s/services/miniflux/ingress.yaml
@@ -1,18 +1,16 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
 metadata:
-  name: miniflux-ingress
+  name: miniflux
   namespace: apps-roboces
 spec:
-  ingressClassName: traefik
-  rules:
-    - host: feeds.roboces.dev
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: miniflux-service
-                port:
-                  number: 8888
+  entryPoints:
+    - web
+    - websecure
+  routes:
+    - kind: Rule
+      match: Host(`feeds.roboces.dev`)
+      priority: 10
+      services:
+        - name: miniflux-service
+          port: 8888
diff --git a/k8s/services/system-upgrade/plan.yaml b/k8s/services/system-upgrade/plan.yaml
deleted file mode 100644
index 1069560..0000000
--- a/k8s/services/system-upgrade/plan.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-# These plans are adapted from work by Dax McDonald (https://github.com/daxmc99) and Hussein Galal (https://github.com/galal-hussein)
-# in support of Rancher v2 managed k3s upgrades. See Also: https://rancher.com/docs/k3s/latest/en/upgrades/automated/
----
-apiVersion: upgrade.cattle.io/v1
-kind: Plan
-metadata:
-  name: k3s-server
-  namespace: system-upgrade
-  labels:
-    k3s-upgrade: server
-spec:
-  concurrency: 1 # Batch size (roughly maps to maximum number of unschedulable nodes)
-  version: v1.20.11+k3s1
-  nodeSelector:
-    matchExpressions:
-      - {key: k3s-upgrade, operator: Exists}
-      - {key: k3s-upgrade, operator: NotIn, values: ["disabled", "false"]}
-      - {key: k3os.io/mode, operator: DoesNotExist}
-      - {key: node-role.kubernetes.io/control-plane, operator: Exists}
-  serviceAccountName: system-upgrade
-  cordon: true
-  upgrade:
-    image: rancher/k3s-upgrade
----
-apiVersion: upgrade.cattle.io/v1
-kind: Plan
-metadata:
-  name: k3s-agent
-  namespace: system-upgrade
-  labels:
-    k3s-upgrade: agent
-spec:
-  concurrency: 2 # Batch size (roughly maps to maximum number of unschedulable nodes)
-  version: v1.20.11+k3s1
-  nodeSelector:
-    matchExpressions:
-      - {key: k3s-upgrade, operator: Exists}
-      - {key: k3s-upgrade, operator: NotIn, values: ["disabled", "false"]}
-      - {key: k3os.io/mode, operator: DoesNotExist}
-      - {key: node-role.kubernetes.io/control-plane, operator: DoesNotExist}
-  serviceAccountName: system-upgrade
-  prepare:
-    # Defaults to the same "resolved" tag that is used for the `upgrade` container, NOT `latest`
-    image: rancher/k3s-upgrade
-    args: ["prepare", "k3s-server"]
-  drain:
-    force: true
-    skipWaitForDeleteTimeout: 60 # 1.18+ (honor pod disruption budgets up to 60 seconds per pod then moves on)
-  upgrade:
-    image: rancher/k3s-upgrade
\ No newline at end of file