From cdb4ae8466cbcaa5f09f24d0e25adedace0a63a6 Mon Sep 17 00:00:00 2001 From: Daishan Peng Date: Thu, 7 Dec 2017 12:51:57 -0700 Subject: [PATCH] generate changes --- .../v3/zz_generated_deepcopy.go | 19 +++++- .../v3/zz_generated_amazon_ec2config.go | 62 ++++++++++++++++++- .../v3/zz_generated_azure_config.go | 46 +++++++++++++- .../v3/zz_generated_digital_ocean_config.go | 26 +++++++- client/management/v3/zz_generated_machine.go | 6 ++ .../v3/zz_generated_machine_status.go | 6 ++ 6 files changed, 160 insertions(+), 5 deletions(-) diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 441a8060..ecd01999 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -9,6 +9,16 @@ import ( // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AmazonEC2Config) DeepCopyInto(out *AmazonEC2Config) { *out = *in + if in.OpenPort != nil { + in, out := &in.OpenPort, &out.OpenPort + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.SecurityGroup != nil { + in, out := &in.SecurityGroup, &out.SecurityGroup + *out = make([]string, len(*in)) + copy(*out, *in) + } return } @@ -48,6 +58,11 @@ func (in *AuthConfig) DeepCopy() *AuthConfig { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AzureConfig) DeepCopyInto(out *AzureConfig) { *out = *in + if in.OpenPort != nil { + in, out := &in.OpenPort, &out.OpenPort + *out = make([]string, len(*in)) + copy(*out, *in) + } return } @@ -1065,8 +1080,8 @@ func (in *MachineSpec) DeepCopyInto(out *MachineSpec) { *out = *in in.NodeSpec.DeepCopyInto(&out.NodeSpec) in.MachineCommonParams.DeepCopyInto(&out.MachineCommonParams) - out.AmazonEC2Config = in.AmazonEC2Config - out.AzureConfig = in.AzureConfig + in.AmazonEC2Config.DeepCopyInto(&out.AmazonEC2Config) + in.AzureConfig.DeepCopyInto(&out.AzureConfig) out.DigitalOceanConfig = in.DigitalOceanConfig return } diff --git a/client/management/v3/zz_generated_amazon_ec2config.go b/client/management/v3/zz_generated_amazon_ec2config.go index 78cb846e..b8a67c71 100644 --- a/client/management/v3/zz_generated_amazon_ec2config.go +++ b/client/management/v3/zz_generated_amazon_ec2config.go @@ -1,8 +1,68 @@ package client const ( - AmazonEC2ConfigType = "amazonEC2Config" + AmazonEC2ConfigType = "amazonEC2Config" + AmazonEC2ConfigFieldAccessKey = "accessKey" + AmazonEC2ConfigFieldAmi = "ami" + AmazonEC2ConfigFieldBlockDurationMinutes = "blockDurationMinutes" + AmazonEC2ConfigFieldDeviceName = "deviceName" + AmazonEC2ConfigFieldEndpoint = "endpoint" + AmazonEC2ConfigFieldIamInstanceProfile = "iamInstanceProfile" + AmazonEC2ConfigFieldInsecureTransport = "insecureTransport" + AmazonEC2ConfigFieldInstanceType = "instanceType" + AmazonEC2ConfigFieldKeypairName = "keypairName" + AmazonEC2ConfigFieldMonitoring = "monitoring" + AmazonEC2ConfigFieldOpenPort = "openPort" + AmazonEC2ConfigFieldPrivateAddressOnly = "privateAddressOnly" + AmazonEC2ConfigFieldRegion = "region" + AmazonEC2ConfigFieldRequestSpotInstance = "requestSpotInstance" + AmazonEC2ConfigFieldRetries = "retries" + AmazonEC2ConfigFieldRootSize = "rootSize" + AmazonEC2ConfigFieldSSHKeypath = "sshKeypath" + AmazonEC2ConfigFieldSSHUser = "sshUser" + AmazonEC2ConfigFieldSecretKey = "secretKey" + AmazonEC2ConfigFieldSecurityGroup = "securityGroup" + AmazonEC2ConfigFieldSessionToken = "sessionToken" + AmazonEC2ConfigFieldSpotPrice = "spotPrice" + AmazonEC2ConfigFieldSubnetID = "subnetId" + AmazonEC2ConfigFieldTags = "tags" + AmazonEC2ConfigFieldUseEbsOptimizedInstance = "useEbsOptimizedInstance" + AmazonEC2ConfigFieldUsePrivateAddress = "usePrivateAddress" + AmazonEC2ConfigFieldUserdata = "userdata" + AmazonEC2ConfigFieldVolumeType = "volumeType" + AmazonEC2ConfigFieldVpcID = "vpcId" + AmazonEC2ConfigFieldZone = "zone" ) type AmazonEC2Config struct { + AccessKey string `json:"accessKey,omitempty"` + Ami string `json:"ami,omitempty"` + BlockDurationMinutes string `json:"blockDurationMinutes,omitempty"` + DeviceName string `json:"deviceName,omitempty"` + Endpoint string `json:"endpoint,omitempty"` + IamInstanceProfile string `json:"iamInstanceProfile,omitempty"` + InsecureTransport *bool `json:"insecureTransport,omitempty"` + InstanceType string `json:"instanceType,omitempty"` + KeypairName string `json:"keypairName,omitempty"` + Monitoring *bool `json:"monitoring,omitempty"` + OpenPort []string `json:"openPort,omitempty"` + PrivateAddressOnly *bool `json:"privateAddressOnly,omitempty"` + Region string `json:"region,omitempty"` + RequestSpotInstance *bool `json:"requestSpotInstance,omitempty"` + Retries string `json:"retries,omitempty"` + RootSize string `json:"rootSize,omitempty"` + SSHKeypath string `json:"sshKeypath,omitempty"` + SSHUser string `json:"sshUser,omitempty"` + SecretKey string `json:"secretKey,omitempty"` + SecurityGroup []string `json:"securityGroup,omitempty"` + SessionToken string `json:"sessionToken,omitempty"` + SpotPrice string `json:"spotPrice,omitempty"` + SubnetID string `json:"subnetId,omitempty"` + Tags string `json:"tags,omitempty"` + UseEbsOptimizedInstance *bool `json:"useEbsOptimizedInstance,omitempty"` + UsePrivateAddress *bool `json:"usePrivateAddress,omitempty"` + Userdata string `json:"userdata,omitempty"` + VolumeType string `json:"volumeType,omitempty"` + VpcID string `json:"vpcId,omitempty"` + Zone string `json:"zone,omitempty"` } diff --git a/client/management/v3/zz_generated_azure_config.go b/client/management/v3/zz_generated_azure_config.go index 9e120d16..2eb76db1 100644 --- a/client/management/v3/zz_generated_azure_config.go +++ b/client/management/v3/zz_generated_azure_config.go @@ -1,8 +1,52 @@ package client const ( - AzureConfigType = "azureConfig" + AzureConfigType = "azureConfig" + AzureConfigFieldAvailabilitySet = "availabilitySet" + AzureConfigFieldClientID = "clientId" + AzureConfigFieldClientSecret = "clientSecret" + AzureConfigFieldCustomData = "customData" + AzureConfigFieldDNS = "dns" + AzureConfigFieldDockerPort = "dockerPort" + AzureConfigFieldEnvironment = "environment" + AzureConfigFieldImage = "image" + AzureConfigFieldLocation = "location" + AzureConfigFieldNoPublicIP = "noPublicIp" + AzureConfigFieldOpenPort = "openPort" + AzureConfigFieldPrivateIPAddress = "privateIpAddress" + AzureConfigFieldResourceGroup = "resourceGroup" + AzureConfigFieldSSHUser = "sshUser" + AzureConfigFieldSize = "size" + AzureConfigFieldStaticPublicIP = "staticPublicIp" + AzureConfigFieldStorageType = "storageType" + AzureConfigFieldSubnet = "subnet" + AzureConfigFieldSubnetPrefix = "subnetPrefix" + AzureConfigFieldSubscriptionID = "subscriptionId" + AzureConfigFieldUsePrivateIP = "usePrivateIp" + AzureConfigFieldVnet = "vnet" ) type AzureConfig struct { + AvailabilitySet string `json:"availabilitySet,omitempty"` + ClientID string `json:"clientId,omitempty"` + ClientSecret string `json:"clientSecret,omitempty"` + CustomData string `json:"customData,omitempty"` + DNS string `json:"dns,omitempty"` + DockerPort string `json:"dockerPort,omitempty"` + Environment string `json:"environment,omitempty"` + Image string `json:"image,omitempty"` + Location string `json:"location,omitempty"` + NoPublicIP *bool `json:"noPublicIp,omitempty"` + OpenPort []string `json:"openPort,omitempty"` + PrivateIPAddress string `json:"privateIpAddress,omitempty"` + ResourceGroup string `json:"resourceGroup,omitempty"` + SSHUser string `json:"sshUser,omitempty"` + Size string `json:"size,omitempty"` + StaticPublicIP *bool `json:"staticPublicIp,omitempty"` + StorageType string `json:"storageType,omitempty"` + Subnet string `json:"subnet,omitempty"` + SubnetPrefix string `json:"subnetPrefix,omitempty"` + SubscriptionID string `json:"subscriptionId,omitempty"` + UsePrivateIP *bool `json:"usePrivateIp,omitempty"` + Vnet string `json:"vnet,omitempty"` } diff --git a/client/management/v3/zz_generated_digital_ocean_config.go b/client/management/v3/zz_generated_digital_ocean_config.go index 238f6b7b..ef69e087 100644 --- a/client/management/v3/zz_generated_digital_ocean_config.go +++ b/client/management/v3/zz_generated_digital_ocean_config.go @@ -1,8 +1,32 @@ package client const ( - DigitalOceanConfigType = "digitalOceanConfig" + DigitalOceanConfigType = "digitalOceanConfig" + DigitalOceanConfigFieldAccessToken = "accessToken" + DigitalOceanConfigFieldBackups = "backups" + DigitalOceanConfigFieldImage = "image" + DigitalOceanConfigFieldIpv6 = "ipv6" + DigitalOceanConfigFieldPrivateNetworking = "privateNetworking" + DigitalOceanConfigFieldRegion = "region" + DigitalOceanConfigFieldSSHKeyFingerprint = "sshKeyFingerprint" + DigitalOceanConfigFieldSSHKeyPath = "sshKeyPath" + DigitalOceanConfigFieldSSHPort = "sshPort" + DigitalOceanConfigFieldSSHUser = "sshUser" + DigitalOceanConfigFieldSize = "size" + DigitalOceanConfigFieldUserdata = "userdata" ) type DigitalOceanConfig struct { + AccessToken string `json:"accessToken,omitempty"` + Backups *bool `json:"backups,omitempty"` + Image string `json:"image,omitempty"` + Ipv6 *bool `json:"ipv6,omitempty"` + PrivateNetworking *bool `json:"privateNetworking,omitempty"` + Region string `json:"region,omitempty"` + SSHKeyFingerprint string `json:"sshKeyFingerprint,omitempty"` + SSHKeyPath string `json:"sshKeyPath,omitempty"` + SSHPort string `json:"sshPort,omitempty"` + SSHUser string `json:"sshUser,omitempty"` + Size string `json:"size,omitempty"` + Userdata string `json:"userdata,omitempty"` } diff --git a/client/management/v3/zz_generated_machine.go b/client/management/v3/zz_generated_machine.go index b82f566e..353a533e 100644 --- a/client/management/v3/zz_generated_machine.go +++ b/client/management/v3/zz_generated_machine.go @@ -29,6 +29,7 @@ const ( MachineFieldEngineRegistryMirror = "engineRegistryMirror" MachineFieldEngineStorageDriver = "engineStorageDriver" MachineFieldExternalId = "externalId" + MachineFieldExtractedConfig = "extractedConfig" MachineFieldFinalizers = "finalizers" MachineFieldHostname = "hostname" MachineFieldIPAddress = "ipAddress" @@ -42,9 +43,11 @@ const ( MachineFieldPhase = "phase" MachineFieldPodCIDR = "podCIDR" MachineFieldProviderID = "providerID" + MachineFieldProvisioned = "provisioned" MachineFieldRemoved = "removed" MachineFieldRequested = "requested" MachineFieldResourcePath = "resourcePath" + MachineFieldSSHPrivateKey = "sshPrivateKey" MachineFieldState = "state" MachineFieldTaints = "taints" MachineFieldTransitioning = "transitioning" @@ -80,6 +83,7 @@ type Machine struct { EngineRegistryMirror []string `json:"engineRegistryMirror,omitempty"` EngineStorageDriver string `json:"engineStorageDriver,omitempty"` ExternalId string `json:"externalId,omitempty"` + ExtractedConfig string `json:"extractedConfig,omitempty"` Finalizers []string `json:"finalizers,omitempty"` Hostname string `json:"hostname,omitempty"` IPAddress string `json:"ipAddress,omitempty"` @@ -93,9 +97,11 @@ type Machine struct { Phase string `json:"phase,omitempty"` PodCIDR string `json:"podCIDR,omitempty"` ProviderID string `json:"providerID,omitempty"` + Provisioned *bool `json:"provisioned,omitempty"` Removed string `json:"removed,omitempty"` Requested map[string]string `json:"requested,omitempty"` ResourcePath string `json:"resourcePath,omitempty"` + SSHPrivateKey string `json:"sshPrivateKey,omitempty"` State string `json:"state,omitempty"` Taints []Taint `json:"taints,omitempty"` Transitioning string `json:"transitioning,omitempty"` diff --git a/client/management/v3/zz_generated_machine_status.go b/client/management/v3/zz_generated_machine_status.go index 9c69f466..82f25550 100644 --- a/client/management/v3/zz_generated_machine_status.go +++ b/client/management/v3/zz_generated_machine_status.go @@ -5,13 +5,16 @@ const ( MachineStatusFieldAllocatable = "allocatable" MachineStatusFieldCapacity = "capacity" MachineStatusFieldConditions = "conditions" + MachineStatusFieldExtractedConfig = "extractedConfig" MachineStatusFieldHostname = "hostname" MachineStatusFieldIPAddress = "ipAddress" MachineStatusFieldInfo = "info" MachineStatusFieldLimits = "limits" MachineStatusFieldNodeName = "nodeName" MachineStatusFieldPhase = "phase" + MachineStatusFieldProvisioned = "provisioned" MachineStatusFieldRequested = "requested" + MachineStatusFieldSSHPrivateKey = "sshPrivateKey" MachineStatusFieldVolumesAttached = "volumesAttached" MachineStatusFieldVolumesInUse = "volumesInUse" ) @@ -20,13 +23,16 @@ type MachineStatus struct { Allocatable map[string]string `json:"allocatable,omitempty"` Capacity map[string]string `json:"capacity,omitempty"` Conditions []NodeCondition `json:"conditions,omitempty"` + ExtractedConfig string `json:"extractedConfig,omitempty"` Hostname string `json:"hostname,omitempty"` IPAddress string `json:"ipAddress,omitempty"` Info *NodeInfo `json:"info,omitempty"` Limits map[string]string `json:"limits,omitempty"` NodeName string `json:"nodeName,omitempty"` Phase string `json:"phase,omitempty"` + Provisioned *bool `json:"provisioned,omitempty"` Requested map[string]string `json:"requested,omitempty"` + SSHPrivateKey string `json:"sshPrivateKey,omitempty"` VolumesAttached map[string]AttachedVolume `json:"volumesAttached,omitempty"` VolumesInUse []string `json:"volumesInUse,omitempty"` }