test: ginkgo: drop AKS support

We're only running on kind nowadays, and this code hasn't seen any use in
ages. Remove it.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>

Author: julianwiedmann

test/helpers/kubectl.go

@@ -53,9 +53,6 @@ const (
 	// https://github.com/kubernetes/dns/blob/80fdd88276adba36a87c4f424b66fdf37cd7c9a8/pkg/dns/dns.go#L53
 	DNSHelperTimeout = 7 * time.Minute
 
-	// CIIntegrationAKS contains the constants to be used when running tests on AKS.
-	CIIntegrationAKS = "aks"
-
 	// CIIntegrationKind contains the constant to be used when running tests on kind.
 	CIIntegrationKind = "kind"
 
@@ -140,25 +137,6 @@ var (
 		"connectivityProbeFrequencyRatio": "0",
 	}
 
-	aksHelmOverrides = map[string]string{
-		"ipam.mode":                           "delegated-plugin",
-		"routingMode":                         "native",
-		"endpointRoutes.enabled":              "true",
-		"extraArgs":                           "{--local-router-ipv4=169.254.23.0}",
-		"k8s.requireIPv4PodCIDR":              "false",
-		"ipv6.enabled":                        "false",
-		"ipv4NativeRoutingCIDR":               NativeRoutingCIDR(),
-		"enableIPv4Masquerade":                "false",
-		"install-no-conntrack-iptables-rules": "false",
-		"l7Proxy":                             "false",
-		"hubble.enabled":                      "false",
-		"kubeProxyReplacement":                "true",
-		"endpointHealthChecking.enabled":      "false",
-		"cni.install":                         "true",
-		"cni.customConf":                      "true",
-		"cni.configMap":                       "cni-configuration",
-	}
-
 	microk8sHelmOverrides = map[string]string{
 		"cni.confPath":      "/var/snap/microk8s/current/args/cni-network",
 		"cni.binPath":       "/var/snap/microk8s/current/opt/cni/bin",
@@ -183,7 +161,6 @@ var (
 	// specific CI environment integrations.
 	// The key must be a string consisting of lower case characters.
 	helmOverrides = map[string]map[string]string{
-		CIIntegrationAKS:      aksHelmOverrides,
 		CIIntegrationKind:     kindHelmOverrides,
 		CIIntegrationMicrok8s: microk8sHelmOverrides,
 		CIIntegrationMinikube: minikubeHelmOverrides,

test/helpers/utils.go

@@ -406,10 +406,6 @@ func DoesNotRunOn54Kernel() bool {
 	return !RunsOn54Kernel()
 }
 
-func NativeRoutingCIDR() string {
-	return os.Getenv("NATIVE_CIDR")
-}
-
 // RunsOn54OrLaterKernel checks whether a test case is running on 5.4 or later kernel
 func RunsOn54OrLaterKernel() bool {
 	return RunsOnNetNextKernel() || RunsOn54Kernel()
@@ -420,16 +416,6 @@ func DoesNotRunOn54OrLaterKernel() bool {
 	return !RunsOn54OrLaterKernel()
 }
 
-// RunsOnAKS returns true if the tests are running on AKS.
-func RunsOnAKS() bool {
-	return GetCurrentIntegration() == CIIntegrationAKS
-}
-
-// DoesNotRunOnAKS is the complement function of DoesNotRunOnAKS.
-func DoesNotRunOnAKS() bool {
-	return !RunsOnAKS()
-}
-
 // RunsWithKubeProxyReplacement returns true if the kernel supports our
 // kube-proxy replacement. Note that kube-proxy may still be running
 // alongside Cilium.
@@ -539,23 +525,13 @@ func SkipRaceDetectorEnabled() bool {
 // DualStackSupported returns whether the current environment has DualStack IPv6
 // enabled or not for the cluster.
 func DualStackSupported() bool {
-	// AKS does not support dual stack yet
-	if IsIntegration(CIIntegrationAKS) {
-		return false
-	}
-
 	// We only have DualStack enabled in KIND.
 	return GetCurrentIntegration() == "" || IsIntegration(CIIntegrationKind)
 }
 
 // DualStackSupportBeta returns true if the environment has a Kubernetes version that
 // has support for k8s DualStack beta API types.
 func DualStackSupportBeta() bool {
-	// AKS does not support dual stack yet
-	if IsIntegration(CIIntegrationAKS) {
-		return false
-	}
-
 	return GetCurrentIntegration() == "" || IsIntegration(CIIntegrationKind)
 }
 

test/k8s/datapath_configuration.go

@@ -315,17 +315,15 @@ var _ = Describe("K8sDatapathConfig", func() {
 			kubectl.Exec("kubectl label nodes --all status-")
 		})
 
-		SkipItIf(helpers.RunsOnAKS, "With VXLAN", func() {
+		It("With VXLAN", func() {
 			options := map[string]string{
 				"hostFirewall.enabled": "true",
 			}
 			deploymentManager.DeployCilium(options, DeployCiliumOptionsAndDNS)
 			testHostFirewall(kubectl)
 		})
 
-		SkipItIf(func() bool {
-			return helpers.RunsOnAKS()
-		}, "With VXLAN and endpoint routes", func() {
+		It("With VXLAN and endpoint routes", func() {
 			options := map[string]string{
 				"hostFirewall.enabled":   "true",
 				"endpointRoutes.enabled": "true",

test/k8s/fqdn.go

@@ -293,7 +293,7 @@ var _ = SkipDescribeIf(helpers.RunsOn54Kernel, "K8sAgentFQDNTest", func() {
 		connectivityTest()
 	})
 
-	SkipItIf(helpers.RunsOnAKS, "Validate that multiple specs are working correctly", func() {
+	It("Validate that multiple specs are working correctly", func() {
 		// To make sure that UUID in multiple specs are plumbed correctly to
 		// Cilium Policy
 		fqdnPolicy := helpers.ManifestGet(kubectl.BasePath(), "fqdn-proxy-multiple-specs.yaml")
@@ -329,7 +329,7 @@ var _ = SkipDescribeIf(helpers.RunsOn54Kernel, "K8sAgentFQDNTest", func() {
 		res.ExpectFail("Can connect to a valid target when it should NOT work")
 	})
 
-	SkipItIf(helpers.RunsOnAKS, "Validate that FQDN policy continues to work after being updated", func() {
+	It("Validate that FQDN policy continues to work after being updated", func() {
 		// To make sure that UUID in multiple specs are plumbed correctly to
 		// Cilium Policy
 		fqdnPolicy := helpers.ManifestGet(kubectl.BasePath(), "fqdn-proxy-multiple-specs.yaml")

test/k8s/hubble.go

@@ -24,7 +24,7 @@ var _ = Describe("K8sAgentHubbleTest", func() {
 	// replacement, as the trace events depend on it. We thus run the tests
 	// on GKE and our 4.19 pipeline.
 	SkipContextIf(func() bool {
-		return helpers.RunsOnNetNextKernel() || helpers.RunsOnAKS()
+		return helpers.RunsOnNetNextKernel()
 	}, "Hubble Observe", func() {
 		var (
 			kubectl        *helpers.Kubectl

test/k8s/kafka_policies.go

@@ -53,7 +53,7 @@ var _ = SkipDescribeIf(helpers.RunsOn54Kernel, "K8sKafkaPolicyTest", func() {
 	})
 
 	// Tests involving the L7 proxy do not work when built with -race, see issue #13757.
-	SkipContextIf(func() bool { return helpers.SkipRaceDetectorEnabled() || helpers.RunsOnAKS() }, "Kafka Policy Tests", func() {
+	SkipContextIf(func() bool { return helpers.SkipRaceDetectorEnabled() }, "Kafka Policy Tests", func() {
 		createTopicCmd := func(topic string) string {
 			return fmt.Sprintf("/opt/kafka_2.11-0.10.1.0/bin/kafka-topics.sh --create "+
 				"--zookeeper localhost:2181 --replication-factor 1 "+

test/k8s/lrp.go

@@ -18,7 +18,7 @@ import (
 
 // The 5.4 CI job is intended to catch BPF complexity regressions and as such
 // doesn't need to execute this test suite.
-var _ = SkipDescribeIf(func() bool { return helpers.RunsOn54Kernel() && helpers.DoesNotRunOnAKS() }, "K8sDatapathLRPTests", func() {
+var _ = SkipDescribeIf(func() bool { return helpers.RunsOn54Kernel() }, "K8sDatapathLRPTests", func() {
 	var (
 		kubectl        *helpers.Kubectl
 		ciliumFilename string
@@ -43,7 +43,7 @@ var _ = SkipDescribeIf(func() bool { return helpers.RunsOn54Kernel() && helpers.
 		kubectl.CiliumReport("cilium-dbg lrp list", "cilium-dbg service list")
 	})
 
-	SkipContextIf(func() bool { return helpers.RunsOnAKS() }, "Checks local redirect policy", func() {
+	Context("Checks local redirect policy", func() {
 		const (
 			lrpServiceName = "lrp-demo-service"
 			be1Name        = "k8s1-backend"

test/k8s/net_policies.go

@@ -27,7 +27,7 @@ var _ = SkipDescribeIf(func() bool {
 	// and the third node. Other CI jobs are not expected to increase
 	// code coverage.
 	//
-	return helpers.RunsOn54Kernel() || helpers.RunsOnAKS()
+	return helpers.RunsOn54Kernel()
 }, "K8sAgentPolicyTest", func() {
 
 	var (

test/k8s/pod_mac_address.go

@@ -16,7 +16,7 @@ import (
 
 // The 5.4 CI job is intended to catch BPF complexity regressions and as such
 // doesn't need to execute this test suite.
-var _ = SkipDescribeIf(func() bool { return helpers.RunsOn54Kernel() && helpers.DoesNotRunOnAKS() }, "K8sSpecificMACAddressTests", func() {
+var _ = SkipDescribeIf(func() bool { return helpers.RunsOn54Kernel() }, "K8sSpecificMACAddressTests", func() {
 	var (
 		kubectl        *helpers.Kubectl
 		ciliumFilename string
@@ -41,7 +41,7 @@ var _ = SkipDescribeIf(func() bool { return helpers.RunsOn54Kernel() && helpers.
 		kubectl.CiliumReport("cilium-dbg endpoint list -o jsonpath='{range [*]}{@.id}{\"=\"}{@.status.networking.mac}{\"\\n\"}{end}'")
 	})
 
-	SkipContextIf(func() bool { return helpers.RunsOnAKS() }, "Check whether the pod is created", func() {
+	Context("Check whether the pod is created", func() {
 		const specificMACAddress = "specific-mac-address=specific-mac-address"
 		var podYAML string
 

test/k8s/services.go

@@ -117,7 +117,7 @@ var _ = SkipDescribeIf(helpers.RunsOn54Kernel, "K8sDatapathServicesTest", func()
 				testFailBind(kubectl, ni)
 			})
 
-			SkipContextIf(helpers.RunsOnAKS, "with L7 policy", func() {
+			Context("with L7 policy", func() {
 				AfterAll(func() {
 					kubectl.Delete(demoPolicyL7)
 					// Remove CT entries to avoid packet drops which could happen
@@ -187,7 +187,7 @@ var _ = SkipDescribeIf(helpers.RunsOn54Kernel, "K8sDatapathServicesTest", func()
 			})
 		})
 
-		SkipContextIf(func() bool { return helpers.RunsWithKubeProxyReplacement() || helpers.RunsOnAKS() }, "TFTP with DNS Proxy port collision", func() {
+		SkipContextIf(func() bool { return helpers.RunsWithKubeProxyReplacement() }, "TFTP with DNS Proxy port collision", func() {
 			var (
 				demoPolicy    string
 				ciliumPodK8s1 string
@@ -281,7 +281,7 @@ var _ = SkipDescribeIf(helpers.RunsOn54Kernel, "K8sDatapathServicesTest", func()
 		})
 
 		SkipContextIf(func() bool {
-			return helpers.RunsWithKubeProxyReplacement() || helpers.RunsOnAKS()
+			return helpers.RunsWithKubeProxyReplacement()
 		}, "with L7 policy", func() {
 			var demoPolicyL7 string