bump kubernetes to v1.14.0

bump required:
- replacing vendor ghodss/yaml with sigs.k8s.io/yaml
- adding vendor k8s.io/klog and github.com/evanphx
- compose-on-kubernetes
removed 'IncludeUninitialized' from watch as it have been removed from k8s

Signed-off-by: Nick Adcock <nick.adcock@docker.com>

vendor/github.com/docker/compose-on-kubernetes/README.md

@@ -186,4 +186,5 @@ See the [contributing](./CONTRIBUTING.md) and [debugging](./DEBUGGING.md) guides
 
 - Guide for [Azure AKS](./docs/install-on-aks.md).
 - Guide for [GKE](./docs/install-on-gke.md).
+- Guide for [Microk8s](./docs/install-on-microk8s.md).
 - Guide for [Minikube](./docs/install-on-minikube.md).

vendor/github.com/docker/compose-on-kubernetes/api/client/informers/compose/v1alpha3/stack.go

@@ -49,3 +49,26 @@ func (f *stackInformer) Informer() cache.SharedIndexInformer {
 func (f *stackInformer) Lister() v1alpha3.StackLister {
 	return v1alpha3.NewStackLister(f.Informer().GetIndexer())
 }
+
+// NewFilteredStackInformer creates a stack informer with specific list options
+func NewFilteredStackInformer(client clientset.Interface, resyncPeriod time.Duration, tweakListOptions func(*v1.ListOptions)) cache.SharedIndexInformer {
+	return cache.NewSharedIndexInformer(
+		&cache.ListWatch{
+			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
+				if tweakListOptions != nil {
+					tweakListOptions(&options)
+				}
+				return client.ComposeV1alpha3().Stacks(v1.NamespaceAll).List(options)
+			},
+			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
+				if tweakListOptions != nil {
+					tweakListOptions(&options)
+				}
+				return client.ComposeV1alpha3().Stacks(v1.NamespaceAll).Watch(options)
+			},
+		},
+		&compose_v1alpha3.Stack{},
+		resyncPeriod,
+		cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc},
+	)
+}

vendor/github.com/docker/compose-on-kubernetes/api/compose/v1alpha3/conversion_custom.go

@@ -0,0 +1,12 @@
+package v1alpha3
+
+import (
+	"github.com/docker/compose-on-kubernetes/api/compose/v1beta2"
+	conversion "k8s.io/apimachinery/pkg/conversion"
+)
+
+// Convert_v1alpha3_ServiceConfig_To_v1beta2_ServiceConfig is a wrapper around an auto-generated conversion
+// nolint: golint
+func Convert_v1alpha3_ServiceConfig_To_v1beta2_ServiceConfig(in *ServiceConfig, out *v1beta2.ServiceConfig, s conversion.Scope) error {
+	return autoConvert_v1alpha3_ServiceConfig_To_v1beta2_ServiceConfig(in, out, s)
+}

vendor/github.com/docker/compose-on-kubernetes/api/compose/v1alpha3/deepcopy_generated.go

@@ -1,22 +1,6 @@
 // +build !ignore_autogenerated
 
-/*
-Copyright 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.
-*/
-
-// Code generated by C:\gohome\bin\deepcopy-gen.exe. DO NOT EDIT.
+// Code generated by deepcopy-gen. DO NOT EDIT.
 
 package v1alpha3
 
@@ -69,30 +53,18 @@ func (in *Constraints) DeepCopyInto(out *Constraints) {
 	*out = *in
 	if in.OperatingSystem != nil {
 		in, out := &in.OperatingSystem, &out.OperatingSystem
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(Constraint)
-			**out = **in
-		}
+		*out = new(Constraint)
+		**out = **in
 	}
 	if in.Architecture != nil {
 		in, out := &in.Architecture, &out.Architecture
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(Constraint)
-			**out = **in
-		}
+		*out = new(Constraint)
+		**out = **in
 	}
 	if in.Hostname != nil {
 		in, out := &in.Hostname, &out.Hostname
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(Constraint)
-			**out = **in
-		}
+		*out = new(Constraint)
+		**out = **in
 	}
 	if in.MatchLabels != nil {
 		in, out := &in.MatchLabels, &out.MatchLabels
@@ -119,12 +91,8 @@ func (in *DeployConfig) DeepCopyInto(out *DeployConfig) {
 	*out = *in
 	if in.Replicas != nil {
 		in, out := &in.Replicas, &out.Replicas
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(uint64)
-			**out = **in
-		}
+		*out = new(uint64)
+		**out = **in
 	}
 	if in.Labels != nil {
 		in, out := &in.Labels, &out.Labels
@@ -135,22 +103,14 @@ func (in *DeployConfig) DeepCopyInto(out *DeployConfig) {
 	}
 	if in.UpdateConfig != nil {
 		in, out := &in.UpdateConfig, &out.UpdateConfig
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(UpdateConfig)
-			(*in).DeepCopyInto(*out)
-		}
+		*out = new(UpdateConfig)
+		(*in).DeepCopyInto(*out)
 	}
 	in.Resources.DeepCopyInto(&out.Resources)
 	if in.RestartPolicy != nil {
 		in, out := &in.RestartPolicy, &out.RestartPolicy
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(RestartPolicy)
-			**out = **in
-		}
+		*out = new(RestartPolicy)
+		**out = **in
 	}
 	in.Placement.DeepCopyInto(&out.Placement)
 	return
@@ -211,12 +171,8 @@ func (in *FileReferenceConfig) DeepCopyInto(out *FileReferenceConfig) {
 	*out = *in
 	if in.Mode != nil {
 		in, out := &in.Mode, &out.Mode
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(uint32)
-			**out = **in
-		}
+		*out = new(uint32)
+		**out = **in
 	}
 	return
 }
@@ -241,30 +197,18 @@ func (in *HealthCheckConfig) DeepCopyInto(out *HealthCheckConfig) {
 	}
 	if in.Timeout != nil {
 		in, out := &in.Timeout, &out.Timeout
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(time.Duration)
-			**out = **in
-		}
+		*out = new(time.Duration)
+		**out = **in
 	}
 	if in.Interval != nil {
 		in, out := &in.Interval, &out.Interval
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(time.Duration)
-			**out = **in
-		}
+		*out = new(time.Duration)
+		**out = **in
 	}
 	if in.Retries != nil {
 		in, out := &in.Retries, &out.Retries
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(uint64)
-			**out = **in
-		}
+		*out = new(uint64)
+		**out = **in
 	}
 	return
 }
@@ -279,17 +223,29 @@ func (in *HealthCheckConfig) DeepCopy() *HealthCheckConfig {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *InternalPort) DeepCopyInto(out *InternalPort) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InternalPort.
+func (in *InternalPort) DeepCopy() *InternalPort {
+	if in == nil {
+		return nil
+	}
+	out := new(InternalPort)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Placement) DeepCopyInto(out *Placement) {
 	*out = *in
 	if in.Constraints != nil {
 		in, out := &in.Constraints, &out.Constraints
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(Constraints)
-			(*in).DeepCopyInto(*out)
-		}
+		*out = new(Constraints)
+		(*in).DeepCopyInto(*out)
 	}
 	return
 }
@@ -325,21 +281,13 @@ func (in *Resources) DeepCopyInto(out *Resources) {
 	*out = *in
 	if in.Limits != nil {
 		in, out := &in.Limits, &out.Limits
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(Resource)
-			**out = **in
-		}
+		*out = new(Resource)
+		**out = **in
 	}
 	if in.Reservations != nil {
 		in, out := &in.Reservations, &out.Reservations
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(Resource)
-			**out = **in
-		}
+		*out = new(Resource)
+		**out = **in
 	}
 	return
 }
@@ -429,12 +377,15 @@ func (in *ServiceConfig) DeepCopyInto(out *ServiceConfig) {
 		in, out := &in.Environment, &out.Environment
 		*out = make(map[string]*string, len(*in))
 		for key, val := range *in {
+			var outVal *string
 			if val == nil {
 				(*out)[key] = nil
 			} else {
-				outVal := *val
-				(*out)[key] = &outVal
+				in, out := &val, &outVal
+				*out = new(string)
+				**out = **in
 			}
+			(*out)[key] = outVal
 		}
 	}
 	if in.ExtraHosts != nil {
@@ -444,12 +395,8 @@ func (in *ServiceConfig) DeepCopyInto(out *ServiceConfig) {
 	}
 	if in.HealthCheck != nil {
 		in, out := &in.HealthCheck, &out.HealthCheck
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(HealthCheckConfig)
-			(*in).DeepCopyInto(*out)
-		}
+		*out = new(HealthCheckConfig)
+		(*in).DeepCopyInto(*out)
 	}
 	if in.Labels != nil {
 		in, out := &in.Labels, &out.Labels
@@ -472,12 +419,8 @@ func (in *ServiceConfig) DeepCopyInto(out *ServiceConfig) {
 	}
 	if in.StopGracePeriod != nil {
 		in, out := &in.StopGracePeriod, &out.StopGracePeriod
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(time.Duration)
-			**out = **in
-		}
+		*out = new(time.Duration)
+		**out = **in
 	}
 	if in.Tmpfs != nil {
 		in, out := &in.Tmpfs, &out.Tmpfs
@@ -486,18 +429,19 @@ func (in *ServiceConfig) DeepCopyInto(out *ServiceConfig) {
 	}
 	if in.User != nil {
 		in, out := &in.User, &out.User
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(int64)
-			**out = **in
-		}
+		*out = new(int64)
+		**out = **in
 	}
 	if in.Volumes != nil {
 		in, out := &in.Volumes, &out.Volumes
 		*out = make([]ServiceVolumeConfig, len(*in))
 		copy(*out, *in)
 	}
+	if in.InternalPorts != nil {
+		in, out := &in.InternalPorts, &out.InternalPorts
+		*out = make([]InternalPort, len(*in))
+		copy(*out, *in)
+	}
 	return
 }
 
@@ -516,12 +460,8 @@ func (in *ServiceConfigObjConfig) DeepCopyInto(out *ServiceConfigObjConfig) {
 	*out = *in
 	if in.Mode != nil {
 		in, out := &in.Mode, &out.Mode
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(uint32)
-			**out = **in
-		}
+		*out = new(uint32)
+		**out = **in
 	}
 	return
 }
@@ -557,12 +497,8 @@ func (in *ServiceSecretConfig) DeepCopyInto(out *ServiceSecretConfig) {
 	*out = *in
 	if in.Mode != nil {
 		in, out := &in.Mode, &out.Mode
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(uint32)
-			**out = **in
-		}
+		*out = new(uint32)
+		**out = **in
 	}
 	return
 }
@@ -607,18 +543,14 @@ func (in *StackSpec) DeepCopyInto(out *StackSpec) {
 		in, out := &in.Secrets, &out.Secrets
 		*out = make(map[string]SecretConfig, len(*in))
 		for key, val := range *in {
-			newVal := new(SecretConfig)
-			val.DeepCopyInto(newVal)
-			(*out)[key] = *newVal
+			(*out)[key] = *val.DeepCopy()
 		}
 	}
 	if in.Configs != nil {
 		in, out := &in.Configs, &out.Configs
 		*out = make(map[string]ConfigObjConfig, len(*in))
 		for key, val := range *in {
-			newVal := new(ConfigObjConfig)
-			val.DeepCopyInto(newVal)
-			(*out)[key] = *newVal
+			(*out)[key] = *val.DeepCopy()
 		}
 	}
 	return
@@ -639,12 +571,8 @@ func (in *UpdateConfig) DeepCopyInto(out *UpdateConfig) {
 	*out = *in
 	if in.Parallelism != nil {
 		in, out := &in.Parallelism, &out.Parallelism
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(uint64)
-			**out = **in
-		}
+		*out = new(uint64)
+		**out = **in
 	}
 	return
 }

vendor/github.com/docker/compose-on-kubernetes/api/compose/v1alpha3/stack.go

@@ -3,6 +3,7 @@ package v1alpha3
 import (
 	"time"
 
+	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
@@ -72,35 +73,49 @@ type StackSpec struct {
 type ServiceConfig struct {
 	Name string `json:"name,omitempty"`
 
-	CapAdd          []string                 `json:"cap_add,omitempty"`
-	CapDrop         []string                 `json:"cap_drop,omitempty"`
-	Command         []string                 `json:"command,omitempty"`
-	Configs         []ServiceConfigObjConfig `json:"configs,omitempty"`
-	Deploy          DeployConfig             `json:"deploy,omitempty"`
-	Entrypoint      []string                 `json:"entrypoint,omitempty"`
-	Environment     map[string]*string       `json:"environment,omitempty"`
-	ExtraHosts      []string                 `json:"extra_hosts,omitempty"`
-	Hostname        string                   `json:"hostname,omitempty"`
-	HealthCheck     *HealthCheckConfig       `json:"health_check,omitempty"`
-	Image           string                   `json:"image,omitempty"`
-	Ipc             string                   `json:"ipc,omitempty"`
-	Labels          map[string]string        `json:"labels,omitempty"`
-	Pid             string                   `json:"pid,omitempty"`
-	Ports           []ServicePortConfig      `json:"ports,omitempty"`
-	Privileged      bool                     `json:"privileged,omitempty"`
-	ReadOnly        bool                     `json:"read_only,omitempty"`
-	Secrets         []ServiceSecretConfig    `json:"secrets,omitempty"`
-	StdinOpen       bool                     `json:"stdin_open,omitempty"`
-	StopGracePeriod *time.Duration           `json:"stop_grace_period,omitempty"`
-	Tmpfs           []string                 `json:"tmpfs,omitempty"`
-	Tty             bool                     `json:"tty,omitempty"`
-	User            *int64                   `json:"user,omitempty"`
-	Volumes         []ServiceVolumeConfig    `json:"volumes,omitempty"`
-	WorkingDir      string                   `json:"working_dir,omitempty"`
-	PullSecret      string                   `json:"pull_secret,omitempty"`
-	PullPolicy      string                   `json:"pull_policy,omitempty"`
+	CapAdd              []string                 `json:"cap_add,omitempty"`
+	CapDrop             []string                 `json:"cap_drop,omitempty"`
+	Command             []string                 `json:"command,omitempty"`
+	Configs             []ServiceConfigObjConfig `json:"configs,omitempty"`
+	Deploy              DeployConfig             `json:"deploy,omitempty"`
+	Entrypoint          []string                 `json:"entrypoint,omitempty"`
+	Environment         map[string]*string       `json:"environment,omitempty"`
+	ExtraHosts          []string                 `json:"extra_hosts,omitempty"`
+	Hostname            string                   `json:"hostname,omitempty"`
+	HealthCheck         *HealthCheckConfig       `json:"health_check,omitempty"`
+	Image               string                   `json:"image,omitempty"`
+	Ipc                 string                   `json:"ipc,omitempty"`
+	Labels              map[string]string        `json:"labels,omitempty"`
+	Pid                 string                   `json:"pid,omitempty"`
+	Ports               []ServicePortConfig      `json:"ports,omitempty"`
+	Privileged          bool                     `json:"privileged,omitempty"`
+	ReadOnly            bool                     `json:"read_only,omitempty"`
+	Secrets             []ServiceSecretConfig    `json:"secrets,omitempty"`
+	StdinOpen           bool                     `json:"stdin_open,omitempty"`
+	StopGracePeriod     *time.Duration           `json:"stop_grace_period,omitempty"`
+	Tmpfs               []string                 `json:"tmpfs,omitempty"`
+	Tty                 bool                     `json:"tty,omitempty"`
+	User                *int64                   `json:"user,omitempty"`
+	Volumes             []ServiceVolumeConfig    `json:"volumes,omitempty"`
+	WorkingDir          string                   `json:"working_dir,omitempty"`
+	PullSecret          string                   `json:"pull_secret,omitempty"`
+	PullPolicy          string                   `json:"pull_policy,omitempty"`
+	InternalPorts       []InternalPort           `json:"internal_ports,omitempty"`
+	InternalServiceType InternalServiceType      `json:"internal_service_type,omitempty"`
 }
 
+// InternalServiceType defines the strategy for defining the Service Type to use for inter-service networking
+type InternalServiceType string
+
+const (
+	// InternalServiceTypeAuto behavior is the same as InternalServiceTypeHeadless if InternalPorts is empty, InternalServiceTypeClusterIP otherwise
+	InternalServiceTypeAuto = InternalServiceType("")
+	// InternalServiceTypeHeadless always create a Headless service
+	InternalServiceTypeHeadless = InternalServiceType("Headless")
+	// InternalServiceTypeClusterIP always create a ClusterIP service
+	InternalServiceTypeClusterIP = InternalServiceType("ClusterIP")
+)
+
 // ServicePortConfig is the port configuration for a service
 // +k8s:deepcopy-gen=true
 type ServicePortConfig struct {
@@ -270,3 +285,11 @@ func (s *StackStatus) clone() *StackStatus {
 func (s *Stack) Clone() *Stack {
 	return s.clone()
 }
+
+// InternalPort describes a Port exposed internally to other services
+// in the stack
+// +k8s:deepcopy-gen=true
+type InternalPort struct {
+	Port     int32       `json:"port,omitempty"`
+	Protocol v1.Protocol `json:"protocol,omitempty"`
+}