diff --git a/vendor.conf b/vendor.conf index 74d3f9db..b36ed42d 100644 --- a/vendor.conf +++ b/vendor.conf @@ -24,4 +24,4 @@ github.com/coreos/go-semver e214231b295a8ea9479f11b70b35d5acf3556d9 github.com/ugorji/go/codec ccfe18359b55b97855cee1d3f74e5efbda4869dc github.com/rancher/norman 151aa66e3e99de7e0d195e2d5ca96b1f95544555 -github.com/rancher/types 7baa43c5d1a5f9385a1e791f85151978553bf38d +github.com/rancher/types 2c8d9e23dd981e05d48fb1105c346480d1bc697e https://github.com/moelsayed/types diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/authz_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/authz_types.go index 7d072eff..ce25f1dc 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/authz_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/authz_types.go @@ -10,8 +10,9 @@ import ( ) var ( - NamespaceBackedResource condition.Cond = "BackingNamespaceCreated" - CreatorMadeOwner condition.Cond = "CreatorMadeOwner" + NamespaceBackedResource condition.Cond = "BackingNamespaceCreated" + CreatorMadeOwner condition.Cond = "CreatorMadeOwner" + DefaultNetworkPolicyCreated condition.Cond = "DefaultNetworkPolicyCreated" ) type Project struct { diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go index 554bebd5..f36e0a81 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go @@ -251,13 +251,15 @@ type RKEPlan struct { type RKEConfigNodePlan struct { // Node address Address string `json:"address,omitempty"` - // List of processes that should run on the node - Processes []Process `json:"processes,omitempty"` + // map of named processes that should run on the node + Processes map[string]Process `json:"processes,omitempty"` // List of portchecks that should be open on the node PortChecks []PortCheck `json:"portChecks,omitempty"` } type Process struct { + // Process name, this should be the container name + Name string `json:"name,omitempty"` // Process Entrypoint command Command []string `json:"command,omitempty"` // Process args diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go index f247ab70..5203bba1 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -4838,9 +4838,9 @@ func (in *RKEConfigNodePlan) DeepCopyInto(out *RKEConfigNodePlan) { *out = *in if in.Processes != nil { in, out := &in.Processes, &out.Processes - *out = make([]Process, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) + *out = make(map[string]Process, len(*in)) + for key, val := range *in { + (*out)[key] = *val.DeepCopy() } } if in.PortChecks != nil {