rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-21 11:27:32 +00:00
Code Issues Releases Wiki Activity

Update Vendor

Browse Source
This commit is contained in:
Bernard Wagner
2019-01-28 20:24:12 +02:00
committed by Alena Prokharchyk
parent d8758c551f
commit 566920b8a5
6 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@@ -28,4 +28,4 @@ github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0e
github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ade github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ade
github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c
github.com/rancher/norman 0557aa4ff31a3a0f007dcb1b684894f23cda390c github.com/rancher/norman 0557aa4ff31a3a0f007dcb1b684894f23cda390c
github.com/rancher/types 1e6b3e4c5ff0169e35c48e7517396d62f56957a8 github.com/rancher/types 829746ec5e70eadfb8fc226de10d6d89d26501b2

3
vendor/github.com/rancher/types/apis/management.cattle.io/v3/globaldns_types.go generated vendored
View File

@@ -26,7 +26,8 @@ type GlobalDNSSpec struct {
} }
type GlobalDNSStatus struct { type GlobalDNSStatus struct {
Endpoints []string `json:"endpoints,omitempty"` Endpoints []string `json:"endpoints,omitempty"`
ClusterEndpoints map[string][]string `json:"clusterEndpoints,omitempty"`
} }
type GlobalDNSProvider struct { type GlobalDNSProvider struct {

6
vendor/github.com/rancher/types/apis/management.cattle.io/v3/machine_types.go generated vendored
View File

@@ -168,8 +168,10 @@ type CustomConfig struct {
// Optional - Docker socket on the node that will be used in tunneling // Optional - Docker socket on the node that will be used in tunneling
DockerSocket string `yaml:"docker_socket" json:"dockerSocket,omitempty"` DockerSocket string `yaml:"docker_socket" json:"dockerSocket,omitempty"`
// SSH Private Key // SSH Private Key
SSHKey string `yaml:"ssh_key" json:"sshKey,omitempty" norman:"type=password"` SSHKey string `yaml:"ssh_key" json:"sshKey,omitempty" norman:"type=password"`
Label map[string]string `yaml:"label" json:"label,omitempty"` // SSH Certificate
SSHCert string `yaml:"ssh_cert" json:"sshCert,omitempty"`
Label map[string]string `yaml:"label" json:"label,omitempty"`
} }
type NodeSpec struct { type NodeSpec struct {

10
vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go generated vendored
View File

@@ -17,6 +17,8 @@ type RancherKubernetesEngineConfig struct {
SystemImages RKESystemImages `yaml:"system_images" json:"systemImages,omitempty"` SystemImages RKESystemImages `yaml:"system_images" json:"systemImages,omitempty"`
// SSH Private Key Path // SSH Private Key Path
SSHKeyPath string `yaml:"ssh_key_path" json:"sshKeyPath,omitempty"` 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 // SSH Agent Auth enable
SSHAgentAuth bool `yaml:"ssh_agent_auth" json:"sshAgentAuth"` SSHAgentAuth bool `yaml:"ssh_agent_auth" json:"sshAgentAuth"`
// Authorization mode configuration used in the cluster // 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"` SSHKey string `yaml:"ssh_key" json:"sshKey,omitempty" norman:"type=password"`
// SSH Private Key Path // SSH Private Key Path
SSHKeyPath string `yaml:"ssh_key_path" json:"sshKeyPath,omitempty"` 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 { type PrivateRegistry struct {
@@ -155,6 +161,10 @@ type RKEConfigNode struct {
SSHKey string `yaml:"ssh_key" json:"sshKey,omitempty" norman:"type=password"` SSHKey string `yaml:"ssh_key" json:"sshKey,omitempty" norman:"type=password"`
// SSH Private Key Path // SSH Private Key Path
SSHKeyPath string `yaml:"ssh_key_path" json:"sshKeyPath,omitempty"` 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 // Node Labels
Labels map[string]string `yaml:"labels" json:"labels,omitempty"` Labels map[string]string `yaml:"labels" json:"labels,omitempty"`
} }

15
vendor/github.com/rancher/types/apis/management.cattle.io/v3/zz_generated_deepcopy.go generated vendored
View File

@@ -2906,6 +2906,21 @@ func (in *GlobalDNSStatus) DeepCopyInto(out *GlobalDNSStatus) {
*out = make([]string, len(*in)) *out = make([]string, len(*in))
copy(*out, *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 return
} }

13
vendor/github.com/rancher/types/apis/project.cattle.io/v3/app_types.go generated vendored
View File

@@ -29,9 +29,10 @@ type AppSpec struct {
} }
var ( var (
AppConditionInstalled condition.Cond = "Installed" AppConditionInstalled condition.Cond = "Installed"
AppConditionMigrated condition.Cond = "Migrated" AppConditionMigrated condition.Cond = "Migrated"
AppConditionDeployed condition.Cond = "Deployed" AppConditionDeployed condition.Cond = "Deployed"
AppConditionForceUpgrade condition.Cond = "ForceUpgrade"
) )
type AppStatus struct { type AppStatus struct {
@@ -75,10 +76,12 @@ type AppRevisionStatus struct {
} }
type AppUpgradeConfig struct { type AppUpgradeConfig struct {
ExternalID string `json:"externalId,omitempty"` ExternalID string `json:"externalId,omitempty"`
Answers map[string]string `json:"answers,omitempty"` Answers map[string]string `json:"answers,omitempty"`
ForceUpgrade bool `json:"forceUpgrade,omitempty"`
} }
type RollbackRevision struct { type RollbackRevision struct {
RevisionName string `json:"revisionName,omitempty" norman:"type=reference[/v3/project/schemas/apprevision]"` RevisionName string `json:"revisionName,omitempty" norman:"type=reference[/v3/project/schemas/apprevision]"`
ForceUpgrade bool `json:"forceUpgrade,omitempty"`
} }