From 517962699e85e6d9cc27a18476ee7a3692042a03 Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Tue, 6 Aug 2024 16:47:42 -0700
Subject: [PATCH 1/4] update azure cloud provider option based on k8s version
 support

---
 .../cru-cloud-provider/component.js           | 53 ++++++++++++++++---
 .../cru-cloud-provider/template.hbs           | 12 ++++-
 translations/en-us.yaml                       |  1 +
 3 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/lib/shared/addon/components/cru-cloud-provider/component.js b/lib/shared/addon/components/cru-cloud-provider/component.js
index 3b7374af72..cecbed30fc 100644
--- a/lib/shared/addon/components/cru-cloud-provider/component.js
+++ b/lib/shared/addon/components/cru-cloud-provider/component.js
@@ -16,6 +16,8 @@ const azureDefaults = C.AZURE_DEFAULTS;
 const GENERIC_PATH  = 'cluster.rancherKubernetesEngineConfig.cloudProvider.cloudConfig';
 const AWS_PATH      = 'cluster.rancherKubernetesEngineConfig.cloudProvider.awsCloudProvider';
 const AZURE_PATH    = 'cluster.rancherKubernetesEngineConfig.cloudProvider.azureCloudProvider';
+const AZURE_IN_TREE_MINIMUM_VERSION = 'v1.27.0';
+const AZURE_IN_TREE_DEPRICATE_VERSION = 'v1.30.0';
 
 export default Component.extend({
   globalStore:                 service(),
@@ -39,6 +41,7 @@ export default Component.extend({
   // track the original configuration to revert the switch to 'external' when the selected provider is not supported
   initialCloudProvider:        null,
   initialConfigAnswers:        null,
+  showChangedToExternal:       false,
 
   configName: alias('cluster.rancherKubernetesEngineConfig.cloudProvider.name'),
 
@@ -60,11 +63,14 @@ export default Component.extend({
 
       this.setCpFields(`azureCloudProvider`, reorderedAnswers);
 
+      const shouldAllowEditingCloudProvider = this.mode === 'edit' && this.isAzureInTreeSupported;
+
       setProperties(this, {
-        selectedCloudProvider: 'azure',
-        configAnswers:         reorderedAnswers,
-        initialCloudProvider:  'azure',
-        initialConfigAnswers:  reorderedAnswers
+        selectedCloudProvider:       'azure',
+        configAnswers:               reorderedAnswers,
+        initialCloudProvider:        'azure',
+        initialConfigAnswers:        reorderedAnswers,
+        unsupportedProviderSelected: shouldAllowEditingCloudProvider
       });
     } else if ( !cloudProviderName ) {
       set(this, 'selectedCloudProvider', 'none');
@@ -84,6 +90,7 @@ export default Component.extend({
 
   modeChanged: observer('selectedCloudProvider', function() {
     let selectedCloudProvider = get(this, 'selectedCloudProvider');
+    const showChangedToExternal = get(this, 'showChangedToExternal');
 
     if ( selectedCloudProvider !== 'none' ) {
       this.constructConfig();
@@ -94,6 +101,11 @@ export default Component.extend({
         delete config.cloudProvider;
       }
     }
+
+    // remove azure warning banner when selection changes
+    if (selectedCloudProvider !== 'external' && showChangedToExternal) {
+      set(this, 'showChangedToExternal', false);
+    }
   }),
 
   harvesterCloudProviderDisabledChange: observer('harvesterCloudProviderDisabled', function() {
@@ -104,13 +116,34 @@ export default Component.extend({
 
   k8sVersionDidChange: observer( 'cluster.rancherKubernetesEngineConfig.kubernetesVersion', function(){
     const kubernetesVersion = get(this, 'cluster.rancherKubernetesEngineConfig.kubernetesVersion')
-    const initialCloudProvider = get(this, 'initialCloudProvider')
+    const initialCloudProvider = get(this, 'initialCloudProvider');
+    const selectedCloudProvider = get(this, 'selectedCloudProvider');
+    const isAzureCurrentlySelected = selectedCloudProvider === 'azure';
+    const isAzureInTreeSupported = get(this, 'isAzureInTreeSupported');
+    const showChangedToExternal = get(this, 'showChangedToExternal');
 
     if (initialCloudProvider === 'amazonec2' && Semver.gte(Semver.coerce(kubernetesVersion), '1.27.0')){
       set(this, 'unsupportedProviderSelected', true);
       set(this, 'selectedCloudProvider', 'external-aws');
       set(this, 'showChangedToAmazonExternal', true);
-      this.constructConfig()
+      this.constructConfig();
+    } else if (initialCloudProvider === 'azure') { // Edit mode for Azure
+      if (!isAzureInTreeSupported && isAzureCurrentlySelected) {
+        set(this, 'unsupportedProviderSelected', true);
+        set(this, 'selectedCloudProvider', 'external');
+        set(this, 'showChangedToExternal', true);
+        this.constructConfig();
+      } else if (showChangedToExternal) {
+        set(this, 'showChangedToExternal', false);
+      }
+    } else if (isAzureCurrentlySelected) { // Create mode for Azure
+      if (!isAzureInTreeSupported){
+        set(this, 'selectedCloudProvider', 'external');
+        set(this, 'showChangedToExternal', true);
+        this.constructConfig()
+      } else if (showChangedToExternal) {
+        set(this, 'showChangedToExternal', false);
+      }
     } else if (get(this, 'unsupportedProviderSelected')){
       setProperties(this, {
         unsupportedProviderSelected: false,
@@ -118,6 +151,8 @@ export default Component.extend({
         selectedCloudProvider:       get(this, 'initialCloudProvider'),
         configAnswers:               get(this, 'initialConfigAnswers')
       })
+    } else if (showChangedToExternal) { // Remove azure warning
+      set(this, 'showChangedToExternal', false);
     }
   }),
 
@@ -193,6 +228,12 @@ export default Component.extend({
     }
   }),
 
+  isAzureInTreeSupported: computed('cluster.rancherKubernetesEngineConfig.kubernetesVersion', function() {
+    const kubernetesVersion = get(this, 'cluster.rancherKubernetesEngineConfig.kubernetesVersion');
+
+    return Semver.satisfies(Semver.coerce(kubernetesVersion), `>=${ AZURE_IN_TREE_MINIMUM_VERSION } <${ AZURE_IN_TREE_DEPRICATE_VERSION }`);
+  }),
+
   mappedConfigAnswers: computed('configAnswers', function() {
     const configAnswers = (get(this, 'configAnswers') || {});
     const out = [];
diff --git a/lib/shared/addon/components/cru-cloud-provider/template.hbs b/lib/shared/addon/components/cru-cloud-provider/template.hbs
index 9893317a58..e5d6fb9661 100644
--- a/lib/shared/addon/components/cru-cloud-provider/template.hbs
+++ b/lib/shared/addon/components/cru-cloud-provider/template.hbs
@@ -39,6 +39,16 @@
     @isCreateClusterOrClusterTemplate={{isCreateClusterOrClusterTemplate}}
     @computedState={{not (eq selectedCloudProvider "none")}}
   >
+    {{#if showChangedToExternal}}
+      <div class="col span-12">
+        <BannerMessage
+          @color="bg-warning mt-0 mb-0"
+          @icon="icon-alert"
+          @message={{t "cloudProvider.azureUnsupported" htmlSafe=true}}
+        />
+      </div>
+    {{/if}}
+  
     {{#input-or-display
        editable=(or (and (eq mode "new") (or (not applyClusterTemplate) (and (eq mode "new") selectedCloudProviderOverrideAvailable))) canEditProvider)
        value=selectedCloudProvider
@@ -89,7 +99,7 @@
                 {{t "cloudProvider.azure"}}
               </label>
             </div>
-          {{else if isCreateClusterOrClusterTemplate}}
+          {{else if (and isCreateClusterOrClusterTemplate isAzureInTreeSupported)}}
             <div class="radio">
               <label>
                 {{radio-button
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index b75cdbdd5c..ad3ef2d55c 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -3161,6 +3161,7 @@ cloudProvider:
     label: External Amazon (Out-Of-Tree) 
     helpText: External Amazon enables use of useInstanceMetadataHostname. When useInstanceMetadataHostname is enabled, RKE will configure node name from ec2 metadata service. Configuring a Cloud Provider in your cluster without configuring the prerequisites will cause your cluster to not provision correctly. Prerequisites needed for supported cloud providers can be found in the documentation.
   azure: Azure (In-Tree)
+  azureUnsupported: 'Azure (In-Tree) is not supported by this version of Kubernetes. The Cloud Provider has been changed to External. Please use the <a href="https://ranchermanager.docs.rancher.com/v2.9/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/azure#cloud-provider-configuration" target="_blank" rel="nofollow noopener noreferrer">Cloud Provider Config</a> to supply an out-of-tree configuration as needed.'
   external:
     label: External (Out-Of-Tree)
     helpText: 'Please edit the YAML to specify the required addon for cloud controller manager.'

From b5c48ef716ce43d2eb12329a93edd204a1d50096 Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Wed, 7 Aug 2024 11:13:49 -0700
Subject: [PATCH 2/4] fix issue when selecting none then azure or custom

---
 lib/shared/addon/components/cru-cloud-provider/component.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/shared/addon/components/cru-cloud-provider/component.js b/lib/shared/addon/components/cru-cloud-provider/component.js
index cecbed30fc..d61b358289 100644
--- a/lib/shared/addon/components/cru-cloud-provider/component.js
+++ b/lib/shared/addon/components/cru-cloud-provider/component.js
@@ -183,6 +183,11 @@ export default Component.extend({
       set(configAnswersOut, answer.key, answer.value);
     });
 
+    // Avoid setting cloud provider specific configs if its path doesn't exist
+    if (!this.pathForSet) {
+      return;
+    }
+
     set(this, pathForSet, configAnswersOut);
   }),
 

From 6b005ce32f73acb1c340a2856acddcfb1b9427cc Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Wed, 7 Aug 2024 16:21:53 -0700
Subject: [PATCH 3/4] fix azure create mode issue

---
 lib/shared/addon/components/cru-cloud-provider/component.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/shared/addon/components/cru-cloud-provider/component.js b/lib/shared/addon/components/cru-cloud-provider/component.js
index d61b358289..129cf6f5ea 100644
--- a/lib/shared/addon/components/cru-cloud-provider/component.js
+++ b/lib/shared/addon/components/cru-cloud-provider/component.js
@@ -183,8 +183,8 @@ export default Component.extend({
       set(configAnswersOut, answer.key, answer.value);
     });
 
-    // Avoid setting cloud provider specific configs if its path doesn't exist
-    if (!this.pathForSet) {
+    // Avoid setting cloud provider-specific configs in edit mode if the path doesn't exist (caused issues with Azure)
+    if (!this.pathForSet && this.mode === 'edit') {
       return;
     }
 

From be18e1caa490a98bf66c4c8a8fb8fc21023c0046 Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Wed, 7 Aug 2024 16:25:22 -0700
Subject: [PATCH 4/4] guard against undefined values when accessing entities in
 azureDescriptions

---
 .../addon/components/cru-cloud-provider/template.hbs      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/shared/addon/components/cru-cloud-provider/template.hbs b/lib/shared/addon/components/cru-cloud-provider/template.hbs
index e5d6fb9661..59546c6063 100644
--- a/lib/shared/addon/components/cru-cloud-provider/template.hbs
+++ b/lib/shared/addon/components/cru-cloud-provider/template.hbs
@@ -258,9 +258,11 @@
             />
           {{/if}}
         </label>
-        <p class="help-block mt-0">
-          {{t (get (get azureDescriptions answer.key) "description") htmlSafe=true}}
-        </p>
+        {{#if (get azureDescriptions answer.key)}}
+          <p class="help-block mt-0">
+            {{t (get (get azureDescriptions answer.key) "description") htmlSafe=true}}
+          </p>
+        {{/if}}
       </div>
       <div class="col span-6">
         <CheckOverrideAllowed