From 566920b8a51c16802df12b470b5fbad19926faaa Mon Sep 17 00:00:00 2001 From: Bernard Wagner Date: Mon, 28 Jan 2019 20:24:12 +0200 Subject: [PATCH] Update Vendor --- vendor.conf | 2 +- .../management.cattle.io/v3/globaldns_types.go | 3 ++- .../apis/management.cattle.io/v3/machine_types.go | 6 ++++-- .../apis/management.cattle.io/v3/rke_types.go | 10 ++++++++++ .../v3/zz_generated_deepcopy.go | 15 +++++++++++++++ .../types/apis/project.cattle.io/v3/app_types.go | 13 ++++++++----- 6 files changed, 40 insertions(+), 9 deletions(-) diff --git a/vendor.conf b/vendor.conf index 44b85b7a..2f9bc699 100644 --- a/vendor.conf +++ b/vendor.conf @@ -28,4 +28,4 @@ github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0e github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ade github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c github.com/rancher/norman 0557aa4ff31a3a0f007dcb1b684894f23cda390c -github.com/rancher/types 1e6b3e4c5ff0169e35c48e7517396d62f56957a8 +github.com/rancher/types 829746ec5e70eadfb8fc226de10d6d89d26501b2 diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/globaldns_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/globaldns_types.go index 7cc80ac2..f2367a29 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/globaldns_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/globaldns_types.go @@ -26,7 +26,8 @@ type GlobalDNSSpec struct { } type GlobalDNSStatus struct { - Endpoints []string `json:"endpoints,omitempty"` + Endpoints []string `json:"endpoints,omitempty"` + ClusterEndpoints map[string][]string `json:"clusterEndpoints,omitempty"` } type GlobalDNSProvider struct { diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/machine_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/machine_types.go index 268457bd..24fa6a3c 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/machine_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/machine_types.go @@ -168,8 +168,10 @@ type CustomConfig struct { // Optional - Docker socket on the node that will be used in tunneling DockerSocket string `yaml:"docker_socket" json:"dockerSocket,omitempty"` // SSH Private Key - SSHKey string `yaml:"ssh_key" json:"sshKey,omitempty" norman:"type=password"` - Label map[string]string `yaml:"label" json:"label,omitempty"` + SSHKey string `yaml:"ssh_key" json:"sshKey,omitempty" norman:"type=password"` + // SSH Certificate + SSHCert string `yaml:"ssh_cert" json:"sshCert,omitempty"` + Label map[string]string `yaml:"label" json:"label,omitempty"` } type NodeSpec 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 fa52e91e..22947064 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 @@ -17,6 +17,8 @@ type RancherKubernetesEngineConfig struct { SystemImages RKESystemImages `yaml:"system_images" json:"systemImages,omitempty"` // SSH Private Key Path SSHKeyPath string `yaml:"ssh_key_path" json:"sshKeyPath,omitempty"` + // SSH Certificate Path + SSHCertPath string `yaml:"ssh_cert_path" json:"sshCertPath,omitempty"` // SSH Agent Auth enable SSHAgentAuth bool `yaml:"ssh_agent_auth" json:"sshAgentAuth"` // Authorization mode configuration used in the cluster @@ -62,6 +64,10 @@ type BastionHost struct { SSHKey string `yaml:"ssh_key" json:"sshKey,omitempty" norman:"type=password"` // SSH Private Key Path SSHKeyPath string `yaml:"ssh_key_path" json:"sshKeyPath,omitempty"` + // SSH Certificate + SSHCert string `yaml:"ssh_cert" json:"sshCert,omitempty"` + // SSH Certificate Path + SSHCertPath string `yaml:"ssh_cert_path" json:"sshCertPath,omitempty"` } type PrivateRegistry struct { @@ -155,6 +161,10 @@ type RKEConfigNode struct { SSHKey string `yaml:"ssh_key" json:"sshKey,omitempty" norman:"type=password"` // SSH Private Key Path SSHKeyPath string `yaml:"ssh_key_path" json:"sshKeyPath,omitempty"` + // SSH Certificate + SSHCert string `yaml:"ssh_cert" json:"sshCert,omitempty"` + // SSH Certificate Path + SSHCertPath string `yaml:"ssh_cert_path" json:"sshCertPath,omitempty"` // Node Labels Labels map[string]string `yaml:"labels" json:"labels,omitempty"` } 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 ce14dc9f..e06c4eea 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 @@ -2906,6 +2906,21 @@ func (in *GlobalDNSStatus) DeepCopyInto(out *GlobalDNSStatus) { *out = make([]string, len(*in)) copy(*out, *in) } + if in.ClusterEndpoints != nil { + in, out := &in.ClusterEndpoints, &out.ClusterEndpoints + *out = make(map[string][]string, len(*in)) + for key, val := range *in { + var outVal []string + if val == nil { + (*out)[key] = nil + } else { + in, out := &val, &outVal + *out = make([]string, len(*in)) + copy(*out, *in) + } + (*out)[key] = outVal + } + } return } diff --git a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/app_types.go b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/app_types.go index 40aa84cd..e1d2add0 100644 --- a/vendor/github.com/rancher/types/apis/project.cattle.io/v3/app_types.go +++ b/vendor/github.com/rancher/types/apis/project.cattle.io/v3/app_types.go @@ -29,9 +29,10 @@ type AppSpec struct { } var ( - AppConditionInstalled condition.Cond = "Installed" - AppConditionMigrated condition.Cond = "Migrated" - AppConditionDeployed condition.Cond = "Deployed" + AppConditionInstalled condition.Cond = "Installed" + AppConditionMigrated condition.Cond = "Migrated" + AppConditionDeployed condition.Cond = "Deployed" + AppConditionForceUpgrade condition.Cond = "ForceUpgrade" ) type AppStatus struct { @@ -75,10 +76,12 @@ type AppRevisionStatus struct { } type AppUpgradeConfig struct { - ExternalID string `json:"externalId,omitempty"` - Answers map[string]string `json:"answers,omitempty"` + ExternalID string `json:"externalId,omitempty"` + Answers map[string]string `json:"answers,omitempty"` + ForceUpgrade bool `json:"forceUpgrade,omitempty"` } type RollbackRevision struct { RevisionName string `json:"revisionName,omitempty" norman:"type=reference[/v3/project/schemas/apprevision]"` + ForceUpgrade bool `json:"forceUpgrade,omitempty"` }