handle feature gates in docs scaffolds

Author: wazery

hack/docs/internal/cronjob-tutorial/generate_cronjob.go

@@ -226,12 +226,28 @@ type CronJob struct {`+`
 	 */`)
 	hackutils.CheckError("fixing schema for cronjob_types.go", err)
 
-	// fix lint
+	// fix lint - handle the pattern with or without feature-gated fields
 	err = pluginutil.ReplaceInFile(
 		filepath.Join(sp.ctx.Dir, "api/v1/cronjob_types.go"),
 		`/
 	
+
+	// Example of a feature-gated field:
+	// Bar is an experimental field that requires the "experimental-bar" feature gate to be enabled
+	// TODO: When controller-tools supports feature gates (issue #1238), use:
+	// +kubebuilder:feature-gate=experimental-bar
+	// +feature-gate experimental-bar
+	// +optional
+	Bar *string `+"`"+`json:"bar,omitempty"`+"`"+`
+}`, "/")
+	if err != nil {
+		// Fallback to the original pattern if the feature-gated field is not present
+		err = pluginutil.ReplaceInFile(
+			filepath.Join(sp.ctx.Dir, "api/v1/cronjob_types.go"),
+			`/
+	
 }`, "/")
+	}
 	hackutils.CheckError("fixing cronjob_types.go end of status", err)
 }
 

hack/docs/internal/multiversion-tutorial/generate_multiversion.go

@@ -735,11 +735,25 @@ We'll leave our spec largely unchanged, except to change the schedule field to a
 
 	err = pluginutil.ReplaceInFile(
 		filepath.Join(sp.ctx.Dir, path),
-		`// foo is an example field of CronJob. Edit cronjob_types.go to remove/update
+		`// Example of a feature-gated field:
+	// Bar is an experimental field that requires the "experimental-bar" feature gate to be enabled
+	// TODO: When controller-tools supports feature gates (issue #1238), use:
+	// +kubebuilder:feature-gate=experimental-bar
+	// +feature-gate experimental-bar
 	// +optional
-	Foo *string `+"`json:\"foo,omitempty\"`",
+	Bar *string `+"`"+`json:"bar,omitempty"`+"`",
 		cronjobSpecMore,
 	)
+	if err != nil {
+		// Fallback to the original pattern if the feature-gated field is not present
+		err = pluginutil.ReplaceInFile(
+			filepath.Join(sp.ctx.Dir, path),
+			`// foo is an example field of CronJob. Edit cronjob_types.go to remove/update
+	// +optional
+	Foo *string `+"`json:\"foo,omitempty\"`",
+			cronjobSpecMore,
+		)
+	}
 	hackutils.CheckError("replace Foo with cronjob spec fields", err)
 
 	err = pluginutil.ReplaceInFile(

test/e2e/v4/featuregates_test.go

@@ -85,7 +85,7 @@ var _ = Describe("Feature Gates", func() {
 			Expect(string(mainContent)).To(ContainSubstring("featuregates"))
 
 			// Verify API types have feature gate example
-			typesFile := filepath.Join(ctx.Dir, "api", ctx.Version, ctx.Kind+"_types.go")
+			typesFile := filepath.Join(ctx.Dir, "api", ctx.Version, strings.ToLower(ctx.Kind)+"_types.go")
 			Expect(typesFile).To(BeAnExistingFile())
 			typesContent, err := os.ReadFile(typesFile)
 			Expect(err).NotTo(HaveOccurred())
@@ -109,7 +109,7 @@ var _ = Describe("Feature Gates", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			// Add custom feature gates to the API types
-			typesFile := filepath.Join(ctx.Dir, "api", ctx.Version, ctx.Kind+"_types.go")
+			typesFile := filepath.Join(ctx.Dir, "api", ctx.Version, strings.ToLower(ctx.Kind)+"_types.go")
 			typesContent, err := os.ReadFile(typesFile)
 			Expect(err).NotTo(HaveOccurred())