From 9caa24b6d661e2b6b8f1509a63ef99d17c820c7c Mon Sep 17 00:00:00 2001 From: Harish Balakrishnan Date: Tue, 23 Sep 2025 04:13:56 +0000 Subject: [PATCH 1/4] chore: Removing RKE2 and retaining only kThrees from capi providers --- .../custom/capi-providers-config.tpl | 48 ------------------- .../templates/capi-providers-config.yaml | 2 +- 2 files changed, 1 insertion(+), 49 deletions(-) diff --git a/argocd/applications/custom/capi-providers-config.tpl b/argocd/applications/custom/capi-providers-config.tpl index 3539a71ae..3bbee0778 100644 --- a/argocd/applications/custom/capi-providers-config.tpl +++ b/argocd/applications/custom/capi-providers-config.tpl @@ -45,22 +45,6 @@ core: # https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api-operator/operator.cluster.x-k8s.io/BootstrapProvider/v1alpha2@v0.15.1 bootstrap: providers: - - name: rke2 - namespace: capr-system - spec: - version: v0.16.2 - configSecret: - namespace: capi-variables - name: capi-variables - deployment: - containers: - - name: manager - args: - "--insecure-diagnostics": "true" - "--concurrency": "10" - additionalManifests: - name: bootstrap-rke2-additional-manifest - namespace: capr-system - name: k3s namespace: capk-system spec: @@ -76,38 +60,6 @@ bootstrap: # https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api-operator/operator.cluster.x-k8s.io/ControlPlaneProvider/v1alpha2@v0.15.1 controlplane: providers: - - name: rke2 - namespace: capr-system - spec: - version: v0.16.2 - configSecret: - namespace: capi-variables - name: capi-variables - deployment: - containers: - - name: manager - # image from rke2 fork with configurable Cluster Cache concurrency - replace it with official one once it is released - # upstreamed in https://github.com/rancher/cluster-api-provider-rke2/pull/690 - # WARNING: please be aware, that upstreamed version is slightly different from the one used here, - # you will need to add new --clustercache-concurrency flag to the rke2 binary to configure the Cluster Cache concurrency - # (in the v0.16.3-dev-b0f7976 the --concurrency flag was used, but it was seperated into 2 distinct flags) - imageUrl: ghcr.io/jdanieck/cluster-api-provider-rke2/rancher/cluster-api-provider-rke2-controlplane:v0.16.3-dev-b0f7976 - args: - "--insecure-diagnostics": "true" - "--sync-period": "30m" - "--concurrency": "250" - "--clustercachetracker-client-burst": "500" - "--clustercachetracker-client-qps": "250" - resources: - requests: - cpu: "2" - memory: "512Mi" - limits: - cpu: "8" - memory: "2Gi" - additionalManifests: - name: controlplane-rke2-additional-manifest - namespace: capr-system - name: k3s namespace: capk-system spec: diff --git a/argocd/applications/templates/capi-providers-config.yaml b/argocd/applications/templates/capi-providers-config.yaml index 544e7135b..bf639699a 100644 --- a/argocd/applications/templates/capi-providers-config.yaml +++ b/argocd/applications/templates/capi-providers-config.yaml @@ -21,7 +21,7 @@ spec: sources: - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }} chart: common/charts/{{$appName}} - targetRevision: 0.1.1 + targetRevision: 25.2.1 helm: releaseName: {{$appName}} valuesObject: From 89a3ca5fad79fab11d4439d2824fc6494a63f1cf Mon Sep 17 00:00:00 2001 From: Harish Balakrishnan Date: Tue, 23 Sep 2025 06:17:09 +0000 Subject: [PATCH 2/4] fix: Updating repoURL, chart and branch --- argocd/applications/templates/capi-providers-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/argocd/applications/templates/capi-providers-config.yaml b/argocd/applications/templates/capi-providers-config.yaml index bf639699a..6ea6d401a 100644 --- a/argocd/applications/templates/capi-providers-config.yaml +++ b/argocd/applications/templates/capi-providers-config.yaml @@ -19,9 +19,9 @@ metadata: spec: project: {{ required "A valid projectName entry required!" .Values.argo.project }} sources: - - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }} - chart: common/charts/{{$appName}} - targetRevision: 25.2.1 + - repoURL: https://github.com/open-edge-platform/orch-utils + path: charts/{{$appName}} + targetRevision: i-77220 helm: releaseName: {{$appName}} valuesObject: From 0217820469b8a4d0fdfd3db27bc02c55be8415d4 Mon Sep 17 00:00:00 2001 From: Harish Balakrishnan Date: Tue, 23 Sep 2025 09:02:31 +0000 Subject: [PATCH 3/4] fix: Updating repoURL, chart and branch --- argocd/applications/templates/capi-providers-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/argocd/applications/templates/capi-providers-config.yaml b/argocd/applications/templates/capi-providers-config.yaml index 6ea6d401a..7508784f3 100644 --- a/argocd/applications/templates/capi-providers-config.yaml +++ b/argocd/applications/templates/capi-providers-config.yaml @@ -19,9 +19,9 @@ metadata: spec: project: {{ required "A valid projectName entry required!" .Values.argo.project }} sources: - - repoURL: https://github.com/open-edge-platform/orch-utils - path: charts/{{$appName}} - targetRevision: i-77220 + - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }} + chart: common/charts/{{$appName}} + targetRevision: 2.5.1 helm: releaseName: {{$appName}} valuesObject: From c83005a23f938d910abf2933d8f527e8d227403a Mon Sep 17 00:00:00 2001 From: Harish Balakrishnan Date: Tue, 23 Sep 2025 09:03:34 +0000 Subject: [PATCH 4/4] fix: Update chart version --- argocd/applications/templates/capi-providers-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/argocd/applications/templates/capi-providers-config.yaml b/argocd/applications/templates/capi-providers-config.yaml index 7508784f3..bf639699a 100644 --- a/argocd/applications/templates/capi-providers-config.yaml +++ b/argocd/applications/templates/capi-providers-config.yaml @@ -21,7 +21,7 @@ spec: sources: - repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }} chart: common/charts/{{$appName}} - targetRevision: 2.5.1 + targetRevision: 25.2.1 helm: releaseName: {{$appName}} valuesObject: