Merge pull request kubernetes#82045 from apelisse/remove-crd-scale-bug

k8s-ci-robot · web-flow · commit 8019ebf3df19 · 2019-08-30T11:21:11.000-07:00
Disable tracking manged fields on scale sub-resource
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go
@@ -821,6 +821,8 @@ func (r *crdHandler) getOrCreateServingInfoFor(uid types.UID, name string) (*crd
 			SelfLinkPathPrefix: selfLinkPrefix,
 			SelfLinkPathSuffix: "/scale",
 		}
+		// TODO(issues.k8s.io/82046): We can't effectively track ownership on scale requests yet.
+		scaleScope.FieldManager = nil
 		scaleScopes[v.Name] = &scaleScope
 
 		// override status subresource values

Original file line number	Diff line number	Diff line change
`@@ -821,6 +821,8 @@ func (r crdHandler) getOrCreateServingInfoFor(uid types.UID, name string) (crd`
`821`	`821`	`SelfLinkPathPrefix: selfLinkPrefix,`
`822`	`822`	`SelfLinkPathSuffix: "/scale",`
`823`	`823`	`}`
	`824`	`+ // TODO(issues.k8s.io/82046): We can't effectively track ownership on scale requests yet.`
	`825`	`+ scaleScope.FieldManager = nil`
`824`	`826`	`scaleScopes[v.Name] = &scaleScope`
`825`	`827`
`826`	`828`	`// override status subresource values`