From 94862fa2e2b5fb1df658a97b387c83e5c27ec1f1 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Fri, 8 Jun 2018 18:39:55 +0200 Subject: [PATCH] Vendor update --- vendor.conf | 2 +- .../rancher/types/apis/management.cattle.io/v3/rke_types.go | 2 ++ .../apis/management.cattle.io/v3/zz_generated_deepcopy.go | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/vendor.conf b/vendor.conf index ae5578f2..11adf341 100644 --- a/vendor.conf +++ b/vendor.conf @@ -26,4 +26,4 @@ github.com/Microsoft/go-winio ab35fc04b6365e8fcb18e6e9e41ea4a02b10b17 github.com/go-ini/ini 06f5f3d67269ccec1fe5fe4134ba6e982984f7f5 github.com/rancher/norman ff60298f31f081b06d198815b4c178a578664f7d -github.com/rancher/types 67eef838a7f4f1f745805318c5a48cc3c20ca9ee +github.com/rancher/types 72c9e9c0c9f5e04df42c0f2b973740677a8e2546 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 cc33a7b3..95879ddb 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 @@ -229,6 +229,8 @@ type BaseService struct { ExtraArgs map[string]string `yaml:"extra_args" json:"extraArgs,omitempty"` // Extra binds added to the nodes ExtraBinds []string `yaml:"extra_binds" json:"extraBinds,omitempty"` + // this is to provide extra env variable to the docker container running kubernetes service + ExtraEnv []string `yaml:"extra_env" json:"extraEnv,omitempty"` } type NetworkConfig struct { 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 e3ee214e..b0f99cd4 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 @@ -1357,6 +1357,11 @@ func (in *BaseService) DeepCopyInto(out *BaseService) { *out = make([]string, len(*in)) copy(*out, *in) } + if in.ExtraEnv != nil { + in, out := &in.ExtraEnv, &out.ExtraEnv + *out = make([]string, len(*in)) + copy(*out, *in) + } return }