From 5514082210d110f9048dc11ed692dee971ef1c03 Mon Sep 17 00:00:00 2001 From: Harry Qu Date: Mon, 2 Dec 2024 22:11:33 +1100 Subject: [PATCH] update --- internal/services/containers/kubernetes_cluster_resource.go | 3 +++ .../services/containers/kubernetes_cluster_resource_test.go | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/services/containers/kubernetes_cluster_resource.go b/internal/services/containers/kubernetes_cluster_resource.go index 56ad5b2af894..42284c776379 100644 --- a/internal/services/containers/kubernetes_cluster_resource.go +++ b/internal/services/containers/kubernetes_cluster_resource.go @@ -4626,6 +4626,9 @@ func expandKubernetesClusterUpgradeOverrideSetting(input []interface{}) *managed if len(input) == 0 || input[0] == nil { return &managedclusters.ClusterUpgradeSettings{ OverrideSettings: &managedclusters.UpgradeOverrideSettings{ + // The forceUpgrade field controls the overrideUpgradeSetting feature. + // If overrideUpgradeSetting is not specified, set forceUpgrade to false to disable the feature. + // Not passing this field to the API will not disable the feature. ForceUpgrade: pointer.To(false), }, } diff --git a/internal/services/containers/kubernetes_cluster_resource_test.go b/internal/services/containers/kubernetes_cluster_resource_test.go index 99dd71224f35..116e1ba00ea3 100644 --- a/internal/services/containers/kubernetes_cluster_resource_test.go +++ b/internal/services/containers/kubernetes_cluster_resource_test.go @@ -959,8 +959,7 @@ func (KubernetesClusterResource) upgradeOverrideSetting(data acceptance.TestData upgradeOverrideSetting = fmt.Sprintf(` upgrade_override { effective_until = "%s" - }`, time.Now().Add(8*time.Minute).Format(time.RFC3339)) - + }`, time.Now().UTC().Add(8*time.Minute).Format(time.RFC3339)) } return fmt.Sprintf(`