From c542a1d993a6775d8dffaeb2dbd61f41c245fa2d Mon Sep 17 00:00:00 2001 From: joshmeranda Date: Thu, 29 Feb 2024 15:17:04 -0500 Subject: [PATCH 1/7] bump charts-build-scripts to 0.5.5 --- scripts/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/version b/scripts/version index 215036aab5..b45ec5f4fd 100755 --- a/scripts/version +++ b/scripts/version @@ -2,4 +2,4 @@ set -e CHARTS_BUILD_SCRIPTS_REPO=https://github.com/rancher/charts-build-scripts.git -CHARTS_BUILD_SCRIPT_VERSION="${CHARTS_BUILD_SCRIPT_VERSION:-v0.5.2}" +CHARTS_BUILD_SCRIPT_VERSION="${CHARTS_BUILD_SCRIPT_VERSION:-v0.5.5}" From 5c923455b30bbc8f40408cdd77b6da990da8e7b6 Mon Sep 17 00:00:00 2001 From: joshmeranda Date: Thu, 29 Feb 2024 18:26:45 -0500 Subject: [PATCH 2/7] rancher-monitoring/rancher-monitoring - fixing compatibility issues --- .../generated-changes/patch/Chart.yaml.patch | 89 ++++++++++++++++++- 1 file changed, 86 insertions(+), 3 deletions(-) diff --git a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/Chart.yaml.patch b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/Chart.yaml.patch index b2a4ef8ecb..a77c8a41df 100644 --- a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/Chart.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/Chart.yaml +++ charts/Chart.yaml -@@ -6,6 +6,21 @@ +@@ -6,97 +6,90 @@ - name: Upstream Project url: https://github.com/prometheus-operator/kube-prometheus artifacthub.io/operator: "true" @@ -22,16 +22,99 @@ apiVersion: v2 appVersion: v0.65.1 dependencies: -@@ -72,7 +87,7 @@ + - condition: grafana.enabled + name: grafana + repository: file://./charts/grafana +- version: 6.59.0 + - condition: hardenedKubelet.enabled + name: hardenedKubelet + repository: file://./charts/hardenedKubelet +- version: 0.1.6 + - condition: hardenedNodeExporter.enabled + name: hardenedNodeExporter + repository: file://./charts/hardenedNodeExporter +- version: 0.1.6 + - condition: k3sServer.enabled + name: k3sServer + repository: file://./charts/k3sServer +- version: 0.1.6 + - condition: kubeStateMetrics.enabled + name: kube-state-metrics + repository: file://./charts/kube-state-metrics +- version: 5.8.1 + - condition: kubeAdmControllerManager.enabled + name: kubeAdmControllerManager + repository: file://./charts/kubeAdmControllerManager +- version: 0.1.6 + - condition: kubeAdmEtcd.enabled + name: kubeAdmEtcd + repository: file://./charts/kubeAdmEtcd +- version: 0.1.6 + - condition: kubeAdmProxy.enabled + name: kubeAdmProxy + repository: file://./charts/kubeAdmProxy +- version: 0.1.6 + - condition: kubeAdmScheduler.enabled + name: kubeAdmScheduler + repository: file://./charts/kubeAdmScheduler +- version: 0.1.6 + - condition: prometheus-adapter.enabled + name: prometheus-adapter + repository: file://./charts/prometheus-adapter +- version: 4.2.0 + - condition: nodeExporter.enabled + name: prometheus-node-exporter + repository: file://./charts/prometheus-node-exporter +- version: 4.20.0 + - condition: rke2ControllerManager.enabled + name: rke2ControllerManager + repository: file://./charts/rke2ControllerManager +- version: 0.1.6 + - condition: rke2Etcd.enabled + name: rke2Etcd + repository: file://./charts/rke2Etcd +- version: 0.1.6 + - condition: rke2IngressNginx.enabled + name: rke2IngressNginx + repository: file://./charts/rke2IngressNginx +- version: 0.1.6 + - condition: rke2Proxy.enabled + name: rke2Proxy + repository: file://./charts/rke2Proxy +- version: 0.1.6 + - condition: rke2Scheduler.enabled + name: rke2Scheduler + repository: file://./charts/rke2Scheduler +- version: 0.1.6 + - condition: rkeControllerManager.enabled + name: rkeControllerManager + repository: file://./charts/rkeControllerManager +- version: 0.1.6 + - condition: rkeEtcd.enabled + name: rkeEtcd + repository: file://./charts/rkeEtcd +- version: 0.1.6 + - condition: rkeIngressNginx.enabled + name: rkeIngressNginx + repository: file://./charts/rkeIngressNginx +- version: 0.1.6 + - condition: rkeProxy.enabled + name: rkeProxy + repository: file://./charts/rkeProxy +- version: 0.1.6 - condition: rkeScheduler.enabled name: rkeScheduler repository: file://./charts/rkeScheduler +- version: 0.1.6 -- condition: windowsExporter.enabled +- condition: global.cattle.windows.enabled name: windowsExporter repository: file://./charts/windowsExporter +- version: 0.1.1 description: kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards, -@@ -101,7 +116,7 @@ + and Prometheus rules combined with documentation and scripts to provide easy to + operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus +@@ -123,7 +116,7 @@ name: Xtigyro - email: quentin.bisson@gmail.com name: QuentinBisson From 86c8bb8f603e45353527ad463c7ccfd6ac01a510 Mon Sep 17 00:00:00 2001 From: joshmeranda Date: Thu, 29 Feb 2024 17:43:00 -0500 Subject: [PATCH 3/7] rancher-sriov - fixing compatibility issues --- .../rancher-sriov/generated-changes/patch/Chart.yaml.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/rancher-sriov/generated-changes/patch/Chart.yaml.patch b/packages/rancher-sriov/generated-changes/patch/Chart.yaml.patch index 84538a6fc9..13b05227e1 100644 --- a/packages/rancher-sriov/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-sriov/generated-changes/patch/Chart.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/Chart.yaml +++ charts/Chart.yaml -@@ -1,17 +1,29 @@ +@@ -1,18 +1,29 @@ +annotations: + catalog.cattle.io/auto-install: sriov-crd=match + catalog.cattle.io/certified: rancher @@ -18,6 +18,7 @@ -- condition: rancher-nfd.enabled - name: rancher-nfd - repository: file://./charts/rancher-nfd +- version: 0.14.1 +appVersion: 1.2.0 description: SR-IOV network operator configures and manages SR-IOV networks in the kubernetes cluster From b6172d11e534c909fa5d05ab348db9256dcf2791 Mon Sep 17 00:00:00 2001 From: joshmeranda Date: Thu, 29 Feb 2024 17:47:56 -0500 Subject: [PATCH 4/7] epinio/epinio - fixing compatibility issues --- .../generated-changes/patch/Chart.yaml.patch | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/packages/epinio/epinio/generated-changes/patch/Chart.yaml.patch b/packages/epinio/epinio/generated-changes/patch/Chart.yaml.patch index aee1a5dcbd..0b5d366f42 100644 --- a/packages/epinio/epinio/generated-changes/patch/Chart.yaml.patch +++ b/packages/epinio/epinio/generated-changes/patch/Chart.yaml.patch @@ -18,7 +18,29 @@ apiVersion: v2 appVersion: v1.10.0 dependencies: -@@ -27,7 +38,7 @@ +@@ -9,29 +20,25 @@ + repository: file://./charts/dex + tags: + - dex +- version: 0.15.2 + - condition: kubed.enabled, global.kubed.enabled + name: kubed + repository: file://./charts/kubed + tags: + - kubed +- version: v0.13.2 + - condition: minio.enabled, global.minio.enabled + name: minio + repository: file://./charts/minio + tags: + - minio +- version: 5.0.13 + - condition: s3gw.enabled, global.s3gw.enabled + name: s3gw + repository: file://./charts/s3gw + tags: + - s3gw +- version: 0.14.0 description: Epinio deploys Kubernetes applications directly from source code in one step. home: https://github.com/epinio/epinio From 657e1aeae81b3c60fd7aaa2df702a4d123c51e52 Mon Sep 17 00:00:00 2001 From: joshmeranda Date: Thu, 29 Feb 2024 17:55:31 -0500 Subject: [PATCH 5/7] rancher-monitoring/prometheus-federator - fixing compatibility issues --- .../generated-changes/patch/Chart.yaml.patch | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/rancher-monitoring/prometheus-federator/generated-changes/patch/Chart.yaml.patch b/packages/rancher-monitoring/prometheus-federator/generated-changes/patch/Chart.yaml.patch index 9391b85a72..a3135c270d 100644 --- a/packages/rancher-monitoring/prometheus-federator/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-monitoring/prometheus-federator/generated-changes/patch/Chart.yaml.patch @@ -13,3 +13,11 @@ catalog.cattle.io/release-name: prometheus-federator apiVersion: v2 appVersion: 0.3.4 +@@ -12,7 +14,6 @@ + - condition: helmProjectOperator.enabled + name: helmProjectOperator + repository: file://./charts/helmProjectOperator +- version: 0.2.1 + description: Prometheus Federator + icon: https://raw.githubusercontent.com/rancher/prometheus-federator/main/assets/logos/prometheus-federator.svg + name: prometheus-federator From 7bb2debeb1c8cfd57741627417574555aadd968e Mon Sep 17 00:00:00 2001 From: joshmeranda Date: Thu, 28 Mar 2024 17:56:48 -0400 Subject: [PATCH 6/7] harvester/harvester-cloud-provider - fix compatibility issues --- .../generated-changes/patch/Chart.yaml.patch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/harvester/harvester-cloud-provider/generated-changes/patch/Chart.yaml.patch b/packages/harvester/harvester-cloud-provider/generated-changes/patch/Chart.yaml.patch index dc03c34bf6..3a3347ab94 100644 --- a/packages/harvester/harvester-cloud-provider/generated-changes/patch/Chart.yaml.patch +++ b/packages/harvester/harvester-cloud-provider/generated-changes/patch/Chart.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/Chart.yaml +++ charts/Chart.yaml -@@ -1,13 +1,14 @@ +@@ -1,19 +1,19 @@ annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/display-name: Harvester Cloud Provider @@ -18,3 +18,9 @@ apiVersion: v2 appVersion: v0.2.0 dependencies: + - name: kube-vip + repository: file://./charts/kube-vip +- version: 0.4.2 + description: A Helm chart for Harvester Cloud Provider + keywords: + - infrastructure From 8a747cbf1713e14bfaa1ef2e801f17acbb3a776c Mon Sep 17 00:00:00 2001 From: joshmeranda Date: Thu, 28 Mar 2024 18:11:16 -0400 Subject: [PATCH 7/7] fleet/fleet - fix compatibility issues --- .../fleet/fleet/generated-changes/patch/Chart.yaml.patch | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/fleet/fleet/generated-changes/patch/Chart.yaml.patch b/packages/fleet/fleet/generated-changes/patch/Chart.yaml.patch index adb8214236..a62770ca73 100644 --- a/packages/fleet/fleet/generated-changes/patch/Chart.yaml.patch +++ b/packages/fleet/fleet/generated-changes/patch/Chart.yaml.patch @@ -13,3 +13,11 @@ catalog.cattle.io/release-name: fleet apiVersion: v2 appVersion: 0.9.2 +@@ -14,7 +16,6 @@ + - condition: gitops.enabled + name: gitjob + repository: file://./charts/gitjob +- version: 0.9.4 + description: Fleet Manager - GitOps at Scale + icon: https://charts.rancher.io/assets/logos/fleet.svg + name: fleet