Merge pull request #102157 from neolit123/1.22-remove-cluster-status-from-e2e

kubeadm: remove e2e test for ClusterStatus
This commit is contained in:
Kubernetes Prow Robot 2021-05-20 13:14:28 -07:00 committed by GitHub
commit 44cffa1ef7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -32,7 +32,6 @@ const (
kubeadmConfigRoleName = "kubeadm:nodes-kubeadm-config" kubeadmConfigRoleName = "kubeadm:nodes-kubeadm-config"
kubeadmConfigRoleBindingName = kubeadmConfigRoleName kubeadmConfigRoleBindingName = kubeadmConfigRoleName
kubeadmConfigClusterConfigurationConfigMapKey = "ClusterConfiguration" kubeadmConfigClusterConfigurationConfigMapKey = "ClusterConfiguration"
kubeadmConfigClusterStatusConfigMapKey = "ClusterStatus"
) )
var ( var (
@ -60,23 +59,6 @@ var _ = Describe("kubeadm-config ConfigMap", func() {
cm := GetConfigMap(f.ClientSet, kubeSystemNamespace, kubeadmConfigName) cm := GetConfigMap(f.ClientSet, kubeSystemNamespace, kubeadmConfigName)
gomega.Expect(cm.Data).To(gomega.HaveKey(kubeadmConfigClusterConfigurationConfigMapKey)) gomega.Expect(cm.Data).To(gomega.HaveKey(kubeadmConfigClusterConfigurationConfigMapKey))
gomega.Expect(cm.Data).To(gomega.HaveKey(kubeadmConfigClusterStatusConfigMapKey))
m := unmarshalYaml(cm.Data[kubeadmConfigClusterStatusConfigMapKey])
if _, ok := m["apiEndpoints"]; ok {
d := m["apiEndpoints"].(map[interface{}]interface{})
// get all control-plane nodes
controlPlanes := getControlPlaneNodes(f.ClientSet)
// checks that all the control-plane nodes are in the apiEndpoints list
for _, cp := range controlPlanes.Items {
if _, ok := d[cp.Name]; !ok {
framework.Failf("failed to get apiEndpoints for control-plane %s in %s", cp.Name, kubeadmConfigClusterStatusConfigMapKey)
}
}
} else {
framework.Failf("failed to get apiEndpoints from %s", kubeadmConfigClusterStatusConfigMapKey)
}
}) })
ginkgo.It("should have related Role and RoleBinding", func() { ginkgo.It("should have related Role and RoleBinding", func() {