github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Simplify schema sentinel subresource logic

Browse Source
This commit is contained in:
Joel Speed 2025-01-13 11:28:33 +00:00
parent ba816967a0
commit a2b12ba406
No known key found for this signature in database
GPG Key ID: 6E80578D6751DEFB
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
staging/src/k8s.io/apiextensions-apiserver/test/integration/ratcheting_test.go
View File

@ -232,17 +232,6 @@ func (u updateMyCRDV1Beta1Schema) Do(ctx *ratchetingTestContext) error {
sch.Properties = map[string]apiextensionsv1.JSONSchemaProps{}
}
if ctx.StatusSubresource {
sch = &apiextensionsv1.JSONSchemaProps{
Type: "object",
Properties: map[string]apiextensionsv1.JSONSchemaProps{
"status": *sch,
},
}
}
// sentinel must be in the root level of the schema.
// Do not include this in the status schema.
uuidString := string(uuid.NewUUID())
sentinelName := "__ratcheting_sentinel_field__"
sch.Properties[sentinelName] = apiextensionsv1.JSONSchemaProps{
@ -252,6 +241,15 @@ func (u updateMyCRDV1Beta1Schema) Do(ctx *ratchetingTestContext) error {
}},
}
if ctx.StatusSubresource {
sch = &apiextensionsv1.JSONSchemaProps{
Type: "object",
Properties: map[string]apiextensionsv1.JSONSchemaProps{
"status": *sch,
},
}
}
for _, v := range myCRD.Spec.Versions {
if v.Name != myCRDV1Beta1.Version {
continue
@ -278,12 +276,7 @@ func (u updateMyCRDV1Beta1Schema) Do(ctx *ratchetingTestContext) error {
name: "sentinel-resource",
patch: map[string]interface{}{
sentinelName: fmt.Sprintf("invalid-%d", counter),
}}.Do(&ratchetingTestContext{
T: ctx.T,
DynamicClient: ctx.DynamicClient,
APIExtensionsClient: ctx.APIExtensionsClient,
StatusSubresource: false, // Do not carry this over, sentinel check is in the root level.
})
}}.Do(ctx)
if err == nil {
return false, errors.New("expected error when creating sentinel resource")