klog and delete in dry run

Change-Id: I270b55d968ab57b56340c634d6423e4b1b6721dd

Author: aojea

cmd/dranetctl/app.go

@@ -18,13 +18,16 @@ package main
 
 import (
 	"context"
-	"log"
+	"flag"
+
 	"os"
 	"os/signal"
 	"syscall"
 
 	"github.com/google/dranet/pkg/dranetctl/gke"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+	"k8s.io/klog/v2"
 )
 
 var rootCmd = &cobra.Command{
@@ -35,23 +38,29 @@ var rootCmd = &cobra.Command{
 
 func main() {
 	ctx, cancel := context.WithCancel(context.Background())
-
 	sigChan := make(chan os.Signal, 1)
 	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
 
 	go func() {
 		sig := <-sigChan
-		log.Printf("\nReceived signal: %v. Shutting down...\n", sig)
+		klog.Infof("\nReceived signal: %v. Shutting down...\n", sig)
 		cancel()
 	}()
 
+	// enable klog flags
+	klog.InitFlags(nil)
+	pflag.CommandLine.AddGoFlag(flag.CommandLine.Lookup("v"))
+	pflag.CommandLine.AddGoFlag(flag.CommandLine.Lookup("logtostderr"))
+	pflag.CommandLine.Set("logtostderr", "true")
+
 	if err := rootCmd.ExecuteContext(ctx); err != nil {
-		log.Println(err)
+		klog.Info(err)
 		os.Exit(1)
 	}
 }
 
 func init() {
+
 	// TODO(aojea) add other cloud providers
 	// GKE subcommand
 	rootCmd.AddCommand(gke.GkeCmd)

pkg/apis/defaults.go

@@ -0,0 +1,78 @@
+/*
+Copyright 2025 Google LLC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package apis
+
+import (
+	"errors"
+	"fmt"
+	"net/netip"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/yaml"
+)
+
+// ValidateConfig validates the data in a runtime.RawExtension against the OpenAPI schema.
+func ValidateConfig(raw *runtime.RawExtension) (*NetworkConfig, error) {
+	if raw == nil || raw.Raw == nil {
+		return nil, nil
+	}
+	// Check if raw.Raw is empty
+	if len(raw.Raw) == 0 {
+		return nil, nil
+	}
+	var errorsList []error
+	var config NetworkConfig
+	if err := yaml.Unmarshal(raw.Raw, &config, yaml.DisallowUnknownFields); err != nil {
+		return nil, fmt.Errorf("failed to unmarshal YAML data: %w", err)
+	}
+
+	switch config.Mode {
+	case ModeVLAN:
+		if config.VLAN == nil {
+			return nil, fmt.Errorf("vlan config is missing")
+		}
+	case ModeMacvlan:
+		if config.Macvlan == nil {
+			errorsList = append(errorsList, fmt.Errorf("macvlan config is missing"))
+		}
+	case ModeIPvlan:
+		if config.IPvlan == nil {
+			errorsList = append(errorsList, fmt.Errorf("ipvlan config is missing"))
+		}
+	default:
+		// No mode specified
+	}
+
+	for _, ip := range config.IPs {
+		if _, err := netip.ParsePrefix(ip); err != nil {
+			errorsList = append(errorsList, fmt.Errorf("invalid IP in CIDR format %s", ip))
+		}
+	}
+
+	for _, route := range config.Routes {
+		if route.Destination == "" || route.Gateway == "" {
+			errorsList = append(errorsList, fmt.Errorf("invalid route %v", route))
+		}
+		if _, err := netip.ParsePrefix(route.Destination); err != nil {
+			errorsList = append(errorsList, fmt.Errorf("invalid CIDR %s", route.Destination))
+		}
+		if _, err := netip.ParseAddr(route.Gateway); err != nil {
+			errorsList = append(errorsList, fmt.Errorf("invalid IP address %s", route.Gateway))
+		}
+	}
+	return &config, errors.Join(errorsList...)
+}

pkg/dranetctl/gke/acceleratorpod.go

@@ -18,9 +18,16 @@ package gke
 
 import (
 	"fmt"
+	"strings"
 
+	"cloud.google.com/go/compute/apiv1/computepb"
 	"cloud.google.com/go/container/apiv1/containerpb"
 	"github.com/spf13/cobra"
+	"k8s.io/klog/v2"
+)
+
+const (
+	wellKnownPrefix = "dranet-"
 )
 
 // acceleratorpodCmd represents the acceleratorpod command
@@ -199,14 +206,63 @@ specify the cluster if the accelerator pod name is not unique across clusters
 (though it's recommended to have unique naming).`,
 	Args: cobra.ExactArgs(1), // Expects the acceleratorpod name as an argument
 	RunE: func(cmd *cobra.Command, args []string) error {
+		ctx := cmd.Context()
 		acceleratorpodName := args[0]
+		if clusterName == "" {
+			return fmt.Errorf("Cluster name not explicitly provided.")
+		}
+		// Try to get the nodepool from the cluster
+		if location == "-" {
+			return fmt.Errorf("location for accelerator pod %s not specified", acceleratorpodName)
+		}
+
 		fmt.Printf("Deleting acceleratorpod '%s'...\n", acceleratorpodName)
 		fmt.Printf("  Project: %s\n", projectID)
-		if clusterName == "" {
-			return fmt.Errorf("Warning: Cluster name not explicitly provided.")
+		fmt.Printf("  Target Cluster: %s\n", clusterName)
+
+		var nodePool *containerpb.NodePool
 
+		req := &containerpb.GetNodePoolRequest{
+			Name: fmt.Sprintf("projects/%s/locations/%s/clusters/%s/nodePools/%s", projectID, location, clusterName, acceleratorpodName),
 		}
-		fmt.Printf("  Target Cluster: %s\n", clusterName)
+		np, err := ContainersClient.GetNodePool(ctx, req)
+		if err != nil {
+			return fmt.Errorf("erro trying to get AcceleratorPod %s: %w", acceleratorpodName, err)
+		}
+		nodePool = np
+
+		if dryRun {
+			fmt.Printf("Deleting AcceleratorPod %s", nodePool.String())
+			return nil
+		}
+
+		// Cleanup the networks if those were created by us
+		for _, networkConfig := range nodePool.NetworkConfig.AdditionalNodeNetworkConfigs {
+			if !strings.HasPrefix(networkConfig.Network, wellKnownPrefix) {
+				klog.V(2).Infof("Skipping network %s", networkConfig.Network)
+			}
+			reqNet := &computepb.GetNetworkRequest{
+				Project: projectID,
+				Network: networkConfig.Network,
+			}
+			network, err := NetworksClient.Get(ctx, reqNet)
+			if err != nil {
+				return fmt.Errorf("getting network '%s': %w", networkConfig.Network, err)
+			}
+			klog.V(2).InfoS("get network", "network", network)
+
+			reqFw := &computepb.GetEffectiveFirewallsNetworkRequest{
+				Project: projectID,
+				Network: networkName,
+			}
+
+			firewall, err := NetworksClient.GetEffectiveFirewalls(ctx, reqFw)
+			if err != nil {
+				return fmt.Errorf("getting firewalls for network %s: %w", networkConfig.Network, err)
+			}
+			klog.V(2).InfoS("get firewall", "network", firewall)
+		}
+
 		return nil
 	},
 }

pkg/dranetctl/gke/command.go

@@ -35,6 +35,7 @@ var (
 	projectID   string
 	location    string
 	clusterName string
+	dryRun      bool
 )
 
 func init() {
@@ -43,6 +44,7 @@ func init() {
 	GkeCmd.PersistentFlags().StringVar(&projectID, "project", "", "Google Cloud Project ID")
 	GkeCmd.PersistentFlags().StringVar(&location, "location", "-", "Google Cloud region or zone to operate in")
 	GkeCmd.PersistentFlags().StringVar(&clusterName, "cluster", "", "The name of the target GKE cluster")
+	GkeCmd.PersistentFlags().BoolVar(&dryRun, "dry-run", false, "The command will print the write actions without executing them")
 }
 
 var GkeCmd = &cobra.Command{