mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-10-22 15:09:39 +00:00
Merge pull request #51033 from mtaufen/revert-51008-revert-50789-fix-scheme
Automatic merge from submit-queue (batch tested with PRs 50967, 50505, 50706, 51033, 51028) Revert "Merge pull request #51008 from kubernetes/revert-50789-fix-scheme" I'm spinning up a cluster right now to test this fix, but I'm pretty sure this was the problem. There doesn't seem to be a way to confirm from logs, because AFAICT the logs from the hollow kubelet containers are not collected as part of the kubemark test. **What this PR does / why we need it**: This reverts commitf4afdecef8
, reversing changes made toe633a1604f
. This also fixes a bug where Kubemark was still using the core api scheme to manipulate the Kubelet's types, which was the cause of the initial revert. **Which issue this PR fixes**: fixes #51007 **Release note**: ```release-note NONE ``` /cc @shyamjvs @wojtek-t
This commit is contained in:
@@ -434,10 +434,6 @@ var ephemeralWhiteList = createEphemeralWhiteList(
|
||||
gvr("componentconfig", "v1alpha1", "kubeproxyconfigurations"), // not stored in etcd
|
||||
// --
|
||||
|
||||
// k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1alpha1
|
||||
gvr("kubeletconfig", "v1alpha1", "kubeletconfigurations"), // not stored in etcd
|
||||
// --
|
||||
|
||||
// k8s.io/kubernetes/pkg/apis/extensions/v1beta1
|
||||
gvr("extensions", "v1beta1", "deploymentrollbacks"), // used to rollback deployment, not stored in etcd
|
||||
gvr("extensions", "v1beta1", "replicationcontrollerdummies"), // not stored in etcd
|
||||
|
Reference in New Issue
Block a user