cleanup and remove unused

Author: QxBytes

.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml

@@ -97,13 +97,13 @@ steps:
     retryCountOnTaskFailure: 3
     name: "CiliumStatus"
     displayName: "Cilium Status"
-
+  # Run LRP test after cns and config with lrp enabled config deployed
   - ${{ if eq( parameters['testLRP'], true) }}:
     - script: |
         set -e
-        kubectl get pods -Aowide
         cd test/integration/lrp/
         go test ./lrp_test.go -v -tags "lrp" -count=1 -run ^TestLRP$
+        kubectl get pods -Aowide
       retryCountOnTaskFailure: 3
       name: "LRPTest"
       displayName: "Run Cilium Local Redirect Policy Test"

test/integration/lrp/lrp_test.go

@@ -45,8 +45,8 @@ var (
 )
 
 // TestLRP tests if the local redirect policy in a cilium cluster is functioning
-// The test assumes the current kubeconfig points to a cluster with cilium and kube-dns already installed
-// and with the lrp feature flag enabled in the cilium config
+// The test assumes the current kubeconfig points to a cluster with cilium (1.16+), cns,
+// and kube-dns already installed. The lrp feature flag should be enabled in the cilium config
 // Resources created are automatically cleaned up
 // From the lrp folder, run: go test ./lrp_test.go -v -tags "lrp" -run ^TestLRP$
 func TestLRP(t *testing.T) {
@@ -70,7 +70,7 @@ func TestLRP(t *testing.T) {
 	// replace pillar dns
 	replaced := strings.ReplaceAll(string(nodeLocalDNSContent), "__PILLAR__DNS__SERVER__", kubeDNS)
 	// Write the updated content back to the file
-	err = os.WriteFile(tempNodeLocalDNSDaemonsetPath, []byte(replaced), 0644)
+	err = os.WriteFile(tempNodeLocalDNSDaemonsetPath, []byte(replaced), 0o644)
 	require.NoError(t, err)
 	defer func() {
 		err := os.Remove(tempNodeLocalDNSDaemonsetPath)
@@ -166,6 +166,7 @@ func TestLRP(t *testing.T) {
 	// count should go up
 	require.Greater(t, afterMetric.GetCounter().GetValue(), beforeMetric.GetCounter().GetValue(), "dns metric count did not increase after nslookup")
 }
+
 func TakeOne[T any](slice []T) T {
 	if len(slice) == 0 {
 		var zero T

test/integration/manifests/cilium/lrp/cilium-config-lrp.yaml

@@ -2,17 +2,16 @@ package kubernetes
 
 import (
 	"context"
-
-	ciliumv2 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2"
-	typedciliumv2 "github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2"
-
 	"log"
 	"os"
 	"path"
 	"path/filepath"
 	"runtime"
 	"strconv"
 
+	ciliumv2 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2"
+	typedciliumv2 "github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2"
+
 	"github.com/pkg/errors"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -83,7 +82,7 @@ func MustCreateDaemonset(ctx context.Context, daemonsets typedappsv1.DaemonSetIn
 	MustDeleteDaemonset(ctx, daemonsets, ds)
 	log.Printf("Creating Daemonset %v", ds.Name)
 	if _, err := daemonsets.Create(ctx, &ds, metav1.CreateOptions{}); err != nil {
-		log.Fatal(errors.Wrap(err, "failed to create daemonset"), ds)
+		log.Fatal(errors.Wrap(err, "failed to create daemonset"))
 	}
 }
 

test/internal/kubernetes/utils_create.go

@@ -63,7 +63,7 @@ func GetDeploymentAvailableReplicas(ctx context.Context, deploymentsClient typed
 }
 
 func GetService(ctx context.Context, clientset *kubernetes.Clientset, namespace, name string) (*corev1.Service, error) {
-	service, err := clientset.CoreV1().Services("kube-system").Get(ctx, "kube-dns", metav1.GetOptions{})
+	service, err := clientset.CoreV1().Services(namespace).Get(ctx, name, metav1.GetOptions{})
 	if err != nil {
 		return service, errors.Wrap(err, "could not get service")
 	}