From 0710b6836c655f4a197cc0efbffc615b5d1d165e Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Fri, 18 Mar 2022 15:55:58 +0000 Subject: [PATCH] teach code generator about ugly fields --- pkg/api/testing/applyconfiguration_test.go | 1 + .../applyconfiguration-gen/generators/applyconfiguration.go | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/pkg/api/testing/applyconfiguration_test.go b/pkg/api/testing/applyconfiguration_test.go index 5975456738c..dbdf1692855 100644 --- a/pkg/api/testing/applyconfiguration_test.go +++ b/pkg/api/testing/applyconfiguration_test.go @@ -180,6 +180,7 @@ func fuzzObject(t *testing.T, gvk schema.GroupVersionKind) runtime.Object { c.FuzzNoCustom(s) s.ManagedFields = nil s.SelfLink = "" + s.ZZZ_DeprecatedClusterName = "" }, ).Fuzz(internalObj) diff --git a/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/applyconfiguration.go b/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/applyconfiguration.go index ddd7c1fb48f..5ebadb47517 100644 --- a/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/applyconfiguration.go +++ b/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/applyconfiguration.go @@ -18,6 +18,7 @@ package generators import ( "io" + "strings" "k8s.io/gengo/generator" "k8s.io/gengo/namer" @@ -131,6 +132,10 @@ func blocklisted(t *types.Type, member types.Member) bool { if objectMeta.Name == t.Name && member.Name == "SelfLink" { return true } + // Hide any fields which are en route to deletion. + if strings.HasPrefix(member.Name, "ZZZ_") { + return true + } return false }