1
0
mirror of https://github.com/rancher/rke.git synced 2025-09-12 21:24:00 +00:00

Update types vendors

This commit is contained in:
galal-hussein
2018-05-02 18:36:58 +02:00
parent 501c10b2b7
commit 72811748cb
5 changed files with 11 additions and 22 deletions

View File

@@ -24,4 +24,4 @@ github.com/coreos/go-semver e214231b295a8ea9479f11b70b35d5acf3556d9
github.com/ugorji/go/codec ccfe18359b55b97855cee1d3f74e5efbda4869dc
github.com/rancher/norman ff60298f31f081b06d198815b4c178a578664f7d
github.com/rancher/types 71878a13b6cb20eac2f160c8927bc570119618fb
github.com/rancher/types 9f5225fa37e5cfe5e0e3321fa66514b4538412e4

View File

@@ -104,11 +104,9 @@ type TemplateVersion struct {
type TemplateVersionSpec struct {
ExternalID string `json:"externalId,omitempty"`
Revision *int `json:"revision,omitempty"`
Version string `json:"version,omitempty"`
MinimumRancherVersion string `json:"minimumRancherVersion,omitempty" yaml:"minimum_rancher_version,omitempty"`
MaximumRancherVersion string `json:"maximumRancherVersion,omitempty" yaml:"maximum_rancher_version,omitempty"`
UpgradeFrom string `json:"upgradeFrom,omitempty" yaml:"upgrade_from,omitempty"`
RancherVersion string `json:"rancherVersion,omitempty"`
KubeVersion string `json:"kubeVersion,omitempty"`
Readme string `json:"readme,omitempty"`
AppReadme string `json:"appReadme,omitempty"`
UpgradeVersionLinks map[string]string `json:"upgradeVersionLinks,omitempty"`

View File

@@ -8,7 +8,7 @@ const (
var (
m = image.Mirror
ToolsImage = m("rancher/rke-tools:v0.1.4")
ToolsImage = m("rancher/rke-tools:v0.1.5")
// K8sVersionToRKESystemImages - images map for 2.0
K8sVersionToRKESystemImages = map[string]RKESystemImages{

View File

@@ -6917,15 +6917,6 @@ func (in *TemplateVersionList) DeepCopyObject() runtime.Object {
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *TemplateVersionSpec) DeepCopyInto(out *TemplateVersionSpec) {
*out = *in
if in.Revision != nil {
in, out := &in.Revision, &out.Revision
if *in == nil {
*out = nil
} else {
*out = new(int)
**out = **in
}
}
if in.UpgradeVersionLinks != nil {
in, out := &in.UpgradeVersionLinks, &out.UpgradeVersionLinks
*out = make(map[string]string, len(*in))

View File

@@ -5,4 +5,4 @@ k8s.io/kubernetes v1.8.3
bitbucket.org/ww/goautoneg a547fc61f48d567d5b4ec6f8aee5573d8efce11d https://github.com/rancher/goautoneg.git
golang.org/x/sync fd80eb99c8f653c847d294a001bdf2a3a6f768f5
github.com/rancher/norman 0611d5f7a126637abad8f0e5734cbc6562ed3922
github.com/rancher/norman e6973cb055f2390e8814884353981ffa5496e30c