263b0b99d0
This commit contains change to pick the latest cni config from the configured CNIConfDir. With this change any changes made to the cni config file will be picked up on the kubelet's runtime status check call. Ofcourse this would lead to undefined behavior when the cni config change is made in parallel during pod creation. However its reasonable to assume that the operator is aware of the need to drain the nodes of pods before making cni configuration change. The behavior is currently not defined in kubernetes. However I see that similar approach being adopted in the upstream kubernetes with dockershim. Keeping the behavior consistent for now. Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
78 lines
2.3 KiB
Go
78 lines
2.3 KiB
Go
/*
|
|
Copyright 2017 The Kubernetes Authors.
|
|
|
|
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 server
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
goruntime "runtime"
|
|
|
|
cni "github.com/containerd/go-cni"
|
|
"github.com/sirupsen/logrus"
|
|
"golang.org/x/net/context"
|
|
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
|
|
)
|
|
|
|
// networkNotReadyReason is the reason reported when network is not ready.
|
|
const networkNotReadyReason = "NetworkPluginNotReady"
|
|
|
|
// Status returns the status of the runtime.
|
|
func (c *criService) Status(ctx context.Context, r *runtime.StatusRequest) (*runtime.StatusResponse, error) {
|
|
// As a containerd plugin, if CRI plugin is serving request,
|
|
// containerd must be ready.
|
|
runtimeCondition := &runtime.RuntimeCondition{
|
|
Type: runtime.RuntimeReady,
|
|
Status: true,
|
|
}
|
|
networkCondition := &runtime.RuntimeCondition{
|
|
Type: runtime.NetworkReady,
|
|
Status: true,
|
|
}
|
|
|
|
// Load the latest cni configuration to be in sync with the latest network configuration
|
|
if err := c.netPlugin.Load(cni.WithLoNetwork, cni.WithDefaultConf); err != nil {
|
|
logrus.WithError(err).Errorf("Failed to load cni configuration")
|
|
}
|
|
// Check the status of the cni initialization
|
|
if err := c.netPlugin.Status(); err != nil {
|
|
networkCondition.Status = false
|
|
networkCondition.Reason = networkNotReadyReason
|
|
networkCondition.Message = fmt.Sprintf("Network plugin returns error: %v", err)
|
|
}
|
|
|
|
resp := &runtime.StatusResponse{
|
|
Status: &runtime.RuntimeStatus{Conditions: []*runtime.RuntimeCondition{
|
|
runtimeCondition,
|
|
networkCondition,
|
|
}},
|
|
}
|
|
if r.Verbose {
|
|
configByt, err := json.Marshal(c.config)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
resp.Info = make(map[string]string)
|
|
resp.Info["config"] = string(configByt)
|
|
versionByt, err := json.Marshal(goruntime.Version())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
resp.Info["golang"] = string(versionByt)
|
|
}
|
|
return resp, nil
|
|
}
|