support optional envvars for pod-infra-container

2016-02-05 15:47:06 +00:00
parent c78f3a68fd
commit 1aec798aa0
4 changed files with 31 additions and 1 deletions
--- a/cmd/kubelet/app/server.go
+++ b/cmd/kubelet/app/server.go
@@ -733,6 +733,7 @@ type KubeletConfig struct {

 	ExperimentalFlannelOverlay bool
 	NodeIP                     net.IP
+	ContainerRuntimeOptions    []kubecontainer.Option
 }

 func CreateAndInitKubelet(kc *KubeletConfig) (k KubeletBootstrap, pc *config.PodConfig, err error) {
@@ -820,6 +821,7 @@ func CreateAndInitKubelet(kc *KubeletConfig) (k KubeletBootstrap, pc *config.Pod
 		kc.Reservation,
 		kc.EnableCustomMetrics,
 		kc.VolumeStatsAggPeriod,
+		kc.ContainerRuntimeOptions,
 	)

 	if err != nil {