updated scaffolding

Author: Kuzuri247

pkg/plugins/golang/v4/scaffolds/webhook.go

@@ -19,6 +19,7 @@ package scaffolds
 import (
 	"errors"
 	"fmt"
+	"path/filepath"
 	"strings"
 
 	"sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/api"
@@ -35,6 +36,7 @@ import (
 	"sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/hack"
 	"sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e"
 	"sigs.k8s.io/kubebuilder/v4/pkg/plugins/golang/v4/scaffolds/internal/templates/webhooks"
+	"sigs.k8s.io/kubebuilder/v4/pkg/plugin/util"
 )
 
 var _ plugins.Scaffolder = &webhookScaffolder{}
@@ -173,5 +175,33 @@ You need to implement the conversion.Hub and conversion.Convertible interfaces f
 			}
 		}
 	}
+
+	// After scaffolding, uncomment relevant sections in kustomization.yaml
+	kustomizationPath := filepath.Join("config", "default", "kustomization.yaml")
+	
+	var blocksToUncomment []string
+	
+	// Add patterns based on webhook type
+	if s.isDefaultingWebhook() {
+		blocksToUncomment = append(blocksToUncomment, 
+			"- ../webhook",
+			"- ../certmanager",
+			"- ../manager")
+	}
+	
+	if s.isConversionWebhook() {
+		blocksToUncomment = append(blocksToUncomment,
+			"- ../webhook",
+			"- ../certmanager",
+			"- ../manager",
+			"webhookConversion:")
+	}
+
+	if err := util.UncommentKustomizationBlocks(kustomizationPath, blocksToUncomment); err != nil {
+		// Log warning instead of returning error to not block the workflow
+		log.Printf("Warning: Could not automatically uncomment kustomization blocks: %v", err)
+		log.Println("You may need to manually uncomment the relevant sections in config/default/kustomization.yaml")
+	}
+
 	return nil
 }

pkg/plugins/golang/v4/scaffolds/webhook_test.go

@@ -0,0 +1,41 @@
+package scaffolds
+
+import (
+	"testing"
+)
+
+func TestWebhookScaffolderUncommentsKustomization(t *testing.T) {
+	// Test setup code...
+
+	tests := []struct {
+		name           string
+		webhookType    string
+		expectedBlocks []string
+	}{
+		{
+			name:        "defaulting webhook",
+			webhookType: "defaulting",
+			expectedBlocks: []string{
+				"- ../webhook",
+				"- ../certmanager",
+				"- ../manager",
+			},
+		},
+		{
+			name:        "conversion webhook",
+			webhookType: "conversion",
+			expectedBlocks: []string{
+				"- ../webhook",
+				"- ../certmanager",
+				"- ../manager",
+				"webhookConversion:",
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Test implementation...
+		})
+	}
+} 

plugin/util/util.go

@@ -0,0 +1,28 @@
+// UncommentKustomizationBlocks uncomments specified blocks in kustomization.yaml
+func UncommentKustomizationBlocks(path string, patterns []string) error {
+    content, err := os.ReadFile(path)
+    if err != nil {
+        return fmt.Errorf("failed to read kustomization file: %w", err)
+    }
+
+    lines := strings.Split(string(content), "\n")
+    modified := false
+
+    for i, line := range lines {
+        for _, pattern := range patterns {
+            if strings.Contains(line, pattern) && strings.HasPrefix(strings.TrimSpace(line), "#") {
+                lines[i] = strings.TrimPrefix(strings.TrimSpace(line), "#")
+                modified = true
+            }
+        }
+    }
+
+    if modified {
+        err = os.WriteFile(path, []byte(strings.Join(lines, "\n")), 0644)
+        if err != nil {
+            return fmt.Errorf("failed to write kustomization file: %w", err)
+        }
+    }
+
+    return nil
+}