rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-08 10:29:44 +00:00
Code Issues Releases Wiki Activity

Vendor update

Browse Source
This commit is contained in:
galal-hussein
2018-05-09 19:39:36 +02:00
parent a3416e6b92
commit df66902100
5 changed files with 56 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,17 +130,17 @@ type ActiveDirectoryConfig struct {
ServiceAccountPassword string `json:"serviceAccountPassword,omitempty" norman:"type=password,required"`
UserDisabledBitMask int64 `json:"userDisabledBitMask,omitempty" norman:"default=2"`
UserSearchBase string `json:"userSearchBase,omitempty" norman:"required"`
UserSearchAttribute string `json:"userSearchAttribute,omitempty" norman:"default=sAMAccountName"`
UserLoginAttribute string `json:"userLoginAttribute,omitempty" norman:"default=sAMAccountName"`
UserObjectClass string `json:"userObjectClass,omitempty" norman:"default=person"`
UserNameAttribute string `json:"userNameAttribute,omitempty" norman:"default=name"`
UserEnabledAttribute string `json:"userEnabledAttribute,omitempty" norman:"default=userAccountControl"`
UserSearchAttribute string `json:"userSearchAttribute,omitempty" norman:"default=sAMAccountName|sn|givenName,required"`
UserLoginAttribute string `json:"userLoginAttribute,omitempty" norman:"default=sAMAccountName,required"`
UserObjectClass string `json:"userObjectClass,omitempty" norman:"default=person,required"`
UserNameAttribute string `json:"userNameAttribute,omitempty" norman:"default=name,required"`
UserEnabledAttribute string `json:"userEnabledAttribute,omitempty" norman:"default=userAccountControl,required"`
GroupSearchBase string `json:"groupSearchBase,omitempty"`
GroupSearchAttribute string `json:"groupSearchAttribute,omitempty" norman:"default=sAMAccountName"`
GroupObjectClass string `json:"groupObjectClass,omitempty" norman:"default=group"`
GroupNameAttribute string `json:"groupNameAttribute,omitempty" norman:"default=name"`
GroupDNAttribute string `json:"groupDNAttribute,omitempty" norman:"default=distinguishedName"`
GroupMemberUserAttribute string `json:"groupMemberUserAttribute,omitempty" norman:"default=distinguishedName"`
GroupSearchAttribute string `json:"groupSearchAttribute,omitempty" norman:"default=sAMAccountName,required"`
GroupObjectClass string `json:"groupObjectClass,omitempty" norman:"default=group,required"`
GroupNameAttribute string `json:"groupNameAttribute,omitempty" norman:"default=name,required"`
GroupDNAttribute string `json:"groupDNAttribute,omitempty" norman:"default=distinguishedName,required"`
GroupMemberUserAttribute string `json:"groupMemberUserAttribute,omitempty" norman:"default=distinguishedName,required"`
GroupMemberMappingAttribute string `json:"groupMemberMappingAttribute,omitempty"`
ConnectionTimeout int64 `json:"connectionTimeout,omitempty" norman:"default=5000"`
}

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

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

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

@@ -37,6 +37,23 @@ type RancherKubernetesEngineConfig struct {
PrefixPath string `yaml:"prefix_path" json:"prefixPath,omitempty"`
// Number of status check retries for addon deployment jobs
AddonJobRetries int `yaml:"addon_job_retries" json:"addonJobRetries,omitempty" norman:"default=5"`
// Bastion/Jump Host configuration
BastionHost BastionHost `yaml:"bastion_host" json:"bastionHost,omitempty"`
}
type BastionHost struct {
// Address of Bastion Host
Address string `yaml:"address" json:"address,omitempty"`
// SSH Port of Bastion Host
Port string `yaml:"port" json:"port,omitempty"`
// ssh User to Bastion Host
User string `yaml:"user" json:"user,omitempty"`
// SSH Agent Auth enable
SSHAgentAuth bool `yaml:"ssh_agent_auth,omitempty" json:"sshAgentAuth,omitempty"`
// SSH Private Key
SSHKey string `yaml:"ssh_key" json:"sshKey,omitempty"`
// SSH Private Key Path
SSHKeyPath string `yaml:"ssh_key_path" json:"sshKeyPath,omitempty"`
}
type PrivateRegistry struct {
@@ -154,6 +171,12 @@ type ETCDService struct {
Key string `yaml:"key" json:"key,omitempty"`
// External etcd prefix
Path string `yaml:"path" json:"path,omitempty"`
// Etcd Backup Service
Backup bool `yaml:"backup" json:"backup,omitempty"`
// Etcd Backup Retention period
Retention string `yaml:"retention" json:"retention,omitempty"`
// Etcd Backup Creation period
Creation string `yaml:"creation" json:"creation,omitempty"`
}
type KubeAPIService struct {

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

@@ -88,6 +88,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
in.(*BaseService).DeepCopyInto(out.(*BaseService))
return nil
}, InType: reflect.TypeOf(&BaseService{})},
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
in.(*BastionHost).DeepCopyInto(out.(*BastionHost))
return nil
}, InType: reflect.TypeOf(&BastionHost{})},
conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
in.(*CalicoNetworkProvider).DeepCopyInto(out.(*CalicoNetworkProvider))
return nil
@@ -1326,6 +1330,22 @@ func (in *BaseService) DeepCopy() *BaseService {
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *BastionHost) DeepCopyInto(out *BastionHost) {
*out = *in
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BastionHost.
func (in *BastionHost) DeepCopy() *BastionHost {
if in == nil {
return nil
}
out := new(BastionHost)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *CalicoNetworkProvider) DeepCopyInto(out *CalicoNetworkProvider) {
*out = *in
@@ -5918,6 +5938,7 @@ func (in *RancherKubernetesEngineConfig) DeepCopyInto(out *RancherKubernetesEngi
}
in.Ingress.DeepCopyInto(&out.Ingress)
in.CloudProvider.DeepCopyInto(&out.CloudProvider)
out.BastionHost = in.BastionHost
return
}