Skip to content

Commit

Permalink
remove upstream validation which is breaking our kubeletcfg
Browse files Browse the repository at this point in the history
 PR openshift#1524 introduced kubeletconfig as an embedded resource:
 x-kubernetes-embedded-resource: true

 This validates our config against the upstream config which differs in the placement of api version and kind. The result
 is that our kubeletconfigs are no longer valid and are unable to be applied. This PR removes the check and unbreaks our
 kubeletconfigs.
  • Loading branch information
kikisdeliveryservice committed Mar 6, 2020
1 parent 961ea02 commit 4755f45
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion manifests/kubeletconfig.crd.yaml
Expand Up @@ -42,7 +42,6 @@ spec:
properties:
kubeletConfig:
type: object
x-kubernetes-embedded-resource: true
x-kubernetes-preserve-unknown-fields: true
machineConfigPoolSelector:
description: A label selector is a label query over a set of resources.
Expand Down
1 change: 0 additions & 1 deletion pkg/operator/assets/bindata.go
Expand Up @@ -1155,7 +1155,6 @@ spec:
properties:
kubeletConfig:
type: object
x-kubernetes-embedded-resource: true
x-kubernetes-preserve-unknown-fields: true
machineConfigPoolSelector:
description: A label selector is a label query over a set of resources.
Expand Down

0 comments on commit 4755f45

Please sign in to comment.