diff --git a/system/system-upgrade/kustomization.yaml b/system/system-upgrade/kustomization.yaml index 5b03ac28..4bb60753 100644 --- a/system/system-upgrade/kustomization.yaml +++ b/system/system-upgrade/kustomization.yaml @@ -3,6 +3,4 @@ kind: Kustomization resources: - https://github.com/rancher/system-upgrade-controller/releases/download/v0.8.1/system-upgrade-controller.yaml - # TODO re-enable rolling upgrade - # - k3s - # - rocky-linux + - k3s diff --git a/system/system-upgrade/rocky-linux/kustomization.yaml b/system/system-upgrade/rocky-linux/kustomization.yaml deleted file mode 100644 index 5dc3423d..00000000 --- a/system/system-upgrade/rocky-linux/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - upgrade.yaml - -commonAnnotations: - # TODO https://github.com/rancher/system-upgrade-controller/issues/172 - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true diff --git a/system/system-upgrade/rocky-linux/upgrade.yaml b/system/system-upgrade/rocky-linux/upgrade.yaml deleted file mode 100644 index e11833b3..00000000 --- a/system/system-upgrade/rocky-linux/upgrade.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: rocky-upgrade - namespace: system-upgrade -type: Opaque -stringData: - upgrade.sh: | - #!/bin/sh - set -e - dnf upgrade -y - command -v needs-restarting || dnf install -y dnf-utils - needs-restarting --reboothint || reboot ---- -apiVersion: upgrade.cattle.io/v1 -kind: Plan -metadata: - name: rocky-upgrade - namespace: system-upgrade -spec: - serviceAccountName: system-upgrade - secrets: - - name: rocky - path: /host/run/system-upgrade/secrets/rocky - upgrade: - image: rockylinux - command: - - chroot - - /host - args: - - sh - - /run/system-upgrade/secrets/rocky/upgrade.sh - concurrency: 1 - cordon: true - drain: - force: true - skipWaitForDeleteTimeout: 300 # Honor PodDisruptionBudgets - version: "20220123" # TODO dummy value