From 560b20c3449f6911c6a1c02069ffc3a29a64872e Mon Sep 17 00:00:00 2001 From: Jiaqi Luo <6218999+jiaqiluo@users.noreply.github.com> Date: Mon, 15 May 2023 15:29:11 -0700 Subject: [PATCH] [system-upgrade-controller] bump the upstream to 0.5.0, and fix patch files --- .../generated-changes/exclude/questions.yml | 2 +- .../generated-changes/patch/Chart.yaml.patch | 10 +++++----- packages/system-upgrade-controller/package.yaml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/system-upgrade-controller/generated-changes/exclude/questions.yml b/packages/system-upgrade-controller/generated-changes/exclude/questions.yml index 8f74f7ab7..d07922d42 100644 --- a/packages/system-upgrade-controller/generated-changes/exclude/questions.yml +++ b/packages/system-upgrade-controller/generated-changes/exclude/questions.yml @@ -1 +1 @@ -rancher_min_version: 2.6.0-alpha1 +rancher_min_version: 2.7.0-alpha1 diff --git a/packages/system-upgrade-controller/generated-changes/patch/Chart.yaml.patch b/packages/system-upgrade-controller/generated-changes/patch/Chart.yaml.patch index e4df0e1ba..91774867a 100644 --- a/packages/system-upgrade-controller/generated-changes/patch/Chart.yaml.patch +++ b/packages/system-upgrade-controller/generated-changes/patch/Chart.yaml.patch @@ -4,22 +4,22 @@ +annotations: + catalog.cattle.io/certified: rancher + catalog.cattle.io/hidden: "true" -+ catalog.cattle.io/kube-version: '>= 1.18.0-0 < 1.26.0-0' ++ catalog.cattle.io/kube-version: '>= 1.23.0-0 < 1.27.0-0' + catalog.cattle.io/namespace: cattle-system + catalog.cattle.io/os: linux + catalog.cattle.io/permits-os: linux,windows + catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0' + catalog.cattle.io/release-name: system-upgrade-controller apiVersion: v1 - appVersion: v0.10.0 + appVersion: v0.11.0 -description: Enables a k3s or rke2 cluster to update itself by reacting to Plan CRs. - Users do not need to manually upgrade this app. It will be automatically upgraded - to the latest version when upgrading a cluster. -+description: General purpose controller to make system level updates to nodes ++description: General purpose controller to make system level updates to nodes. home: https://github.com/rancher/system-charts/blob/dev-v2.7/charts/rancher-k3s-upgrader - kubeVersion: '>= 1.16.0-0' + kubeVersion: '>= 1.23.0-0' -name: rancher-k3s-upgrader +name: system-upgrade-controller sources: - https://github.com/rancher/system-charts/blob/dev-v2.7/charts/rancher-k3s-upgrader - version: 0.4.0 + version: 0.5.0 diff --git a/packages/system-upgrade-controller/package.yaml b/packages/system-upgrade-controller/package.yaml index 2ad7de009..9e2c68a84 100644 --- a/packages/system-upgrade-controller/package.yaml +++ b/packages/system-upgrade-controller/package.yaml @@ -1,4 +1,4 @@ url: https://github.com/rancher/system-charts.git -subdirectory: charts/rancher-k3s-upgrader/0.4.0 -commit: f89e0e0885e8e069ca21c72759dbd8b27ec44960 -version: 102.0.0 +subdirectory: charts/rancher-k3s-upgrader/0.5.0 +commit: a0121d8275948b1f7cfc4d63703b91a89dcb08ba +version: 102.1.0