mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
make applyconfiguration-gen work for resources without objectmeta
This commit is contained in:
parent
59df3248ed
commit
09d9d37c38
@ -97,9 +97,12 @@ func (g *applyConfigurationGenerator) GenerateType(c *generator.Context, t *type
|
|||||||
g.generateStruct(sw, typeParams)
|
g.generateStruct(sw, typeParams)
|
||||||
|
|
||||||
if typeParams.Tags.GenerateClient {
|
if typeParams.Tags.GenerateClient {
|
||||||
if typeParams.Tags.NonNamespaced {
|
switch {
|
||||||
|
case !hasObjectMetaField(t):
|
||||||
|
sw.Do(clientgenTypeConstructorWithoutObjectMeta, typeParams)
|
||||||
|
case typeParams.Tags.NonNamespaced:
|
||||||
sw.Do(clientgenTypeConstructorNonNamespaced, typeParams)
|
sw.Do(clientgenTypeConstructorNonNamespaced, typeParams)
|
||||||
} else {
|
default:
|
||||||
sw.Do(clientgenTypeConstructorNamespaced, typeParams)
|
sw.Do(clientgenTypeConstructorNamespaced, typeParams)
|
||||||
}
|
}
|
||||||
if typeParams.OpenAPIType != nil {
|
if typeParams.OpenAPIType != nil {
|
||||||
@ -125,6 +128,15 @@ func hasTypeMetaField(t *types.Type) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func hasObjectMetaField(t *types.Type) bool {
|
||||||
|
for _, member := range t.Members {
|
||||||
|
if objectMeta.Name == member.Type.Name && member.Embedded {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
func blocklisted(t *types.Type, member types.Member) bool {
|
func blocklisted(t *types.Type, member types.Member) bool {
|
||||||
if objectMeta.Name == t.Name && member.Name == "ManagedFields" {
|
if objectMeta.Name == t.Name && member.Name == "ManagedFields" {
|
||||||
return true
|
return true
|
||||||
@ -330,6 +342,17 @@ func $.ApplyConfig.Type|public$(name string) *$.ApplyConfig.ApplyConfiguration|p
|
|||||||
}
|
}
|
||||||
`
|
`
|
||||||
|
|
||||||
|
var clientgenTypeConstructorWithoutObjectMeta = `
|
||||||
|
// $.ApplyConfig.Type|public$ constructs an declarative configuration of the $.ApplyConfig.Type|public$ type for use with
|
||||||
|
// apply.
|
||||||
|
func $.ApplyConfig.Type|public$(name string) *$.ApplyConfig.ApplyConfiguration|public$ {
|
||||||
|
b := &$.ApplyConfig.ApplyConfiguration|public${}
|
||||||
|
b.WithKind("$.ApplyConfig.Type|singularKind$")
|
||||||
|
b.WithAPIVersion("$.APIVersion$")
|
||||||
|
return b
|
||||||
|
}
|
||||||
|
`
|
||||||
|
|
||||||
var constructorWithTypeMeta = `
|
var constructorWithTypeMeta = `
|
||||||
// $.ApplyConfig.ApplyConfiguration|public$ constructs an declarative configuration of the $.ApplyConfig.Type|public$ type for use with
|
// $.ApplyConfig.ApplyConfiguration|public$ constructs an declarative configuration of the $.ApplyConfig.Type|public$ type for use with
|
||||||
// apply.
|
// apply.
|
||||||
@ -375,7 +398,18 @@ func Extract$.ApplyConfig.Type|public$Status($.Struct|private$ *$.Struct|raw$, f
|
|||||||
}
|
}
|
||||||
`, typeParams)
|
`, typeParams)
|
||||||
}
|
}
|
||||||
sw.Do(`
|
if !hasObjectMetaField(typeParams.Struct) {
|
||||||
|
sw.Do(`
|
||||||
|
func extract$.ApplyConfig.Type|public$($.Struct|private$ *$.Struct|raw$, fieldManager string, subresource string) (*$.ApplyConfig.ApplyConfiguration|public$, error) {
|
||||||
|
b := &$.ApplyConfig.ApplyConfiguration|public${}
|
||||||
|
err := $.ExtractInto|raw$($.Struct|private$, $.ParserFunc|raw$().Type("$.OpenAPIType$"), fieldManager, b, subresource)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
`, typeParams)
|
||||||
|
|
||||||
|
} else { // it has objectMeta
|
||||||
|
sw.Do(`
|
||||||
func extract$.ApplyConfig.Type|public$($.Struct|private$ *$.Struct|raw$, fieldManager string, subresource string) (*$.ApplyConfig.ApplyConfiguration|public$, error) {
|
func extract$.ApplyConfig.Type|public$($.Struct|private$ *$.Struct|raw$, fieldManager string, subresource string) (*$.ApplyConfig.ApplyConfiguration|public$, error) {
|
||||||
b := &$.ApplyConfig.ApplyConfiguration|public${}
|
b := &$.ApplyConfig.ApplyConfiguration|public${}
|
||||||
err := $.ExtractInto|raw$($.Struct|private$, $.ParserFunc|raw$().Type("$.OpenAPIType$"), fieldManager, b, subresource)
|
err := $.ExtractInto|raw$($.Struct|private$, $.ParserFunc|raw$().Type("$.OpenAPIType$"), fieldManager, b, subresource)
|
||||||
@ -384,8 +418,9 @@ func extract$.ApplyConfig.Type|public$($.Struct|private$ *$.Struct|raw$, fieldMa
|
|||||||
}
|
}
|
||||||
b.WithName($.Struct|private$.Name)
|
b.WithName($.Struct|private$.Name)
|
||||||
`, typeParams)
|
`, typeParams)
|
||||||
if !typeParams.Tags.NonNamespaced {
|
if !typeParams.Tags.NonNamespaced {
|
||||||
sw.Do("b.WithNamespace($.Struct|private$.Namespace)\n", typeParams)
|
sw.Do("b.WithNamespace($.Struct|private$.Namespace)\n", typeParams)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
sw.Do(`
|
sw.Do(`
|
||||||
b.WithKind("$.ApplyConfig.Type|singularKind$")
|
b.WithKind("$.ApplyConfig.Type|singularKind$")
|
||||||
|
Loading…
Reference in New Issue
Block a user