Limit the auto-added removedMinor to beta APIs

spowelljr · spowelljr · commit 8e51aecf1d7f · 2025-06-26T19:24:03.000Z
diff --git a/staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/prerelease-lifecycle-generators/status.go b/staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/prerelease-lifecycle-generators/status.go
@@ -375,6 +375,7 @@ func (g *genPreleaseLifecycle) Imports(c *generator.Context) (imports []string)
 
 var (
 	isGAVersionRegex = regexp.MustCompile(`^v\d+$`)
+	isBetaVersionRegex = regexp.MustCompile(`^v\d+beta\d+$`)
 )
 
 func (g *genPreleaseLifecycle) argsFromType(c *generator.Context, t *types.Type) (generator.Args, error) {
@@ -391,6 +392,7 @@ func (g *genPreleaseLifecycle) argsFromType(c *generator.Context, t *types.Type)
 	// If the package is GA, the version matches the format vN where N is a number.
 	version := path.Base(t.Name.Package)
 	isGAVersion := isGAVersionRegex.MatchString(version)
+	isBetaVersion := isBetaVersionRegex.MatchString(version)
 
 	a = a.
 		With("introducedMajor", introducedMajor).
@@ -427,7 +429,7 @@ func (g *genPreleaseLifecycle) argsFromType(c *generator.Context, t *types.Type)
 		}
 	}
 
-	if !isGAVersion || hasRemoved {
+	if isBetaVersion || hasRemoved {
 		a = a.
 			With("removedMajor", removedMajor).
 			With("removedMinor", removedMinor)
diff --git a/staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/prerelease-lifecycle-generators/status_test.go b/staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/prerelease-lifecycle-generators/status_test.go
@@ -248,8 +248,6 @@ func TestArgsFromType(t *testing.T) {
 				"introducedMinor": 5,
 				"deprecatedMajor": 1,
 				"deprecatedMinor": 8,
-				"removedMajor":    1,
-				"removedMinor":    11,
 			},
 		},
 	}

Original file line number	Diff line number	Diff line change
`@@ -375,6 +375,7 @@ func (g genPreleaseLifecycle) Imports(c generator.Context) (imports []string)`
`375`	`375`
`376`	`376`	`var (`
`377`	`377`	isGAVersionRegex = regexp.MustCompile(`^v\d+$`)
	`378`	+ isBetaVersionRegex = regexp.MustCompile(`^v\d+beta\d+$`)
`378`	`379`	`)`
`379`	`380`
`380`	`381`	`func (g genPreleaseLifecycle) argsFromType(c generator.Context, t *types.Type) (generator.Args, error) {`
`@@ -391,6 +392,7 @@ func (g genPreleaseLifecycle) argsFromType(c generator.Context, t *types.Type)`
`391`	`392`	`// If the package is GA, the version matches the format vN where N is a number.`
`392`	`393`	`version := path.Base(t.Name.Package)`
`393`	`394`	`isGAVersion := isGAVersionRegex.MatchString(version)`
	`395`	`+ isBetaVersion := isBetaVersionRegex.MatchString(version)`
`394`	`396`
`395`	`397`	`a = a.`
`396`	`398`	`With("introducedMajor", introducedMajor).`
`@@ -427,7 +429,7 @@ func (g genPreleaseLifecycle) argsFromType(c generator.Context, t *types.Type)`
`427`	`429`	`}`
`428`	`430`	`}`
`429`	`431`
`430`		`- if !isGAVersion \|\| hasRemoved {`
	`432`	`+ if isBetaVersion \|\| hasRemoved {`
`431`	`433`	`a = a.`
`432`	`434`	`With("removedMajor", removedMajor).`
`433`	`435`	`With("removedMinor", removedMinor)`
Original file line number	Diff line number	Diff line change
`@@ -248,8 +248,6 @@ func TestArgsFromType(t *testing.T) {`
`248`	`248`	`"introducedMinor": 5,`
`249`	`249`	`"deprecatedMajor": 1,`
`250`	`250`	`"deprecatedMinor": 8,`
`251`		`- "removedMajor": 1,`
`252`		`- "removedMinor": 11,`
`253`	`251`	`},`
`254`	`252`	`},`
`255`	`253`	`}`