79ff06ffa1
This is a partial rollback of commit 6e6f465a36 ("Fix a crash for
kubelet when without EtcdClient") in which we used the `reflect` module
to inspect that the pointer stored inside the interface was `nil`, but
as pointed out by @lavalamp, the correct solution is to make the
function return the interface type, in which case a `return nil` will
return the interface nil and not a nil pointer that turns into a non-nil
value when coerced into an interface.
For more details, see http://golang.org/doc/faq#nil_error and the
discussion in PR #3356.
Tested by installing a kubelet built from head with this patch into a
containervm instance and confirming it did not crash on standalone.go.
Confirmed that by only removing the `reflect.IsNil()` comparison but not
changing the return type of `EtcdClientOrDie()` did indeed cause that
same crash, so changing the return type does indeed fix the issue.
Signed-off-by: Filipe Brandenburger <filbranden@google.com>
94 lines
2.9 KiB
Go
94 lines
2.9 KiB
Go
/*
|
|
Copyright 2014 Google Inc. All rights reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package kubelet
|
|
|
|
import (
|
|
"net/http"
|
|
"strconv"
|
|
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/capabilities"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/client/record"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/health"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
|
|
"github.com/coreos/go-etcd/etcd"
|
|
"github.com/golang/glog"
|
|
cadvisor "github.com/google/cadvisor/client"
|
|
)
|
|
|
|
// TODO: move this into the kubelet itself
|
|
func MonitorCAdvisor(k *Kubelet, cp uint) {
|
|
defer util.HandleCrash()
|
|
// TODO: Monitor this connection, reconnect if needed?
|
|
glog.V(1).Infof("Trying to create cadvisor client.")
|
|
cadvisorClient, err := cadvisor.NewClient("http://127.0.0.1:" + strconv.Itoa(int(cp)))
|
|
if err != nil {
|
|
glog.Errorf("Error on creating cadvisor client: %v", err)
|
|
return
|
|
}
|
|
glog.V(1).Infof("Successfully created cadvisor client.")
|
|
k.SetCadvisorClient(cadvisorClient)
|
|
}
|
|
|
|
// TODO: move this into the kubelet itself
|
|
func InitHealthChecking(k *Kubelet) {
|
|
// TODO: These should probably become more plugin-ish: register a factory func
|
|
// in each checker's init(), iterate those here.
|
|
health.AddHealthChecker(health.NewExecHealthChecker(k))
|
|
health.AddHealthChecker(health.NewHTTPHealthChecker(&http.Client{}))
|
|
health.AddHealthChecker(&health.TCPHealthChecker{})
|
|
}
|
|
|
|
// TODO: move this into a pkg/tools/etcd_tools
|
|
func EtcdClientOrDie(etcdServerList util.StringList, etcdConfigFile string) tools.EtcdClient {
|
|
if len(etcdServerList) > 0 {
|
|
return etcd.NewClient(etcdServerList)
|
|
} else if etcdConfigFile != "" {
|
|
etcdClient, err := etcd.NewClientFromFile(etcdConfigFile)
|
|
if err != nil {
|
|
glog.Fatalf("Error with etcd config file: %v", err)
|
|
}
|
|
return etcdClient
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// TODO: move this into pkg/capabilities
|
|
func SetupCapabilities(allowPrivileged bool) {
|
|
capabilities.Initialize(capabilities.Capabilities{
|
|
AllowPrivileged: allowPrivileged,
|
|
})
|
|
}
|
|
|
|
// TODO: Split this up?
|
|
func SetupLogging() {
|
|
etcd.SetLogger(util.NewLogger("etcd "))
|
|
// Log the events locally too.
|
|
record.StartLogging(glog.Infof)
|
|
}
|
|
|
|
func SetupEventSending(client *client.Client, hostname string) {
|
|
glog.Infof("Sending events to api server.")
|
|
record.StartRecording(client.Events(""),
|
|
api.EventSource{
|
|
Component: "kubelet",
|
|
Host: hostname,
|
|
})
|
|
}
|