@@ -111,6 +111,10 @@ func GetNodeFileReferences(config *NodeConfig) []*string {

 	refs = append(refs, &config.VolumeDirectory)

+	if config.PodManifestConfig != nil {

+		refs = append(refs, &config.PodManifestConfig.Path)

+	}

+

 	return refs

 }

@@ -36,6 +36,10 @@ type NodeConfig struct {

 	// AllowDisabledDocker if true, the Kubelet will ignore errors from Docker.  This means that a node can start on a machine that doesn't have docker started.

 	AllowDisabledDocker bool

+

+	// PodManifestConfig holds the configuration for enabling the Kubelet to

+	// create pods based from a manifest file(s) placed locally on the node

+	PodManifestConfig *PodManifestConfig

 }

 type MasterConfig struct {

@@ -382,3 +386,13 @@ type CertInfo struct {

 	// KeyFile is a file containing a PEM-encoded private key for the certificate specified by CertFile

 	KeyFile string

 }

+

+type PodManifestConfig struct {

+	// Path specifies the path for the pod manifest file or directory

+	// If its a directory, its expected to contain on or more manifest files

+	// This is used by the Kubelet to create pods on the node

+	Path string

+	// FileCheckIntervalSeconds is the interval in seconds for checking the manifest file(s) for new data

+	// The interval needs to be a positive value

+	FileCheckIntervalSeconds int64

+}

@@ -35,6 +35,10 @@ type NodeConfig struct {

 	// AllowDisabledDocker if true, the Kubelet will ignore errors from Docker.  This means that a node can start on a machine that doesn't have docker started.

 	AllowDisabledDocker bool `json:"allowDisabledDocker"`

+

+	// PodManifestConfig holds the configuration for enabling the Kubelet to

+	// create pods based from a manifest file(s) placed locally on the node

+	PodManifestConfig *PodManifestConfig `json:"podManifestConfig"`

 }

 type MasterConfig struct {

@@ -365,3 +369,13 @@ type CertInfo struct {

 	CertFile string `json:"certFile"`

 	KeyFile  string `json:"keyFile"`

 }

+

+type PodManifestConfig struct {

+	// Path specifies the path for the pod manifest file or directory

+	// If its a directory, its expected to contain on or more manifest files

+	// This is used by the Kubelet to create pods on the node

+	Path string `json:"path"`

+	// FileCheckIntervalSeconds is the interval in seconds for checking the manifest file(s) for new data

+	// The interval needs to be a positive value

+	FileCheckIntervalSeconds int64 `json:"fileCheckIntervalSeconds"`

+}

@@ -22,5 +22,9 @@ func ValidateNodeConfig(config *api.NodeConfig) fielderrors.ValidationErrorList

 	allErrs = append(allErrs, ValidateImageConfig(config.ImageConfig).Prefix("imageConfig")...)

+	if config.PodManifestConfig != nil {

+		allErrs = append(allErrs, ValidatePodManifestConfig(config.PodManifestConfig).Prefix("podManifestConfig")...)

+	}

+

 	return allErrs

 }

@@ -93,6 +93,18 @@ func ValidateRemoteConnectionInfo(remoteConnectionInfo api.RemoteConnectionInfo)

 	return allErrs

 }

+func ValidatePodManifestConfig(podManifestConfig *api.PodManifestConfig) fielderrors.ValidationErrorList {

+	allErrs := fielderrors.ValidationErrorList{}

+

+	// the Path can be a file or a directory

+	allErrs = append(allErrs, ValidateFile(podManifestConfig.Path, "path")...)

+	if podManifestConfig.FileCheckIntervalSeconds < 1 {

+		allErrs = append(allErrs, fielderrors.NewFieldInvalid("fileCheckIntervalSeconds", podManifestConfig.FileCheckIntervalSeconds, "interval has to be positive"))

+	}

+

+	return allErrs

+}

+

 func ValidateSpecifiedIP(ipString string, field string) fielderrors.ValidationErrorList {

 	allErrs := fielderrors.ValidationErrorList{}

@@ -126,7 +126,20 @@ func (c *NodeConfig) RunKubelet() {

 	recorder := record.NewBroadcaster().NewRecorder(kapi.EventSource{Component: "kubelet", Host: c.NodeHost})

 	cfg := kconfig.NewPodConfig(kconfig.PodConfigNotificationSnapshotAndUpdates, recorder)

-	kconfig.NewSourceApiserver(c.Client, c.NodeHost, cfg.Channel("api"))

+	kconfig.NewSourceApiserver(c.Client, c.NodeHost, cfg.Channel(kubelet.ApiserverSource))

+	// define manifest file source for pods, if specified

+	if len(c.PodManifestPath) > 0 {

+		_, err = os.Stat(c.PodManifestPath)

+		if err == nil {

+			glog.Infof("Adding pod manifest file/dir: %v", c.PodManifestPath)

+			kconfig.NewSourceFile(c.PodManifestPath, c.NodeHost,

+				time.Duration(c.PodManifestCheckIntervalSeconds)*time.Second,

+				cfg.Channel(kubelet.FileSource))

+		} else {

+			glog.Errorf("WARNING: PodManifestPath specified is not a valid file/directory: %v", err)

+		}

+	}

+

 	gcPolicy := kubelet.ContainerGCPolicy{

 		MinAge:             10 * time.Second,

 		MaxPerPodContainer: 5,

@@ -54,6 +54,14 @@ type NodeConfig struct {

 	Client *client.Client

 	// A client to connect to Docker

 	DockerClient dockertools.DockerInterface

+

+	// PodManifestPath specifies the path for the pod manifest file(s)

+	// The path could point to a single file or a directory that contains multiple manifest files

+	// This is used by the Kubelet to create pods on the node

+	PodManifestPath string

+	// PodManifestCheckIntervalSeconds is the interval in seconds for checking the manifest file(s) for new data

+	// The interval needs to be a positive value

+	PodManifestCheckIntervalSeconds int64

 }

 func BuildKubernetesNodeConfig(options configapi.NodeConfig) (*NodeConfig, error) {

@@ -83,6 +91,13 @@ func BuildKubernetesNodeConfig(options configapi.NodeConfig) (*NodeConfig, error

 	imageTemplate.Format = options.ImageConfig.Format

 	imageTemplate.Latest = options.ImageConfig.Latest

+	var path string

+	var fileCheckInterval int64

+	if options.PodManifestConfig != nil {

+		path = options.PodManifestConfig.Path

+		fileCheckInterval = options.PodManifestConfig.FileCheckIntervalSeconds

+	}

+

 	config := &NodeConfig{

 		NodeHost:    options.NodeName,

 		BindAddress: options.ServingInfo.BindAddress,

@@ -101,6 +116,9 @@ func BuildKubernetesNodeConfig(options configapi.NodeConfig) (*NodeConfig, error

 		ImageFor:            imageTemplate.ExpandOrDie,

 		AllowDisabledDocker: options.AllowDisabledDocker,

 		Client:              kubeClient,

+

+		PodManifestPath:                 path,

+		PodManifestCheckIntervalSeconds: fileCheckInterval,

 	}

 	return config, nil

@@ -114,6 +114,8 @@ func (args NodeArgs) BuildSerializeableNodeConfig() (*configapi.NodeConfig, erro

 		DNSIP:     dnsIP,

 		MasterKubeConfig: admin.DefaultNodeKubeConfigFile(args.CertArgs.CertDir, args.NodeName),

+

+		PodManifestConfig: nil,

 	}

 	if args.ListenArg.UseTLS() {