From 9f3924fe65020353bb29cbbe0fa3a4c4ac4119fa Mon Sep 17 00:00:00 2001
From: stg <65890694+stg-0@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:51:26 +0100
Subject: [PATCH] Rollback PR359 and PR419 (#436)

---
 CHANGELOG.md                                                | 5 +----
 pkg/cluster/internal/create/actions/createworker/azure.go   | 1 -
 .../internal/create/actions/createworker/provider.go        | 6 ------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cf70de938..2ca16084a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,16 +2,13 @@
 
 ## 0.17.0-0.3.7 (2024-01-23)
 
-* [Core] HotFix: Disable Azure cloud routes and fix Azure csi drivers in upgrade script
-* [Core] HotFix: Remove Azure cloud route table maintenance
 * [Docs] Fix: EFS permissions
 * [Docs] Add AWS details
+* [Core] Fix: check if coredns pdb already exists before deploying
 
 ## 0.17.0-0.3.6 (2023-12-21)
 
 * [Core] HotFix: storageclass.parameters.label validation
-* [Core] Fix: check if coredns pdb already exists before deploying
-* [Core] Restrict the maximum number of unhealthy CP nodes in MachineHealthCheck
 
 ## 0.17.0-0.3.5 (2023-12-19)
 
diff --git a/pkg/cluster/internal/create/actions/createworker/azure.go b/pkg/cluster/internal/create/actions/createworker/azure.go
index 85c5a6b375..68eb50c729 100644
--- a/pkg/cluster/internal/create/actions/createworker/azure.go
+++ b/pkg/cluster/internal/create/actions/createworker/azure.go
@@ -139,7 +139,6 @@ func (b *AzureBuilder) installCloudProvider(n nodes.Node, k string, keosCluster
 		" --kubeconfig " + k +
 		" --namespace kube-system" +
 		" --set infra.clusterName=" + keosCluster.Metadata.Name +
-		" --set cloudControllerManager.configureCloudRoutes=false" +
 		" --set 'cloudControllerManager.clusterCIDR=" + podsCidrBlock + "'"
 	_, err := commons.ExecuteCommand(n, c, 5)
 	if err != nil {
diff --git a/pkg/cluster/internal/create/actions/createworker/provider.go b/pkg/cluster/internal/create/actions/createworker/provider.go
index ec1e35edb9..11c3c0ff5f 100644
--- a/pkg/cluster/internal/create/actions/createworker/provider.go
+++ b/pkg/cluster/internal/create/actions/createworker/provider.go
@@ -800,11 +800,6 @@ func enableSelfHealing(n nodes.Node, keosCluster commons.KeosCluster, namespace
 func generateMHCManifest(n nodes.Node, clusterID string, namespace string, manifestPath string, machineRole string) error {
 	var c string
 	var err error
-	var maxUnhealthy = "100%"
-
-	if strings.Contains(machineRole, "control-plane-node") {
-		maxUnhealthy = "34%"
-	}
 	var machineHealthCheck = `
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineHealthCheck
@@ -813,7 +808,6 @@ metadata:
   namespace: cluster-` + clusterID + `
 spec:
   clusterName: ` + clusterID + `
-  maxUnhealthy: ` + maxUnhealthy + `
   nodeStartupTimeout: 300s
   selector:
     matchLabels: