Deprecating DockerBridgeCidr setting

Setting the DockerBridgeCidr field is no longer supported, see Azure/AKS#3534 Issue: #248
rancher · May 22, 2024 · 5b74afc · 5b74afc
1 parent 6ab210b
commit 5b74afc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/pkg/aks/create_test.go b/pkg/aks/create_test.go
@@ -191,7 +191,6 @@ var _ = Describe("newManagedCluster", func() {
 		clusterSpec.NetworkPlugin = to.Ptr("kubenet")
 		clusterSpec.NetworkPolicy = to.Ptr("calico")
 		clusterSpec.NetworkDNSServiceIP = to.Ptr("")
-		clusterSpec.NetworkDockerBridgeCIDR = to.Ptr("")
 		clusterSpec.NetworkServiceCIDR = to.Ptr("")
 		clusterSpec.NetworkPodCIDR = to.Ptr("")
 
@@ -529,15 +528,14 @@ func newTestClusterSpec() *aksv1.AKSClusterConfigSpec {
 		Tags: map[string]string{
 			"test-tag": "test-value",
 		},
-		NetworkPolicy:           to.Ptr("azure"),
-		NetworkPlugin:           to.Ptr("azure"),
-		NetworkDNSServiceIP:     to.Ptr("test-dns-service-ip"),
-		NetworkDockerBridgeCIDR: to.Ptr("test-docker-bridge-cidr"),
-		NetworkServiceCIDR:      to.Ptr("test-service-cidr"),
-		NetworkPodCIDR:          to.Ptr("test-pod-cidr"),
-		ResourceGroup:           "test-rg",
-		VirtualNetwork:          to.Ptr("test-virtual-network"),
-		Subnet:                  to.Ptr("test-subnet"),
+		NetworkPolicy:       to.Ptr("azure"),
+		NetworkPlugin:       to.Ptr("azure"),
+		NetworkDNSServiceIP: to.Ptr("test-dns-service-ip"),
+		NetworkServiceCIDR:  to.Ptr("test-service-cidr"),
+		NetworkPodCIDR:      to.Ptr("test-pod-cidr"),
+		ResourceGroup:       "test-rg",
+		VirtualNetwork:      to.Ptr("test-virtual-network"),
+		Subnet:              to.Ptr("test-subnet"),
 		NodePools: []aksv1.AKSNodePool{
 			{
 				Name:                to.Ptr("test-node-pool"),

diff --git a/pkg/aks/update_test.go b/pkg/aks/update_test.go
@@ -38,16 +38,15 @@ var _ = Describe("updateCluster", func() {
 					},
 				},
 			},
-			AuthorizedIPRanges:      to.Ptr([]string{"test-ip-range"}),
-			LinuxAdminUsername:      to.Ptr("test-admin-username"),
-			LinuxSSHPublicKey:       to.Ptr("test-ssh-public-key"),
-			NetworkPlugin:           to.Ptr("azure"),
-			NetworkPolicy:           to.Ptr("azure"),
-			NetworkDNSServiceIP:     to.Ptr("test-dns-service-ip"),
-			NetworkDockerBridgeCIDR: to.Ptr("test-docker-bridge-cidr"),
-			NetworkPodCIDR:          to.Ptr("test-pod-cidr"),
-			NetworkServiceCIDR:      to.Ptr("test-service-cidr"),
-			LoadBalancerSKU:         to.Ptr("standard"),
+			AuthorizedIPRanges:  to.Ptr([]string{"test-ip-range"}),
+			LinuxAdminUsername:  to.Ptr("test-admin-username"),
+			LinuxSSHPublicKey:   to.Ptr("test-ssh-public-key"),
+			NetworkPlugin:       to.Ptr("azure"),
+			NetworkPolicy:       to.Ptr("azure"),
+			NetworkDNSServiceIP: to.Ptr("test-dns-service-ip"),
+			NetworkPodCIDR:      to.Ptr("test-pod-cidr"),
+			NetworkServiceCIDR:  to.Ptr("test-service-cidr"),
+			LoadBalancerSKU:     to.Ptr("standard"),
 			Tags: map[string]string{
 				"test-tag": "test-value",
 			},

diff --git a/pkg/apis/aks.cattle.io/v1/types.go b/pkg/apis/aks.cattle.io/v1/types.go
@@ -78,6 +78,8 @@ type AKSClusterConfigSpec struct {
 	// NetworkService CIDR is the network service cidr.
 	NetworkServiceCIDR *string `json:"serviceCidr" norman:"pointer"`
 	// NetworkDockerBridgeCIDR is the network docker bridge cidr.
+	// Setting the dockerBridgeCidr field is no longer supported,
+	// see https://github.com/Azure/AKS/issues/3534
 	NetworkDockerBridgeCIDR *string `json:"dockerBridgeCidr" norman:"pointer"`
 	// NetworkPodCIDR is the network pod cidr.
 	NetworkPodCIDR *string `json:"podCidr" norman:"pointer"`