Upstream commits to Origin from Kubernetes up to v1.1.1 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

smarterclayton wants to merge 162 commits into openshift:stable from smarterclayton:move_v1beta3_to_origin

api/swagger-spec/v1.json

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -12708,7 +12708,7 @@
  
         },

         "securityContext": {

          "$ref": "v1.PodSecurityContext",

          "description": "SecurityContext holds pod-level security attributes and common container settings"

          "description": "SecurityContext holds pod-level security attributes and common container settings. Optional: Defaults to empty.  See type description for default values of each field."

         },

         "imagePullSecrets": {

          "type": "array",

    @@ -12986,7 +12986,11 @@
  
         },

         "stdin": {

          "type": "boolean",

          "description": "Whether this container should allocate a buffer for stdin in the container runtime. Default is false."

          "description": "Whether this container should allocate a buffer for stdin in the container runtime. If this is not set, reads from stdin in the container will always result in EOF. Default is false."

         },

         "stdinOnce": {

          "type": "boolean",

          "description": "Whether the container runtime should close the stdin channel after it has been opened by a single attach. When stdin is true the stdin stream will remain open across multiple attach sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the first client attaches to stdin, and then remains open and accepts data until the client disconnects, at which time stdin is closed and remains closed until the container is restarted. If this flag is false, a container processes that reads from stdin will never receive an EOF. Default is false"

         },

         "tty": {

          "type": "boolean",

    @@ -13194,28 +13198,28 @@
  
       },

       "v1.SecurityContext": {

        "id": "v1.SecurityContext",

        "description": "SecurityContext holds security configuration that will be applied to a container.",

        "description": "SecurityContext holds security configuration that will be applied to a container. Some fields are present in both SecurityContext and PodSecurityContext.  When both are set, the values in SecurityContext take precedence.",

        "properties": {

         "capabilities": {

          "$ref": "v1.Capabilities",

          "description": "The linux kernel capabilites that should be added or removed. Default to Container.Capabilities if left unset. More info: http://releases.k8s.io/HEAD/docs/design/security_context.md#security-context"

          "description": "The capabilities to add/drop when running containers. Defaults to the default set of capabilities granted by the container runtime."

         },

         "privileged": {

          "type": "boolean",

          "description": "Run the container in privileged mode. Default to Container.Privileged if left unset. More info: http://releases.k8s.io/HEAD/docs/design/security_context.md#security-context"

          "description": "Run container in privileged mode. Processes in privileged containers are essentially equivalent to root on the host. Defaults to false."

         },

         "seLinuxOptions": {

          "$ref": "v1.SELinuxOptions",

          "description": "SELinuxOptions are the labels to be applied to the container and volumes. Options that control the SELinux labels applied. More info: http://releases.k8s.io/HEAD/docs/design/security_context.md#security-context"

          "description": "The SELinux context to be applied to the container. If unspecified, the container runtime will allocate a random SELinux context for each container.  May also be set in PodSecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence."

         },

         "runAsUser": {

          "type": "integer",

          "format": "int64",

          "description": "RunAsUser is the UID to run the entrypoint of the container process. The user id that runs the first process in the container. More info: http://releases.k8s.io/HEAD/docs/design/security_context.md#security-context"

          "description": "The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in PodSecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence."

         },

         "runAsNonRoot": {

          "type": "boolean",

          "description": "RunAsNonRoot indicates that the container should be run as a non-root user. If the RunAsUser field is not explicitly set then the kubelet may check the image for a specified user or perform defaulting to specify a user."

          "description": "Indicates that the container must run as a non-root user. If true, the Kubelet will validate the image at runtime to ensure that it does not run as UID 0 (root) and fail to start the container if it does. If unset or false, no such validation will be performed. May also be set in PodSecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence."

         }

        }

       },

    @@ -13249,25 +13253,55 @@
  
        "properties": {

         "user": {

          "type": "string",

          "description": "User is a SELinux user label that applies to the container. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md"

          "description": "User is a SELinux user label that applies to the container."

         },

         "role": {

          "type": "string",

          "description": "Role is a SELinux role label that applies to the container. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md"

          "description": "Role is a SELinux role label that applies to the container."

         },

         "type": {

          "type": "string",

          "description": "Type is a SELinux type label that applies to the container. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md"

          "description": "Type is a SELinux type label that applies to the container."

         },

         "level": {

          "type": "string",

          "description": "Level is SELinux level label that applies to the container. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md"

          "description": "Level is SELinux level label that applies to the container."

         }

        }

       },

       "v1.PodSecurityContext": {

        "id": "v1.PodSecurityContext",

        "description": "PodSecurityContext holds pod-level security attributes and common container settings.",

        "description": "PodSecurityContext holds pod-level security attributes and common container settings. Some fields are also present in container.securityContext.  Field values of container.securityContext take precedence over field values of PodSecurityContext.",

        "properties": {

         "seLinuxOptions": {

          "$ref": "v1.SELinuxOptions",

          "description": "The SELinux context to be applied to all containers. If unspecified, the container runtime will allocate a random SELinux context for each container.  May also be set in SecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence for that container."

         },

         "runAsUser": {

          "type": "integer",

          "format": "int64",

          "description": "The UID to run the entrypoint of the container process. Defaults to user specified in image metadata if unspecified. May also be set in SecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence for that container."

         },

         "runAsNonRoot": {

          "type": "boolean",

          "description": "Indicates that the container must run as a non-root user. If true, the Kubelet will validate the image at runtime to ensure that it does not run as UID 0 (root) and fail to start the container if it does. If unset or false, no such validation will be performed. May also be set in SecurityContext.  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence."

         },

         "supplementalGroups": {

          "type": "array",

          "items": {

           "$ref": "integer"

          },

          "description": "A list of groups applied to the first process run in each container, in addition to the container's primary GID.  If unspecified, no groups will be added to any container."

         },

         "fsGroup": {

          "type": "integer",

          "format": "int64",

          "description": "A special supplemental group that applies to all containers in a pod. Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod:\n\n1. The owning GID will be the FSGroup 2. The setgid bit is set (new files created in the volume will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw "

         }

        }

       },

       "integer": {

        "id": "integer",

        "properties": {}

       },

       "v1.PodStatus": {

cmd/kube-controller-manager/app/controllermanager.go

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -116,7 +116,7 @@ func NewCMServer() *CMServer {
  
    		NodeSyncPeriod:                    10 * time.Second,

    		ResourceQuotaSyncPeriod:           10 * time.Second,

    		NamespaceSyncPeriod:               5 * time.Minute,

    		PVClaimBinderSyncPeriod:           10 * time.Second,

    		PVClaimBinderSyncPeriod:           10 * time.Minute,

    		HorizontalPodAutoscalerSyncPeriod: 30 * time.Second,

    		DeploymentControllerSyncPeriod:    30 * time.Second,

    		MinResyncPeriod:                   12 * time.Hour,

    @@ -129,6 +129,7 @@ func NewCMServer() *CMServer {
  
    			PersistentVolumeRecyclerIncrementTimeoutNFS:      30,

    			PersistentVolumeRecyclerMinimumTimeoutHostPath:   60,

    			PersistentVolumeRecyclerIncrementTimeoutHostPath: 30,

    			EnableHostPathProvisioning:                       false,

    		},

    		KubeApiQps:   20.0,

    		KubeApiBurst: 30,

    @@ -147,6 +148,7 @@ type VolumeConfigFlags struct {
  
    	PersistentVolumeRecyclerPodTemplateFilePathHostPath string

    	PersistentVolumeRecyclerMinimumTimeoutHostPath      int

    	PersistentVolumeRecyclerIncrementTimeoutHostPath    int

    	EnableHostPathProvisioning                          bool

    }

    // AddFlags adds flags for a specific CMServer to the specified FlagSet

    @@ -171,6 +173,7 @@ func (s *CMServer) AddFlags(fs *pflag.FlagSet) {
  
    	fs.StringVar(&s.VolumeConfigFlags.PersistentVolumeRecyclerPodTemplateFilePathHostPath, "pv-recycler-pod-template-filepath-hostpath", s.VolumeConfigFlags.PersistentVolumeRecyclerPodTemplateFilePathHostPath, "The file path to a pod definition used as a template for HostPath persistent volume recycling. This is for development and testing only and will not work in a multi-node cluster.")

    	fs.IntVar(&s.VolumeConfigFlags.PersistentVolumeRecyclerMinimumTimeoutHostPath, "pv-recycler-minimum-timeout-hostpath", s.VolumeConfigFlags.PersistentVolumeRecyclerMinimumTimeoutHostPath, "The minimum ActiveDeadlineSeconds to use for a HostPath Recycler pod.  This is for development and testing only and will not work in a multi-node cluster.")

    	fs.IntVar(&s.VolumeConfigFlags.PersistentVolumeRecyclerIncrementTimeoutHostPath, "pv-recycler-timeout-increment-hostpath", s.VolumeConfigFlags.PersistentVolumeRecyclerIncrementTimeoutHostPath, "the increment of time added per Gi to ActiveDeadlineSeconds for a HostPath scrubber pod.  This is for development and testing only and will not work in a multi-node cluster.")

    	fs.BoolVar(&s.VolumeConfigFlags.EnableHostPathProvisioning, "enable-hostpath-provisioner", s.VolumeConfigFlags.EnableHostPathProvisioning, "Enable HostPath PV provisioning when running without a cloud provider. This allows testing and development of provisioning features.  HostPath provisioning is not supported in any way, won't work in a multi-node cluster, and should not be used for anything other than testing or development.")

    	fs.IntVar(&s.TerminatedPodGCThreshold, "terminated-pod-gc-threshold", s.TerminatedPodGCThreshold, "Number of terminated pods that can exist before the terminated pod garbage collector starts deleting terminated pods. If <= 0, the terminated pod garbage collector is disabled.")

    	fs.DurationVar(&s.HorizontalPodAutoscalerSyncPeriod, "horizontal-pod-autoscaler-sync-period", s.HorizontalPodAutoscalerSyncPeriod, "The period for syncing the number of pods in horizontal pod autoscaler.")

    	fs.DurationVar(&s.DeploymentControllerSyncPeriod, "deployment-controller-sync-period", s.DeploymentControllerSyncPeriod, "Period for syncing the deployments.")

    @@ -201,7 +204,7 @@ func (s *CMServer) AddFlags(fs *pflag.FlagSet) {
  
    	fs.IntVar(&s.KubeApiBurst, "kube-api-burst", s.KubeApiBurst, "Burst to use while talking with kubernetes apiserver")

    }

    func (s *CMServer) resyncPeriod() time.Duration {

    func (s *CMServer) ResyncPeriod() time.Duration {

    	factor := rand.Float64() + 1

    	return time.Duration(float64(s.MinResyncPeriod.Nanoseconds()) * factor)

    }

    @@ -247,14 +250,14 @@ func (s *CMServer) Run(_ []string) error {
  
    		glog.Fatal(server.ListenAndServe())

    	}()

    	go endpointcontroller.NewEndpointController(kubeClient, s.resyncPeriod).

    	go endpointcontroller.NewEndpointController(kubeClient, s.ResyncPeriod).

    		Run(s.ConcurrentEndpointSyncs, util.NeverStop)

    	go replicationcontroller.NewReplicationManager(kubeClient, s.resyncPeriod, replicationcontroller.BurstReplicas).

    	go replicationcontroller.NewReplicationManager(kubeClient, s.ResyncPeriod, replicationcontroller.BurstReplicas).

    		Run(s.ConcurrentRCSyncs, util.NeverStop)

    	if s.TerminatedPodGCThreshold > 0 {

    		go gc.New(kubeClient, s.resyncPeriod, s.TerminatedPodGCThreshold).

    		go gc.New(kubeClient, s.ResyncPeriod, s.TerminatedPodGCThreshold).

    			Run(util.NeverStop)

    	}

    @@ -290,28 +293,42 @@ func (s *CMServer) Run(_ []string) error {
  
    	namespacecontroller.NewNamespaceController(kubeClient, s.EnableExperimental, s.NamespaceSyncPeriod).Run()

    	if s.EnableExperimental {

    		go daemon.NewDaemonSetsController(kubeClient, s.resyncPeriod).

    		go daemon.NewDaemonSetsController(kubeClient, s.ResyncPeriod).

    			Run(s.ConcurrentDSCSyncs, util.NeverStop)

    		go job.NewJobController(kubeClient, s.resyncPeriod).

    		go job.NewJobController(kubeClient, s.ResyncPeriod).

    			Run(s.ConcurrentJobSyncs, util.NeverStop)

    		podautoscaler.NewHorizontalController(kubeClient, metrics.NewHeapsterMetricsClient(kubeClient)).

    		podautoscaler.NewHorizontalController(kubeClient, kubeClient, kubeClient, metrics.NewHeapsterMetricsClient(kubeClient, "kube-system", "http", "heapster", "")).

    			Run(s.HorizontalPodAutoscalerSyncPeriod)

    		deployment.New(kubeClient).

    			Run(s.DeploymentControllerSyncPeriod)

    	}

    	volumePlugins := ProbeRecyclableVolumePlugins(s.VolumeConfigFlags)

    	provisioner, err := NewVolumeProvisioner(cloud, s.VolumeConfigFlags)

    	if err != nil {

    		glog.Fatal("A Provisioner could not be created, but one was expected. Provisioning will not work. This functionality is considered an early Alpha version.")

    	}

    	pvclaimBinder := persistentvolumecontroller.NewPersistentVolumeClaimBinder(kubeClient, s.PVClaimBinderSyncPeriod)

    	pvclaimBinder.Run()

    	pvRecycler, err := persistentvolumecontroller.NewPersistentVolumeRecycler(kubeClient, s.PVClaimBinderSyncPeriod, ProbeRecyclableVolumePlugins(s.VolumeConfigFlags))

    	pvRecycler, err := persistentvolumecontroller.NewPersistentVolumeRecycler(kubeClient, s.PVClaimBinderSyncPeriod, ProbeRecyclableVolumePlugins(s.VolumeConfigFlags), cloud)

    	if err != nil {

    		glog.Fatalf("Failed to start persistent volume recycler: %+v", err)

    	}

    	pvRecycler.Run()

    	if provisioner != nil {

    		pvController, err := persistentvolumecontroller.NewPersistentVolumeProvisionerController(persistentvolumecontroller.NewControllerClient(kubeClient), s.PVClaimBinderSyncPeriod, volumePlugins, provisioner, cloud)

    		if err != nil {

    			glog.Fatalf("Failed to start persistent volume provisioner controller: %+v", err)

    		}

    		pvController.Run()

    	}

    	var rootCA []byte

    	if s.RootCAFile != "" {

cmd/kube-controller-manager/app/plugins.go

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -21,12 +21,21 @@ import (
  
    	// This should probably be part of some configuration fed into the build for a

    	// given binary target.

    	"fmt"

    	//Cloud providers

    	_ "k8s.io/kubernetes/pkg/cloudprovider/providers"

    	// Volume plugins

    	"k8s.io/kubernetes/pkg/cloudprovider"

    	"k8s.io/kubernetes/pkg/cloudprovider/providers/aws"

    	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"

    	"k8s.io/kubernetes/pkg/cloudprovider/providers/openstack"

    	"k8s.io/kubernetes/pkg/util/io"

    	"k8s.io/kubernetes/pkg/volume"

    	"k8s.io/kubernetes/pkg/volume/aws_ebs"

    	"k8s.io/kubernetes/pkg/volume/cinder"

    	"k8s.io/kubernetes/pkg/volume/gce_pd"

    	"k8s.io/kubernetes/pkg/volume/host_path"

    	"k8s.io/kubernetes/pkg/volume/nfs"

    @@ -51,7 +60,7 @@ func ProbeRecyclableVolumePlugins(flags VolumeConfigFlags) []volume.VolumePlugin
  
    		RecyclerTimeoutIncrement: flags.PersistentVolumeRecyclerIncrementTimeoutHostPath,

    		RecyclerPodTemplate:      volume.NewPersistentVolumeRecyclerPodTemplate(),

    	}

    	if err := attemptToLoadRecycler(flags.PersistentVolumeRecyclerPodTemplateFilePathHostPath, &hostPathConfig); err != nil {

    	if err := AttemptToLoadRecycler(flags.PersistentVolumeRecyclerPodTemplateFilePathHostPath, &hostPathConfig); err != nil {

    		glog.Fatalf("Could not create hostpath recycler pod from file %s: %+v", flags.PersistentVolumeRecyclerPodTemplateFilePathHostPath, err)

    	}

    	allPlugins = append(allPlugins, host_path.ProbeVolumePlugins(hostPathConfig)...)

    @@ -61,18 +70,49 @@ func ProbeRecyclableVolumePlugins(flags VolumeConfigFlags) []volume.VolumePlugin
  
    		RecyclerTimeoutIncrement: flags.PersistentVolumeRecyclerIncrementTimeoutNFS,

    		RecyclerPodTemplate:      volume.NewPersistentVolumeRecyclerPodTemplate(),

    	}

    	if err := attemptToLoadRecycler(flags.PersistentVolumeRecyclerPodTemplateFilePathNFS, &nfsConfig); err != nil {

    	if err := AttemptToLoadRecycler(flags.PersistentVolumeRecyclerPodTemplateFilePathNFS, &nfsConfig); err != nil {

    		glog.Fatalf("Could not create NFS recycler pod from file %s: %+v", flags.PersistentVolumeRecyclerPodTemplateFilePathNFS, err)

    	}

    	allPlugins = append(allPlugins, nfs.ProbeVolumePlugins(nfsConfig)...)

    	allPlugins = append(allPlugins, aws_ebs.ProbeVolumePlugins()...)

    	allPlugins = append(allPlugins, gce_pd.ProbeVolumePlugins()...)

    	allPlugins = append(allPlugins, cinder.ProbeVolumePlugins()...)

    	return allPlugins

    }

    // attemptToLoadRecycler tries decoding a pod from a filepath for use as a recycler for a volume.

    // NewVolumeProvisioner returns a volume provisioner to use when running in a cloud or development environment.

    // The beta implementation of provisioning allows 1 implied provisioner per cloud, until we allow configuration of many.

    // We explicitly map clouds to volume plugins here which allows us to configure many later without backwards compatibility issues.

    // Not all cloudproviders have provisioning capability, which is the reason for the bool in the return to tell the caller to expect one or not.

    func NewVolumeProvisioner(cloud cloudprovider.Interface, flags VolumeConfigFlags) (volume.ProvisionableVolumePlugin, error) {

    	switch {

    	case cloud == nil && flags.EnableHostPathProvisioning:

    		return getProvisionablePluginFromVolumePlugins(host_path.ProbeVolumePlugins(volume.VolumeConfig{}))

    	case cloud != nil && aws_cloud.ProviderName == cloud.ProviderName():

    		return getProvisionablePluginFromVolumePlugins(aws_ebs.ProbeVolumePlugins())

    	case cloud != nil && gce_cloud.ProviderName == cloud.ProviderName():

    		return getProvisionablePluginFromVolumePlugins(gce_pd.ProbeVolumePlugins())

    	case cloud != nil && openstack.ProviderName == cloud.ProviderName():

    		return getProvisionablePluginFromVolumePlugins(cinder.ProbeVolumePlugins())

    	}

    	return nil, nil

    }

    func getProvisionablePluginFromVolumePlugins(plugins []volume.VolumePlugin) (volume.ProvisionableVolumePlugin, error) {

    	for _, plugin := range plugins {

    		if provisonablePlugin, ok := plugin.(volume.ProvisionableVolumePlugin); ok {

    			return provisonablePlugin, nil

    		}

    	}

    	return nil, fmt.Errorf("ProvisionablePlugin expected but not found in %#v: ", plugins)

    }

    // AttemptToLoadRecycler tries decoding a pod from a filepath for use as a recycler for a volume.

    // If successful, this method will set the recycler on the config.

    // If unsucessful, an error is returned.

    func attemptToLoadRecycler(path string, config *volume.VolumeConfig) error {

    // If unsuccessful, an error is returned. Function is exported for reuse downstream.

    func AttemptToLoadRecycler(path string, config *volume.VolumeConfig) error {

    	if path != "" {

    		recyclerPod, err := io.LoadPodFromFile(path)

    		if err != nil {

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upstream commits to Origin from Kubernetes up to v1.1.1 #1

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!