Add GitHub Actions workflow job for retina-shell-win-images and run formatter

Co-authored-by: nddq <[email protected]>

Author: Copilot

.github/workflows/images.yaml

@@ -213,6 +213,58 @@ jobs:
           fi
         env:
           IS_MERGE_GROUP: ${{ github.event_name == 'merge_group' }}
+          
+  retina-shell-win-images:
+    name: Build Retina Shell Windows Images
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        platform: ["windows"]
+        arch: ["amd64"]
+        year: ["2019", "2022"]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        with:
+          go-version-file: go.mod
+      - run: go version
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Az CLI login
+        uses: azure/login@v2
+        if: ${{ github.event_name == 'merge_group' }}
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION }}
+
+      - name: Build Images
+        shell: bash
+        run: |
+          set -euo pipefail
+          echo "TAG=$(make version)" >> $GITHUB_ENV
+          if [ "$IS_MERGE_GROUP" == "true" ]; then
+            az acr login -n ${{ vars.ACR_NAME }}
+            make retina-shell-image-win \
+              IMAGE_NAMESPACE=${{ github.repository }} \
+              PLATFORM=${{ matrix.platform }}/${{ matrix.arch }} \
+              IMAGE_REGISTRY=${{ vars.ACR_NAME }}  \
+              WINDOWS_YEARS=${{ matrix.year }} \
+              BUILDX_ACTION=--push
+          else
+            make retina-shell-image-win \
+              IMAGE_NAMESPACE=${{ github.repository }} \
+              PLATFORM=${{ matrix.platform }}/${{ matrix.arch }} \
+              WINDOWS_YEARS=${{ matrix.year }}
+          fi
+        env:
+          IS_MERGE_GROUP: ${{ github.event_name == 'merge_group' }}
 
   kubectl-retina-images:
     name: Build Kubectl Retina Images
@@ -273,6 +325,7 @@ jobs:
         retina-win-images,
         operator-images,
         retina-shell-images,
+        retina-shell-win-images,
         kubectl-retina-images,
       ]
 

cli/cmd/root.go

@@ -24,9 +24,9 @@ type Config struct {
 }
 
 var Retina = &cobra.Command{
-	Use: "kubectl-retina",
+	Use:   "kubectl-retina",
 	Short: "A kubectl plugin for Retina",
-	Long: "A kubectl plugin for Retina\nRetina is an eBPF distributed networking observability tool for Kubernetes.",
+	Long:  "A kubectl plugin for Retina\nRetina is an eBPF distributed networking observability tool for Kubernetes.",
 	PersistentPreRun: func(*cobra.Command, []string) {
 		var config Config
 		file, _ := os.ReadFile(ClientConfigPath)

deploy/testutils/grafana/dashboards/simplify-grafana-overwrite_test.go

@@ -11,7 +11,6 @@ import (
 func TestOverwriteDashboards(t *testing.T) {
 	// get all json's in various generation deploly folders
 	files, err := filepath.Glob("../../../grafana-dashboards/*.json")
-
 	if err != nil {
 		t.Fatal(err)
 	}

deploy/testutils/grafana/dashboards/simplify-grafana_test.go

@@ -12,7 +12,6 @@ import (
 func TestDashboardsAreSimplified(t *testing.T) {
 	// get all json's in this folder
 	files, err := filepath.Glob("../../../grafana-dashboards/*.json")
-
 	if err != nil {
 		t.Fatal(err)
 	}

operator/cilium-crds/k8s/fakeresource.go

@@ -8,8 +8,7 @@ import (
 	"github.com/cilium/cilium/pkg/k8s/resource"
 )
 
-type fakeresource[T k8sRuntime.Object] struct {
-}
+type fakeresource[T k8sRuntime.Object] struct{}
 
 func (f *fakeresource[T]) Events(ctx context.Context, opts ...resource.EventsOpt) <-chan resource.Event[T] {
 	return make(<-chan resource.Event[T])

pkg/k8s/watcher_linux.go

@@ -23,9 +23,7 @@ func init() {
 	}
 }
 
-var (
-	logger = logging.DefaultLogger.WithField(logfields.LogSubsys, "k8s-watcher")
-)
+var logger = logging.DefaultLogger.WithField(logfields.LogSubsys, "k8s-watcher")
 
 func Start(ctx context.Context, k *watchers.K8sWatcher) {
 	logger.Info("Starting Kubernetes watcher")

pkg/plugin/hnsstats/vfp_counters_windows.go

@@ -152,7 +152,6 @@ func getVfpPortCountersRaw(portGUID string) (string, error) {
 
 	cmd := exec.Command("cmd", "/c", vfpCmd)
 	out, err := cmd.Output()
-
 	if err != nil {
 		return "", errors.Wrap(err, "errored while running vfpctrl /get-port-counter")
 	}

pkg/plugin/linuxutil/types_linux.go

@@ -8,8 +8,10 @@ import (
 	"github.com/microsoft/retina/pkg/log"
 )
 
-const name = "linuxutil"
-const defaultLimit = 2000
+const (
+	name         = "linuxutil"
+	defaultLimit = 2000
+)
 
 //go:generate go run go.uber.org/mock/[email protected] -source=types_linux.go -destination=linuxutil_mock_generated_linux.go -package=linuxutil
 type linuxUtil struct {

pkg/telemetry/telemetry.go

@@ -193,6 +193,7 @@ func (t *TelemetryClient) heartbeat(ctx context.Context) {
 	maps.Copy(props, t.profile.GetMemoryUsage())
 	t.TrackEvent("heartbeat", props)
 }
+
 func metricsCardinality(gatherer prometheus.Gatherer) (int, error) {
 	if gatherer == nil {
 		return 0, fmt.Errorf("failed to get metrics Gatherer: %w", ErrorNilCombinedGatherer)

shell/manifests.go

@@ -72,12 +72,12 @@ func hostNetworkPodForNodeDebug(config Config, debugPodNamespace, nodeName strin
 	if config.MountHostFilesystem || config.AllowHostFilesystemWrite {
 		hostPath := "/"
 		mountPath := "/host"
-		
+
 		if config.NodeOS == "windows" {
 			hostPath = "C:\\"
 			mountPath = "C:\\host"
 		}
-		
+
 		pod.Spec.Volumes = append(pod.Spec.Volumes, v1.Volume{
 			Name: "host-filesystem",
 			VolumeSource: v1.VolumeSource{

shell/manifests_test.go

@@ -8,8 +8,10 @@ import (
 	v1 "k8s.io/api/core/v1"
 )
 
-const testRetinaImage = "retina-shell:v0.0.1"
-const testRetinaWindowsImage = "retina-shell:v0.0.1-windows-ltsc2022-amd64"
+const (
+	testRetinaImage        = "retina-shell:v0.0.1"
+	testRetinaWindowsImage = "retina-shell:v0.0.1-windows-ltsc2022-amd64"
+)
 
 func TestEphemeralContainerForPodDebug(t *testing.T) {
 	ec := ephemeralContainerForPodDebug(Config{RetinaShellImage: testRetinaImage})
@@ -98,14 +100,14 @@ func TestHostNetworkPodForWindowsNodeDebug(t *testing.T) {
 		NodeOS:           "windows",
 	}
 	pod := hostNetworkPodForNodeDebug(config, "kube-system", "win-node0001")
-	
+
 	// Verify Windows specific configurations
 	assert.NotNil(t, pod.Spec.SecurityContext)
 	assert.NotNil(t, pod.Spec.SecurityContext.WindowsOptions)
 	assert.NotNil(t, pod.Spec.SecurityContext.WindowsOptions.HostProcess)
 	assert.True(t, *pod.Spec.SecurityContext.WindowsOptions.HostProcess)
 	assert.Equal(t, "NT AUTHORITY\\SYSTEM", *pod.Spec.SecurityContext.WindowsOptions.RunAsUserName)
-	
+
 	// HostPID should be false for Windows regardless of setting
 	assert.False(t, pod.Spec.HostPID)
 }
@@ -117,11 +119,11 @@ func TestHostNetworkPodForWindowsNodeDebugWithMountHostFilesystem(t *testing.T)
 		MountHostFilesystem: true,
 	}
 	pod := hostNetworkPodForNodeDebug(config, "kube-system", "win-node0001")
-	
+
 	assert.Len(t, pod.Spec.Volumes, 1)
 	assert.Equal(t, "host-filesystem", pod.Spec.Volumes[0].Name)
 	assert.Equal(t, "C:\\", pod.Spec.Volumes[0].VolumeSource.HostPath.Path)
-	
+
 	assert.Len(t, pod.Spec.Containers[0].VolumeMounts, 1)
 	assert.Equal(t, "host-filesystem", pod.Spec.Containers[0].VolumeMounts[0].Name)
 	assert.Equal(t, "C:\\host", pod.Spec.Containers[0].VolumeMounts[0].MountPath)
@@ -134,7 +136,7 @@ func TestHostNetworkPodForWindowsNodeWithHostPID(t *testing.T) {
 		HostPID:          true, // Should be ignored for Windows
 	}
 	pod := hostNetworkPodForNodeDebug(config, "kube-system", "win-node0001")
-	
+
 	// HostPID should be false for Windows regardless of the setting
 	assert.False(t, pod.Spec.HostPID)
 }

shell/validation_test.go

@@ -103,4 +103,4 @@ func TestGetNodeOS(t *testing.T) {
 			assert.Equal(t, tt.wantOS, os)
 		})
 	}
-}
+}

test/e2e/framework/kubernetes/check-pod-status.go

@@ -37,7 +37,6 @@ func (w *WaitPodsReady) Prevalidate() error {
 // Primary step where test logic is executed
 // Returning an error will cause the test to fail
 func (w *WaitPodsReady) Run() error {
-
 	config, err := clientcmd.BuildConfigFromFlags("", w.KubeConfigFilePath)
 	if err != nil {
 		return fmt.Errorf("error building kubeconfig: %w", err)
@@ -59,7 +58,6 @@ func (w *WaitPodsReady) Stop() error {
 }
 
 func WaitForPodReady(ctx context.Context, clientset *kubernetes.Clientset, namespace, labelSelector string) error {
-
 	printIterator := 0
 	conditionFunc := wait.ConditionWithContextFunc(func(context.Context) (bool, error) {
 		defer func() {

test/e2e/framework/kubernetes/get-external-crd.go

@@ -55,7 +55,7 @@ func extractFileName(rawURL string) (string, error) {
 }
 
 func saveToFile(filename string, data []byte) error {
-	err := os.WriteFile(filename, data, 0644)
+	err := os.WriteFile(filename, data, 0o644)
 	if err != nil {
 		return fmt.Errorf("failed to write crd.yaml to /crds dir : %w", err)
 	}

test/e2e/framework/kubernetes/install-retina-helm.go

@@ -68,7 +68,7 @@ func (i *InstallHelmChart) Run() error {
 		return fmt.Errorf("image namespace is not set: %w", errEmpty)
 	}
 
-	//Download necessary CRD's
+	// Download necessary CRD's
 	err = downloadExternalCRDs(i.ChartPath)
 	if err != nil {
 		return fmt.Errorf("failed to load external crd's: %w", err)

test/e2e/framework/scaletest/add-shared-labels.go

@@ -35,7 +35,6 @@ func (a *AddSharedLabelsToAllPods) Prevalidate() error {
 // Primary step where test logic is executed
 // Returning an error will cause the test to fail
 func (a *AddSharedLabelsToAllPods) Run() error {
-
 	if a.NumSharedLabelsPerPod < 1 {
 		return nil
 	}

test/e2e/framework/scaletest/add-unique-labels.go

@@ -27,7 +27,6 @@ func (a *AddUniqueLabelsToAllPods) Prevalidate() error {
 // Primary step where test logic is executed
 // Returning an error will cause the test to fail
 func (a *AddUniqueLabelsToAllPods) Run() error {
-
 	if a.NumUniqueLabelsPerPod < 1 {
 		return nil
 	}

test/e2e/framework/scaletest/create-network-policies.go

@@ -33,7 +33,6 @@ func (c *CreateNetworkPolicies) Prevalidate() error {
 // Primary step where test logic is executed
 // Returning an error will cause the test to fail
 func (c *CreateNetworkPolicies) Run() error {
-
 	config, err := clientcmd.BuildConfigFromFlags("", c.KubeConfigFilePath)
 	if err != nil {
 		return fmt.Errorf("error building kubeconfig: %w", err)

test/e2e/framework/scaletest/delete-and-re-add-labels.go

@@ -118,7 +118,6 @@ func (d *DeleteAndReAddLabels) addLabels(ctx context.Context, clientset *kuberne
 }
 
 func (d *DeleteAndReAddLabels) deleteLabels(ctx context.Context, clientset *kubernetes.Clientset, pods *corev1.PodList, patch string) error {
-
 	for _, pod := range pods.Items {
 		log.Println("Deleting label from Pod", pod.Name)
 

test/e2e/framework/scaletest/get-publish-metrics.go

@@ -76,7 +76,6 @@ func (g *GetAndPublishMetrics) Run() error {
 	g.errs = new(errgroup.Group)
 
 	g.errs.Go(func() error {
-
 		t := time.NewTicker(defaultInterval)
 		defer t.Stop()
 
@@ -100,7 +99,6 @@ func (g *GetAndPublishMetrics) Run() error {
 
 			}
 		}
-
 	})
 
 	return nil
@@ -135,7 +133,6 @@ func (g *GetAndPublishMetrics) Prevalidate() error {
 }
 
 func (g *GetAndPublishMetrics) getAndPublishMetrics() error {
-
 	ctx := context.TODO()
 
 	labelSelector := labels.Set(g.Labels).String()
@@ -161,7 +158,6 @@ func (g *GetAndPublishMetrics) getAndPublishMetrics() error {
 		log.Println("Publishing metrics to AppInsights")
 		for _, metric := range allMetrics {
 			g.telemetryClient.TrackEvent("scale-test", metric)
-
 		}
 	}
 
@@ -192,7 +188,6 @@ func (g *GetAndPublishMetrics) getAndPublishMetrics() error {
 type metric map[string]string
 
 func (g *GetAndPublishMetrics) getPodsMetrics(ctx context.Context, labelSelector string) ([]metric, error) {
-
 	var pods *v1.PodList
 
 	retrier := retry.Retrier{Attempts: defaultRetryAttempts, Delay: defaultRetryDelay}

test/e2e/framework/scaletest/templates/networkpolicy.go

@@ -5,23 +5,21 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-var (
-	NetworkPolicy = netv1.NetworkPolicy{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "NetworkPolicy",
-			APIVersion: "networking.k8s.io/v1",
+var NetworkPolicy = netv1.NetworkPolicy{
+	TypeMeta: metav1.TypeMeta{
+		Kind:       "NetworkPolicy",
+		APIVersion: "networking.k8s.io/v1",
+	},
+	ObjectMeta: metav1.ObjectMeta{
+		Name: "template-network-policy",
+	},
+	Spec: netv1.NetworkPolicySpec{
+		PolicyTypes: []netv1.PolicyType{
+			"Ingress",
+			"Egress",
 		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name: "template-network-policy",
+		PodSelector: metav1.LabelSelector{
+			MatchLabels: map[string]string{},
 		},
-		Spec: netv1.NetworkPolicySpec{
-			PolicyTypes: []netv1.PolicyType{
-				"Ingress",
-				"Egress",
-			},
-			PodSelector: metav1.LabelSelector{
-				MatchLabels: map[string]string{},
-			},
-		},
-	}
-)
+	},
+}

test/e2e/framework/scaletest/validate-options.go

@@ -37,7 +37,6 @@ func (po *ValidateAndPrintOptions) Prevalidate() error {
 
 // Returning an error will cause the test to fail
 func (po *ValidateAndPrintOptions) Run() error {
-
 	log.Printf("Starting to scale with folowing options: %+v", po.Options)
 
 	return nil

test/e2e/retina_perf_test.go

@@ -17,11 +17,9 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var (
-	// Add flags for the test
-	// retina-mode: basic, advanced, hubble
-	retinaMode = flag.String("retina-mode", "basic", "One of basic or advanced")
-)
+// Add flags for the test
+// retina-mode: basic, advanced, hubble
+var retinaMode = flag.String("retina-mode", "basic", "One of basic or advanced")
 
 func validateRetinaMode(t *testing.T) {
 	switch *retinaMode {

test/e2e/scenarios/perf/publish-perf-results.go

@@ -29,7 +29,7 @@ func (v *PublishPerfResults) Run() error {
 		return nil
 	}
 
-	resultsFile, err := os.OpenFile(v.ResultsFile, os.O_RDONLY, 0644)
+	resultsFile, err := os.OpenFile(v.ResultsFile, os.O_RDONLY, 0o644)
 	if err != nil {
 		return errors.Wrap(err, "failed to open results file")
 	}