From 3152022f25df8f61bd0df93936ed27e1716e1f4c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Wed, 6 Feb 2019 02:05:14 +0100 Subject: [PATCH] go generate --- apis/management.cattle.io/v3/rke_types.go | 2 +- .../v3/zz_generated_deepcopy.go | 42 ++++++++++++++++++- .../v3/zz_generated_aws_cloud_provider.go | 6 ++- .../v3/zz_generated_global_aws_opts.go | 28 +++++++++++++ .../v3/zz_generated_service_override.go | 20 +++++++++ 5 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 client/management/v3/zz_generated_global_aws_opts.go create mode 100644 client/management/v3/zz_generated_service_override.go diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go index 4c1c37fd..a4289f21 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -609,7 +609,7 @@ type ServiceOverride struct { SigningName string `json:"signing-name" yaml:"signing-name" ini:"signing-name,omitempty"` } -type GlobelAwsOpts struct { +type GlobalAwsOpts struct { // TODO: Is there any use for this? We can get it from the instance metadata service // Maybe if we're not running on AWS, e.g. bootstrap; for now it is not very useful Zone string `json:"zone" yaml:"zone" ini:"zone,omitempty"` diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 9edaf178..38eee4b7 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -36,6 +36,14 @@ func (in *ADFSConfig) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AWSCloudProvider) DeepCopyInto(out *AWSCloudProvider) { *out = *in + out.Global = in.Global + if in.ServiceOverride != nil { + in, out := &in.ServiceOverride, &out.ServiceOverride + *out = make(map[string]ServiceOverride, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } return } @@ -883,7 +891,7 @@ func (in *CloudProvider) DeepCopyInto(out *CloudProvider) { if in.AWSCloudProvider != nil { in, out := &in.AWSCloudProvider, &out.AWSCloudProvider *out = new(AWSCloudProvider) - **out = **in + (*in).DeepCopyInto(*out) } if in.AzureCloudProvider != nil { in, out := &in.AzureCloudProvider, &out.AzureCloudProvider @@ -2752,6 +2760,22 @@ func (in *GithubConfigTestOutput) DeepCopy() *GithubConfigTestOutput { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *GlobalAwsOpts) DeepCopyInto(out *GlobalAwsOpts) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GlobalAwsOpts. +func (in *GlobalAwsOpts) DeepCopy() *GlobalAwsOpts { + if in == nil { + return nil + } + out := new(GlobalAwsOpts) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *GlobalDNS) DeepCopyInto(out *GlobalDNS) { *out = *in @@ -7463,6 +7487,22 @@ func (in *SearchPrincipalsInput) DeepCopy() *SearchPrincipalsInput { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ServiceOverride) DeepCopyInto(out *ServiceOverride) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceOverride. +func (in *ServiceOverride) DeepCopy() *ServiceOverride { + if in == nil { + return nil + } + out := new(ServiceOverride) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *SetPasswordInput) DeepCopyInto(out *SetPasswordInput) { *out = *in diff --git a/client/management/v3/zz_generated_aws_cloud_provider.go b/client/management/v3/zz_generated_aws_cloud_provider.go index 5c015acc..bb1ebd01 100644 --- a/client/management/v3/zz_generated_aws_cloud_provider.go +++ b/client/management/v3/zz_generated_aws_cloud_provider.go @@ -1,8 +1,12 @@ package client const ( - AWSCloudProviderType = "awsCloudProvider" + AWSCloudProviderType = "awsCloudProvider" + AWSCloudProviderFieldGlobal = "global" + AWSCloudProviderFieldServiceOverride = "serviceOverride" ) type AWSCloudProvider struct { + Global *GlobalAwsOpts `json:"global,omitempty" yaml:"global,omitempty"` + ServiceOverride map[string]ServiceOverride `json:"serviceOverride,omitempty" yaml:"serviceOverride,omitempty"` } diff --git a/client/management/v3/zz_generated_global_aws_opts.go b/client/management/v3/zz_generated_global_aws_opts.go new file mode 100644 index 00000000..61965de7 --- /dev/null +++ b/client/management/v3/zz_generated_global_aws_opts.go @@ -0,0 +1,28 @@ +package client + +const ( + GlobalAwsOptsType = "globalAwsOpts" + GlobalAwsOptsFieldDisableSecurityGroupIngress = "disable-security-group-ingress" + GlobalAwsOptsFieldDisableStrictZoneCheck = "disable-strict-zone-check" + GlobalAwsOptsFieldElbSecurityGroup = "elb-security-group" + GlobalAwsOptsFieldKubernetesClusterID = "kubernetes-cluster-id" + GlobalAwsOptsFieldKubernetesClusterTag = "kubernetes-cluster-tag" + GlobalAwsOptsFieldRoleARN = "role-arn" + GlobalAwsOptsFieldRouteTableID = "routetable-id" + GlobalAwsOptsFieldSubnetID = "subnet-id" + GlobalAwsOptsFieldVPC = "vpc" + GlobalAwsOptsFieldZone = "zone" +) + +type GlobalAwsOpts struct { + DisableSecurityGroupIngress bool `json:"disable-security-group-ingress,omitempty" yaml:"disable-security-group-ingress,omitempty"` + DisableStrictZoneCheck bool `json:"disable-strict-zone-check,omitempty" yaml:"disable-strict-zone-check,omitempty"` + ElbSecurityGroup string `json:"elb-security-group,omitempty" yaml:"elb-security-group,omitempty"` + KubernetesClusterID string `json:"kubernetes-cluster-id,omitempty" yaml:"kubernetes-cluster-id,omitempty"` + KubernetesClusterTag string `json:"kubernetes-cluster-tag,omitempty" yaml:"kubernetes-cluster-tag,omitempty"` + RoleARN string `json:"role-arn,omitempty" yaml:"role-arn,omitempty"` + RouteTableID string `json:"routetable-id,omitempty" yaml:"routetable-id,omitempty"` + SubnetID string `json:"subnet-id,omitempty" yaml:"subnet-id,omitempty"` + VPC string `json:"vpc,omitempty" yaml:"vpc,omitempty"` + Zone string `json:"zone,omitempty" yaml:"zone,omitempty"` +} diff --git a/client/management/v3/zz_generated_service_override.go b/client/management/v3/zz_generated_service_override.go new file mode 100644 index 00000000..96ed63c0 --- /dev/null +++ b/client/management/v3/zz_generated_service_override.go @@ -0,0 +1,20 @@ +package client + +const ( + ServiceOverrideType = "serviceOverride" + ServiceOverrideFieldRegion = "region" + ServiceOverrideFieldService = "service" + ServiceOverrideFieldSigningMethod = "signing-method" + ServiceOverrideFieldSigningName = "signing-name" + ServiceOverrideFieldSigningRegion = "signing-region" + ServiceOverrideFieldURL = "url" +) + +type ServiceOverride struct { + Region string `json:"region,omitempty" yaml:"region,omitempty"` + Service string `json:"service,omitempty" yaml:"service,omitempty"` + SigningMethod string `json:"signing-method,omitempty" yaml:"signing-method,omitempty"` + SigningName string `json:"signing-name,omitempty" yaml:"signing-name,omitempty"` + SigningRegion string `json:"signing-region,omitempty" yaml:"signing-region,omitempty"` + URL string `json:"url,omitempty" yaml:"url,omitempty"` +}