mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
e2e_kubeadm: use log functions of core framework
This commit is contained in:
parent
36b2914207
commit
d9bfff9976
@ -35,7 +35,6 @@ go_test(
|
|||||||
"//staging/src/k8s.io/cluster-bootstrap/token/api:go_default_library",
|
"//staging/src/k8s.io/cluster-bootstrap/token/api:go_default_library",
|
||||||
"//test/e2e/framework:go_default_library",
|
"//test/e2e/framework:go_default_library",
|
||||||
"//test/e2e/framework/config:go_default_library",
|
"//test/e2e/framework/config:go_default_library",
|
||||||
"//test/e2e/framework/log:go_default_library",
|
|
||||||
"//vendor/github.com/onsi/ginkgo:go_default_library",
|
"//vendor/github.com/onsi/ginkgo:go_default_library",
|
||||||
"//vendor/github.com/onsi/ginkgo/config:go_default_library",
|
"//vendor/github.com/onsi/ginkgo/config:go_default_library",
|
||||||
"//vendor/github.com/onsi/ginkgo/reporters:go_default_library",
|
"//vendor/github.com/onsi/ginkgo/reporters:go_default_library",
|
||||||
@ -81,7 +80,6 @@ go_library(
|
|||||||
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
|
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
|
||||||
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
|
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
|
||||||
"//test/e2e/framework:go_default_library",
|
"//test/e2e/framework:go_default_library",
|
||||||
"//test/e2e/framework/log:go_default_library",
|
|
||||||
"//vendor/github.com/onsi/ginkgo:go_default_library",
|
"//vendor/github.com/onsi/ginkgo:go_default_library",
|
||||||
"//vendor/github.com/onsi/gomega:go_default_library",
|
"//vendor/github.com/onsi/gomega:go_default_library",
|
||||||
"//vendor/github.com/onsi/gomega/gstruct:go_default_library",
|
"//vendor/github.com/onsi/gomega/gstruct:go_default_library",
|
||||||
|
@ -22,7 +22,6 @@ import (
|
|||||||
rbacv1 "k8s.io/api/rbac/v1"
|
rbacv1 "k8s.io/api/rbac/v1"
|
||||||
clientset "k8s.io/client-go/kubernetes"
|
clientset "k8s.io/client-go/kubernetes"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
|
|
||||||
|
|
||||||
"github.com/onsi/ginkgo"
|
"github.com/onsi/ginkgo"
|
||||||
"github.com/onsi/gomega"
|
"github.com/onsi/gomega"
|
||||||
@ -72,11 +71,11 @@ var _ = KubeadmDescribe("kubeadm-config ConfigMap", func() {
|
|||||||
// checks that all the control-plane nodes are in the apiEndpoints list
|
// checks that all the control-plane nodes are in the apiEndpoints list
|
||||||
for _, cp := range controlPlanes.Items {
|
for _, cp := range controlPlanes.Items {
|
||||||
if _, ok := d[cp.Name]; !ok {
|
if _, ok := d[cp.Name]; !ok {
|
||||||
e2elog.Failf("failed to get apiEndpoints for control-plane %s in %s", cp.Name, kubeadmConfigClusterStatusConfigMapKey)
|
framework.Failf("failed to get apiEndpoints for control-plane %s in %s", cp.Name, kubeadmConfigClusterStatusConfigMapKey)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
e2elog.Failf("failed to get apiEndpoints from %s", kubeadmConfigClusterStatusConfigMapKey)
|
framework.Failf("failed to get apiEndpoints from %s", kubeadmConfigClusterStatusConfigMapKey)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -112,7 +111,7 @@ func unmarshalYaml(data string) map[interface{}]interface{} {
|
|||||||
m := make(map[interface{}]interface{})
|
m := make(map[interface{}]interface{})
|
||||||
err := yaml.Unmarshal([]byte(data), &m)
|
err := yaml.Unmarshal([]byte(data), &m)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e2elog.Failf("error parsing %s ConfigMap: %v", kubeadmConfigName, err)
|
framework.Failf("error parsing %s ConfigMap: %v", kubeadmConfigName, err)
|
||||||
}
|
}
|
||||||
return m
|
return m
|
||||||
}
|
}
|
||||||
|
@ -23,7 +23,6 @@ import (
|
|||||||
rbacv1 "k8s.io/api/rbac/v1"
|
rbacv1 "k8s.io/api/rbac/v1"
|
||||||
"k8s.io/apimachinery/pkg/util/version"
|
"k8s.io/apimachinery/pkg/util/version"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
|
|
||||||
|
|
||||||
"github.com/onsi/ginkgo"
|
"github.com/onsi/ginkgo"
|
||||||
"github.com/onsi/gomega"
|
"github.com/onsi/gomega"
|
||||||
@ -74,7 +73,7 @@ var _ = KubeadmDescribe("kubelet-config ConfigMap", func() {
|
|||||||
k8sVersionString := m["kubernetesVersion"].(string)
|
k8sVersionString := m["kubernetesVersion"].(string)
|
||||||
k8sVersion, err := version.ParseSemantic(k8sVersionString)
|
k8sVersion, err := version.ParseSemantic(k8sVersionString)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e2elog.Failf("error reading kubernetesVersion from %s ConfigMap: %v", kubeadmConfigName, err)
|
framework.Failf("error reading kubernetesVersion from %s ConfigMap: %v", kubeadmConfigName, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Computes all the names derived from the kubernetesVersion
|
// Computes all the names derived from the kubernetesVersion
|
||||||
|
@ -22,7 +22,6 @@ import (
|
|||||||
|
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
|
|
||||||
|
|
||||||
"github.com/onsi/ginkgo"
|
"github.com/onsi/ginkgo"
|
||||||
)
|
)
|
||||||
@ -90,7 +89,7 @@ var _ = KubeadmDescribe("networking [setup-networking]", func() {
|
|||||||
framework.ExpectNoError(err, "error listing nodes")
|
framework.ExpectNoError(err, "error listing nodes")
|
||||||
for _, node := range nodes.Items {
|
for _, node := range nodes.Items {
|
||||||
if !subnetWithinSubnet(ps.(string), node.Spec.PodCIDR) {
|
if !subnetWithinSubnet(ps.(string), node.Spec.PodCIDR) {
|
||||||
e2elog.Failf("failed due to node(%v) IP %v not inside configured pod subnet: %s", node.Name, node.Spec.PodCIDR, ps)
|
framework.Failf("failed due to node(%v) IP %v not inside configured pod subnet: %s", node.Name, node.Spec.PodCIDR, ps)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -114,7 +113,7 @@ var _ = KubeadmDescribe("networking [setup-networking]", func() {
|
|||||||
svc, err := f.ClientSet.CoreV1().Services("default").Get("kubernetes", metav1.GetOptions{})
|
svc, err := f.ClientSet.CoreV1().Services("default").Get("kubernetes", metav1.GetOptions{})
|
||||||
framework.ExpectNoError(err, "error getting Service %q from namespace %q", "kubernetes", "default")
|
framework.ExpectNoError(err, "error getting Service %q from namespace %q", "kubernetes", "default")
|
||||||
if !ipWithinSubnet(ss.(string), svc.Spec.ClusterIP) {
|
if !ipWithinSubnet(ss.(string), svc.Spec.ClusterIP) {
|
||||||
e2elog.Failf("failed due to service(%v) cluster-IP %v not inside configured service subnet: %s", svc.Name, svc.Spec.ClusterIP, ss)
|
framework.Failf("failed due to service(%v) cluster-IP %v not inside configured service subnet: %s", svc.Name, svc.Spec.ClusterIP, ss)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -149,7 +148,7 @@ var _ = KubeadmDescribe("networking [setup-networking]", func() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if !found {
|
if !found {
|
||||||
e2elog.Failf("failed due to the PodCIDRs (%v) of Node %q not being inside the configuration podSubnet CIDR %q", node.Spec.PodCIDRs, node.Name, configCIDRs)
|
framework.Failf("failed due to the PodCIDRs (%v) of Node %q not being inside the configuration podSubnet CIDR %q", node.Spec.PodCIDRs, node.Name, configCIDRs)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,6 @@ import (
|
|||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
clientset "k8s.io/client-go/kubernetes"
|
clientset "k8s.io/client-go/kubernetes"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
|
|
||||||
|
|
||||||
"github.com/onsi/gomega"
|
"github.com/onsi/gomega"
|
||||||
"github.com/onsi/gomega/gstruct"
|
"github.com/onsi/gomega/gstruct"
|
||||||
@ -168,7 +167,7 @@ func ExpectSubjectHasAccessToResource(c clientset.Interface, subjectKind, subjec
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
e2elog.Failf("invalid subjectKind %s", subjectKind)
|
framework.Failf("invalid subjectKind %s", subjectKind)
|
||||||
}
|
}
|
||||||
|
|
||||||
s, err := c.AuthorizationV1().SubjectAccessReviews().Create(sar)
|
s, err := c.AuthorizationV1().SubjectAccessReviews().Create(sar)
|
||||||
|
Loading…
Reference in New Issue
Block a user