github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

quiet integration test logs

Browse Source
This commit is contained in:
Jordan Liggitt 2019-04-19 23:15:31 -04:00
parent b384712024
commit aee1997a19
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/registry/rbac/rest/storage_rbac.go
View File

@ -190,9 +190,9 @@ func (p *PolicyData) EnsureRBACPolicy() genericapiserver.PostStartHookFunc {
case result.Protected && result.Operation != reconciliation.ReconcileNone: case result.Protected && result.Operation != reconciliation.ReconcileNone:
klog.Warningf("skipped reconcile-protected clusterrole.%s/%s with missing permissions: %v", rbac.GroupName, clusterRole.Name, result.MissingRules) klog.Warningf("skipped reconcile-protected clusterrole.%s/%s with missing permissions: %v", rbac.GroupName, clusterRole.Name, result.MissingRules)
case result.Operation == reconciliation.ReconcileUpdate: case result.Operation == reconciliation.ReconcileUpdate:
klog.Infof("updated clusterrole.%s/%s with additional permissions: %v", rbac.GroupName, clusterRole.Name, result.MissingRules) klog.V(2).Infof("updated clusterrole.%s/%s with additional permissions: %v", rbac.GroupName, clusterRole.Name, result.MissingRules)
case result.Operation == reconciliation.ReconcileCreate: case result.Operation == reconciliation.ReconcileCreate:
klog.Infof("created clusterrole.%s/%s", rbac.GroupName, clusterRole.Name) klog.V(2).Infof("created clusterrole.%s/%s", rbac.GroupName, clusterRole.Name)
} }
return nil return nil
}) })
@ -218,11 +218,11 @@ func (p *PolicyData) EnsureRBACPolicy() genericapiserver.PostStartHookFunc {
case result.Protected && result.Operation != reconciliation.ReconcileNone: case result.Protected && result.Operation != reconciliation.ReconcileNone:
klog.Warningf("skipped reconcile-protected clusterrolebinding.%s/%s with missing subjects: %v", rbac.GroupName, clusterRoleBinding.Name, result.MissingSubjects) klog.Warningf("skipped reconcile-protected clusterrolebinding.%s/%s with missing subjects: %v", rbac.GroupName, clusterRoleBinding.Name, result.MissingSubjects)
case result.Operation == reconciliation.ReconcileUpdate: case result.Operation == reconciliation.ReconcileUpdate:
klog.Infof("updated clusterrolebinding.%s/%s with additional subjects: %v", rbac.GroupName, clusterRoleBinding.Name, result.MissingSubjects) klog.V(2).Infof("updated clusterrolebinding.%s/%s with additional subjects: %v", rbac.GroupName, clusterRoleBinding.Name, result.MissingSubjects)
case result.Operation == reconciliation.ReconcileCreate: case result.Operation == reconciliation.ReconcileCreate:
klog.Infof("created clusterrolebinding.%s/%s", rbac.GroupName, clusterRoleBinding.Name) klog.V(2).Infof("created clusterrolebinding.%s/%s", rbac.GroupName, clusterRoleBinding.Name)
case result.Operation == reconciliation.ReconcileRecreate: case result.Operation == reconciliation.ReconcileRecreate:
klog.Infof("recreated clusterrolebinding.%s/%s", rbac.GroupName, clusterRoleBinding.Name) klog.V(2).Infof("recreated clusterrolebinding.%s/%s", rbac.GroupName, clusterRoleBinding.Name)
} }
return nil return nil
}) })
@ -249,9 +249,9 @@ func (p *PolicyData) EnsureRBACPolicy() genericapiserver.PostStartHookFunc {
case result.Protected && result.Operation != reconciliation.ReconcileNone: case result.Protected && result.Operation != reconciliation.ReconcileNone:
klog.Warningf("skipped reconcile-protected role.%s/%s in %v with missing permissions: %v", rbac.GroupName, role.Name, namespace, result.MissingRules) klog.Warningf("skipped reconcile-protected role.%s/%s in %v with missing permissions: %v", rbac.GroupName, role.Name, namespace, result.MissingRules)
case result.Operation == reconciliation.ReconcileUpdate: case result.Operation == reconciliation.ReconcileUpdate:
klog.Infof("updated role.%s/%s in %v with additional permissions: %v", rbac.GroupName, role.Name, namespace, result.MissingRules) klog.V(2).Infof("updated role.%s/%s in %v with additional permissions: %v", rbac.GroupName, role.Name, namespace, result.MissingRules)
case result.Operation == reconciliation.ReconcileCreate: case result.Operation == reconciliation.ReconcileCreate:
klog.Infof("created role.%s/%s in %v", rbac.GroupName, role.Name, namespace) klog.V(2).Infof("created role.%s/%s in %v", rbac.GroupName, role.Name, namespace)
} }
return nil return nil
}) })
@ -279,11 +279,11 @@ func (p *PolicyData) EnsureRBACPolicy() genericapiserver.PostStartHookFunc {
case result.Protected && result.Operation != reconciliation.ReconcileNone: case result.Protected && result.Operation != reconciliation.ReconcileNone:
klog.Warningf("skipped reconcile-protected rolebinding.%s/%s in %v with missing subjects: %v", rbac.GroupName, roleBinding.Name, namespace, result.MissingSubjects) klog.Warningf("skipped reconcile-protected rolebinding.%s/%s in %v with missing subjects: %v", rbac.GroupName, roleBinding.Name, namespace, result.MissingSubjects)
case result.Operation == reconciliation.ReconcileUpdate: case result.Operation == reconciliation.ReconcileUpdate:
klog.Infof("updated rolebinding.%s/%s in %v with additional subjects: %v", rbac.GroupName, roleBinding.Name, namespace, result.MissingSubjects) klog.V(2).Infof("updated rolebinding.%s/%s in %v with additional subjects: %v", rbac.GroupName, roleBinding.Name, namespace, result.MissingSubjects)
case result.Operation == reconciliation.ReconcileCreate: case result.Operation == reconciliation.ReconcileCreate:
klog.Infof("created rolebinding.%s/%s in %v", rbac.GroupName, roleBinding.Name, namespace) klog.V(2).Infof("created rolebinding.%s/%s in %v", rbac.GroupName, roleBinding.Name, namespace)
case result.Operation == reconciliation.ReconcileRecreate: case result.Operation == reconciliation.ReconcileRecreate:
klog.Infof("recreated rolebinding.%s/%s in %v", rbac.GroupName, roleBinding.Name, namespace) klog.V(2).Infof("recreated rolebinding.%s/%s in %v", rbac.GroupName, roleBinding.Name, namespace)
} }
return nil return nil
}) })

8
test/integration/etcd/server.go
View File

@ -139,13 +139,19 @@ func StartRealMasterOrDie(t *testing.T, configFuncs ...func(*options.ServerRunOp
}() }()
lastHealth := "" lastHealth := ""
attempt := 0
if err := wait.PollImmediate(time.Second, time.Minute, func() (done bool, err error) { if err := wait.PollImmediate(time.Second, time.Minute, func() (done bool, err error) {
// wait for the server to be healthy // wait for the server to be healthy
result := kubeClient.RESTClient().Get().AbsPath("/healthz").Do() result := kubeClient.RESTClient().Get().AbsPath("/healthz").Do()
content, _ := result.Raw() content, _ := result.Raw()
lastHealth = string(content) lastHealth = string(content)
if errResult := result.Error(); errResult != nil { if errResult := result.Error(); errResult != nil {
t.Log(errResult) attempt++
if attempt < 10 {
t.Log("waiting for server to be healthy")
} else {
t.Log(errResult)
}
return false, nil return false, nil
} }
var status int var status int

2
test/integration/framework/BUILD
View File

@ -78,8 +78,10 @@ go_library(
"//staging/src/k8s.io/client-go/util/cert:go_default_library", "//staging/src/k8s.io/client-go/util/cert:go_default_library",
"//test/e2e/framework:go_default_library", "//test/e2e/framework:go_default_library",
"//test/utils:go_default_library", "//test/utils:go_default_library",
"//vendor/github.com/coreos/etcd/clientv3:go_default_library",
"//vendor/github.com/go-openapi/spec:go_default_library", "//vendor/github.com/go-openapi/spec:go_default_library",
"//vendor/github.com/pborman/uuid:go_default_library", "//vendor/github.com/pborman/uuid:go_default_library",
"//vendor/google.golang.org/grpc/grpclog:go_default_library",
"//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/kube-openapi/pkg/common:go_default_library", "//vendor/k8s.io/kube-openapi/pkg/common:go_default_library",
], ],

8
test/integration/framework/etcd.go
View File

@ -27,6 +27,8 @@ import (
"runtime" "runtime"
"strings" "strings"
"github.com/coreos/etcd/clientv3"
"google.golang.org/grpc/grpclog"
"k8s.io/klog" "k8s.io/klog"
"k8s.io/kubernetes/pkg/util/env" "k8s.io/kubernetes/pkg/util/env"
@ -109,7 +111,7 @@ func startEtcd() (func(), error) {
"--listen-peer-urls", "--listen-peer-urls",
"http://127.0.0.1:0", "http://127.0.0.1:0",
"--log-package-levels", "--log-package-levels",
"*=DEBUG", "*=NOTICE", // set to INFO or DEBUG for more logs
) )
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
@ -123,6 +125,10 @@ func startEtcd() (func(), error) {
} }
} }
// Quiet etcd logs for integration tests
// Comment out to get verbose logs if desired
clientv3.SetLogger(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, os.Stderr))
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
return nil, fmt.Errorf("failed to run etcd: %v", err) return nil, fmt.Errorf("failed to run etcd: %v", err)
} }