mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #106321 from neolit123/1.23-fix-e2e-test-failures-1
kubeadm: fix test failures in the e2e_kubeadm suite
This commit is contained in:
commit
7663bffd51
@ -43,12 +43,12 @@ const (
|
||||
// TODO: This k8s-generic, well-known constant should be fetchable from another source, not be in this package
|
||||
KubeProxyClusterRoleName = "system:node-proxier"
|
||||
|
||||
// KubeProxyClusterRoleBindingName sets the name for the kube-proxy CluterRoleBinding
|
||||
KubeProxyClusterRoleBindingName = "kubeadm:node-proxier"
|
||||
|
||||
// KubeProxyServiceAccountName describes the name of the ServiceAccount for the kube-proxy addon
|
||||
KubeProxyServiceAccountName = "kube-proxy"
|
||||
|
||||
// KubeProxyClusterRoleBindingName sets the name for the kube-proxy CluterRoleBinding
|
||||
KubeProxyClusterRoleBindingName = "kubeam:node-proxier"
|
||||
|
||||
// KubeProxyConfigMapRoleName sets the name of ClusterRole for ConfigMap
|
||||
KubeProxyConfigMapRoleName = "kube-proxy"
|
||||
)
|
||||
|
@ -84,11 +84,15 @@ var _ = Describe("kubelet-config ConfigMap", func() {
|
||||
// https://github.com/kubernetes/kubeadm/issues/1582
|
||||
var UnversionedKubeletConfigMap bool
|
||||
if _, ok := m["featureGates"]; ok {
|
||||
if featureGates, ok := m["featureGates"].(map[string]bool); ok {
|
||||
if featureGates, ok := m["featureGates"].(map[interface{}]interface{}); ok {
|
||||
// TODO: update the default to true once this graduates to Beta.
|
||||
UnversionedKubeletConfigMap = false
|
||||
if val, ok := featureGates["UnversionedKubeletConfigMap"]; ok {
|
||||
UnversionedKubeletConfigMap = val
|
||||
if valBool, ok := val.(bool); ok {
|
||||
UnversionedKubeletConfigMap = valBool
|
||||
} else {
|
||||
framework.Failf("unable to cast the value of feature gate UnversionedKubeletConfigMap to bool")
|
||||
}
|
||||
}
|
||||
} else {
|
||||
framework.Failf("unable to cast the featureGates field in the %s ConfigMap", kubeadmConfigName)
|
||||
|
Loading…
Reference in New Issue
Block a user