add calico-apiserver and tigera-operator to pod check

src/k8s/pkg/k8sd/features/calico/status.go

@@ -1,5 +1,3 @@
-//go:build moonray
-
 package calico
 
 import (
@@ -20,12 +18,24 @@ func CheckNetwork(ctx context.Context, snap snap.Snap) (bool, error) {
 		return false, fmt.Errorf("failed to create kubernetes client: %w", err)
 	}
 
+	operatorReady, err := client.IsPodReady(ctx, "kube-system", "tigera-operator", metav1.ListOptions{})
+	if err != nil {
+		return false, fmt.Errorf("failed to get calico pods: %w", err)
+	}
+	if !operatorReady {
+		return false, nil
+	}
+
 	calicoPods, err := client.ListPods(ctx, "calico-system", metav1.ListOptions{})
 	if err != nil {
 		return false, fmt.Errorf("failed to get calico pods: %w", err)
 	}
+	calicoApiserverPods, err := client.ListPods(ctx, "calico-apiserver", metav1.ListOptions{})
+	if err != nil {
+		return false, fmt.Errorf("failed to get calico-apiserver pods: %w", err)
+	}
 
-	for _, pod := range calicoPods {
+	for _, pod := range append(calicoPods, calicoApiserverPods...) {
 		isReady, err := client.IsPodReady(ctx, pod.Name, "calico-system", metav1.ListOptions{})
 		if err != nil {
 			return false, fmt.Errorf("failed to check if pod %q is ready: %w", pod.Name, err)