Commit ec29021f authored by moelsayed's avatar moelsayed
Browse files

vendor update

parent d42ead8e
Showing with 12 additions and 1 deletion
+12 -1
......@@ -25,4 +25,4 @@ github.com/ugorji/go/codec ccfe18359b55b97855cee1d3f74e5efbda4869d
github.com/Microsoft/go-winio ab35fc04b6365e8fcb18e6e9e41ea4a02b10b175
github.com/rancher/norman ff60298f31f081b06d198815b4c178a578664f7d
github.com/rancher/types 9f5225fa37e5cfe5e0e3321fa66514b4538412e4
github.com/rancher/types 6e722de69b9aac5396dc410497890c0fabe5f558
......@@ -35,6 +35,8 @@ type RancherKubernetesEngineConfig struct {
CloudProvider CloudProvider `yaml:"cloud_provider" json:"cloudProvider,omitempty"`
// kubernetes directory path
PrefixPath string `yaml:"prefix_path" json:"prefixPath,omitempty"`
// Number of status check retries for addon deployment jobs
AddonJobRetries int `yaml:"addon_job_retries" json:"addonJobRetries,omitempty" norman:"default=5"`
}
type PrivateRegistry struct {
......@@ -291,6 +293,8 @@ type Process struct {
Privileged bool `json:"privileged,omitempty"`
// Process healthcheck
HealthCheck HealthCheck `json:"healthCheck,omitempty"`
// Process docker container Labels
Labels map[string]string `json:"labels,omitempty"`
}
type HealthCheck struct {
......
......@@ -5185,6 +5185,13 @@ func (in *Process) DeepCopyInto(out *Process) {
copy(*out, *in)
}
out.HealthCheck = in.HealthCheck
if in.Labels != nil {
in, out := &in.Labels, &out.Labels
*out = make(map[string]string, len(*in))
for key, val := range *in {
(*out)[key] = val
}
}
return
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment