From 11613a65532178b6dbe8b6d18d518cf9b347479b Mon Sep 17 00:00:00 2001 From: Luther Monson Date: Thu, 20 Aug 2020 13:55:58 -0700 Subject: [PATCH] generated --- .../v3/zz_generated_deepcopy.go | 17 +++++ .../v3/zz_generated_etcd_service.go | 68 ++++++++++--------- .../v3/zz_generated_kube_apiservice.go | 6 ++ .../zz_generated_kube_controller_service.go | 6 ++ .../v3/zz_generated_kubelet_service.go | 6 ++ .../v3/zz_generated_kubeproxy_service.go | 24 ++++--- .../v3/zz_generated_scheduler_service.go | 24 ++++--- 7 files changed, 102 insertions(+), 49 deletions(-) diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 9dc993e1..7314af6c 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -521,6 +521,23 @@ func (in *BaseService) DeepCopyInto(out *BaseService) { *out = make([]string, len(*in)) copy(*out, *in) } + if in.WindowsExtraArgs != nil { + in, out := &in.WindowsExtraArgs, &out.WindowsExtraArgs + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } + if in.WindowsExtraBinds != nil { + in, out := &in.WindowsExtraBinds, &out.WindowsExtraBinds + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.WindowsExtraEnv != nil { + in, out := &in.WindowsExtraEnv, &out.WindowsExtraEnv + *out = make([]string, len(*in)) + copy(*out, *in) + } return } diff --git a/client/management/v3/zz_generated_etcd_service.go b/client/management/v3/zz_generated_etcd_service.go index d4f9f6bd..4badd1cd 100644 --- a/client/management/v3/zz_generated_etcd_service.go +++ b/client/management/v3/zz_generated_etcd_service.go @@ -1,38 +1,44 @@ package client const ( - ETCDServiceType = "etcdService" - ETCDServiceFieldBackupConfig = "backupConfig" - ETCDServiceFieldCACert = "caCert" - ETCDServiceFieldCert = "cert" - ETCDServiceFieldCreation = "creation" - ETCDServiceFieldExternalURLs = "externalUrls" - ETCDServiceFieldExtraArgs = "extraArgs" - ETCDServiceFieldExtraBinds = "extraBinds" - ETCDServiceFieldExtraEnv = "extraEnv" - ETCDServiceFieldGID = "gid" - ETCDServiceFieldImage = "image" - ETCDServiceFieldKey = "key" - ETCDServiceFieldPath = "path" - ETCDServiceFieldRetention = "retention" - ETCDServiceFieldSnapshot = "snapshot" - ETCDServiceFieldUID = "uid" + ETCDServiceType = "etcdService" + ETCDServiceFieldBackupConfig = "backupConfig" + ETCDServiceFieldCACert = "caCert" + ETCDServiceFieldCert = "cert" + ETCDServiceFieldCreation = "creation" + ETCDServiceFieldExternalURLs = "externalUrls" + ETCDServiceFieldExtraArgs = "extraArgs" + ETCDServiceFieldExtraBinds = "extraBinds" + ETCDServiceFieldExtraEnv = "extraEnv" + ETCDServiceFieldGID = "gid" + ETCDServiceFieldImage = "image" + ETCDServiceFieldKey = "key" + ETCDServiceFieldPath = "path" + ETCDServiceFieldRetention = "retention" + ETCDServiceFieldSnapshot = "snapshot" + ETCDServiceFieldUID = "uid" + ETCDServiceFieldWindowsExtraArgs = "winExtraArgs" + ETCDServiceFieldWindowsExtraBinds = "winExtraBinds" + ETCDServiceFieldWindowsExtraEnv = "winExtraEnv" ) type ETCDService struct { - BackupConfig *BackupConfig `json:"backupConfig,omitempty" yaml:"backupConfig,omitempty"` - CACert string `json:"caCert,omitempty" yaml:"caCert,omitempty"` - Cert string `json:"cert,omitempty" yaml:"cert,omitempty"` - Creation string `json:"creation,omitempty" yaml:"creation,omitempty"` - ExternalURLs []string `json:"externalUrls,omitempty" yaml:"externalUrls,omitempty"` - ExtraArgs map[string]string `json:"extraArgs,omitempty" yaml:"extraArgs,omitempty"` - ExtraBinds []string `json:"extraBinds,omitempty" yaml:"extraBinds,omitempty"` - ExtraEnv []string `json:"extraEnv,omitempty" yaml:"extraEnv,omitempty"` - GID int64 `json:"gid,omitempty" yaml:"gid,omitempty"` - Image string `json:"image,omitempty" yaml:"image,omitempty"` - Key string `json:"key,omitempty" yaml:"key,omitempty"` - Path string `json:"path,omitempty" yaml:"path,omitempty"` - Retention string `json:"retention,omitempty" yaml:"retention,omitempty"` - Snapshot *bool `json:"snapshot,omitempty" yaml:"snapshot,omitempty"` - UID int64 `json:"uid,omitempty" yaml:"uid,omitempty"` + BackupConfig *BackupConfig `json:"backupConfig,omitempty" yaml:"backupConfig,omitempty"` + CACert string `json:"caCert,omitempty" yaml:"caCert,omitempty"` + Cert string `json:"cert,omitempty" yaml:"cert,omitempty"` + Creation string `json:"creation,omitempty" yaml:"creation,omitempty"` + ExternalURLs []string `json:"externalUrls,omitempty" yaml:"externalUrls,omitempty"` + ExtraArgs map[string]string `json:"extraArgs,omitempty" yaml:"extraArgs,omitempty"` + ExtraBinds []string `json:"extraBinds,omitempty" yaml:"extraBinds,omitempty"` + ExtraEnv []string `json:"extraEnv,omitempty" yaml:"extraEnv,omitempty"` + GID int64 `json:"gid,omitempty" yaml:"gid,omitempty"` + Image string `json:"image,omitempty" yaml:"image,omitempty"` + Key string `json:"key,omitempty" yaml:"key,omitempty"` + Path string `json:"path,omitempty" yaml:"path,omitempty"` + Retention string `json:"retention,omitempty" yaml:"retention,omitempty"` + Snapshot *bool `json:"snapshot,omitempty" yaml:"snapshot,omitempty"` + UID int64 `json:"uid,omitempty" yaml:"uid,omitempty"` + WindowsExtraArgs map[string]string `json:"winExtraArgs,omitempty" yaml:"winExtraArgs,omitempty"` + WindowsExtraBinds []string `json:"winExtraBinds,omitempty" yaml:"winExtraBinds,omitempty"` + WindowsExtraEnv []string `json:"winExtraEnv,omitempty" yaml:"winExtraEnv,omitempty"` } diff --git a/client/management/v3/zz_generated_kube_apiservice.go b/client/management/v3/zz_generated_kube_apiservice.go index 903f1870..0465cf71 100644 --- a/client/management/v3/zz_generated_kube_apiservice.go +++ b/client/management/v3/zz_generated_kube_apiservice.go @@ -14,6 +14,9 @@ const ( KubeAPIServiceFieldSecretsEncryptionConfig = "secretsEncryptionConfig" KubeAPIServiceFieldServiceClusterIPRange = "serviceClusterIpRange" KubeAPIServiceFieldServiceNodePortRange = "serviceNodePortRange" + KubeAPIServiceFieldWindowsExtraArgs = "winExtraArgs" + KubeAPIServiceFieldWindowsExtraBinds = "winExtraBinds" + KubeAPIServiceFieldWindowsExtraEnv = "winExtraEnv" ) type KubeAPIService struct { @@ -29,4 +32,7 @@ type KubeAPIService struct { SecretsEncryptionConfig *SecretsEncryptionConfig `json:"secretsEncryptionConfig,omitempty" yaml:"secretsEncryptionConfig,omitempty"` ServiceClusterIPRange string `json:"serviceClusterIpRange,omitempty" yaml:"serviceClusterIpRange,omitempty"` ServiceNodePortRange string `json:"serviceNodePortRange,omitempty" yaml:"serviceNodePortRange,omitempty"` + WindowsExtraArgs map[string]string `json:"winExtraArgs,omitempty" yaml:"winExtraArgs,omitempty"` + WindowsExtraBinds []string `json:"winExtraBinds,omitempty" yaml:"winExtraBinds,omitempty"` + WindowsExtraEnv []string `json:"winExtraEnv,omitempty" yaml:"winExtraEnv,omitempty"` } diff --git a/client/management/v3/zz_generated_kube_controller_service.go b/client/management/v3/zz_generated_kube_controller_service.go index fb5281ed..f2c9a0bc 100644 --- a/client/management/v3/zz_generated_kube_controller_service.go +++ b/client/management/v3/zz_generated_kube_controller_service.go @@ -8,6 +8,9 @@ const ( KubeControllerServiceFieldExtraEnv = "extraEnv" KubeControllerServiceFieldImage = "image" KubeControllerServiceFieldServiceClusterIPRange = "serviceClusterIpRange" + KubeControllerServiceFieldWindowsExtraArgs = "winExtraArgs" + KubeControllerServiceFieldWindowsExtraBinds = "winExtraBinds" + KubeControllerServiceFieldWindowsExtraEnv = "winExtraEnv" ) type KubeControllerService struct { @@ -17,4 +20,7 @@ type KubeControllerService struct { ExtraEnv []string `json:"extraEnv,omitempty" yaml:"extraEnv,omitempty"` Image string `json:"image,omitempty" yaml:"image,omitempty"` ServiceClusterIPRange string `json:"serviceClusterIpRange,omitempty" yaml:"serviceClusterIpRange,omitempty"` + WindowsExtraArgs map[string]string `json:"winExtraArgs,omitempty" yaml:"winExtraArgs,omitempty"` + WindowsExtraBinds []string `json:"winExtraBinds,omitempty" yaml:"winExtraBinds,omitempty"` + WindowsExtraEnv []string `json:"winExtraEnv,omitempty" yaml:"winExtraEnv,omitempty"` } diff --git a/client/management/v3/zz_generated_kubelet_service.go b/client/management/v3/zz_generated_kubelet_service.go index 6a39355f..af7a11ef 100644 --- a/client/management/v3/zz_generated_kubelet_service.go +++ b/client/management/v3/zz_generated_kubelet_service.go @@ -11,6 +11,9 @@ const ( KubeletServiceFieldGenerateServingCertificate = "generateServingCertificate" KubeletServiceFieldImage = "image" KubeletServiceFieldInfraContainerImage = "infraContainerImage" + KubeletServiceFieldWindowsExtraArgs = "winExtraArgs" + KubeletServiceFieldWindowsExtraBinds = "winExtraBinds" + KubeletServiceFieldWindowsExtraEnv = "winExtraEnv" ) type KubeletService struct { @@ -23,4 +26,7 @@ type KubeletService struct { GenerateServingCertificate bool `json:"generateServingCertificate,omitempty" yaml:"generateServingCertificate,omitempty"` Image string `json:"image,omitempty" yaml:"image,omitempty"` InfraContainerImage string `json:"infraContainerImage,omitempty" yaml:"infraContainerImage,omitempty"` + WindowsExtraArgs map[string]string `json:"winExtraArgs,omitempty" yaml:"winExtraArgs,omitempty"` + WindowsExtraBinds []string `json:"winExtraBinds,omitempty" yaml:"winExtraBinds,omitempty"` + WindowsExtraEnv []string `json:"winExtraEnv,omitempty" yaml:"winExtraEnv,omitempty"` } diff --git a/client/management/v3/zz_generated_kubeproxy_service.go b/client/management/v3/zz_generated_kubeproxy_service.go index ea19f9b9..c57c6d6c 100644 --- a/client/management/v3/zz_generated_kubeproxy_service.go +++ b/client/management/v3/zz_generated_kubeproxy_service.go @@ -1,16 +1,22 @@ package client const ( - KubeproxyServiceType = "kubeproxyService" - KubeproxyServiceFieldExtraArgs = "extraArgs" - KubeproxyServiceFieldExtraBinds = "extraBinds" - KubeproxyServiceFieldExtraEnv = "extraEnv" - KubeproxyServiceFieldImage = "image" + KubeproxyServiceType = "kubeproxyService" + KubeproxyServiceFieldExtraArgs = "extraArgs" + KubeproxyServiceFieldExtraBinds = "extraBinds" + KubeproxyServiceFieldExtraEnv = "extraEnv" + KubeproxyServiceFieldImage = "image" + KubeproxyServiceFieldWindowsExtraArgs = "winExtraArgs" + KubeproxyServiceFieldWindowsExtraBinds = "winExtraBinds" + KubeproxyServiceFieldWindowsExtraEnv = "winExtraEnv" ) type KubeproxyService struct { - ExtraArgs map[string]string `json:"extraArgs,omitempty" yaml:"extraArgs,omitempty"` - ExtraBinds []string `json:"extraBinds,omitempty" yaml:"extraBinds,omitempty"` - ExtraEnv []string `json:"extraEnv,omitempty" yaml:"extraEnv,omitempty"` - Image string `json:"image,omitempty" yaml:"image,omitempty"` + ExtraArgs map[string]string `json:"extraArgs,omitempty" yaml:"extraArgs,omitempty"` + ExtraBinds []string `json:"extraBinds,omitempty" yaml:"extraBinds,omitempty"` + ExtraEnv []string `json:"extraEnv,omitempty" yaml:"extraEnv,omitempty"` + Image string `json:"image,omitempty" yaml:"image,omitempty"` + WindowsExtraArgs map[string]string `json:"winExtraArgs,omitempty" yaml:"winExtraArgs,omitempty"` + WindowsExtraBinds []string `json:"winExtraBinds,omitempty" yaml:"winExtraBinds,omitempty"` + WindowsExtraEnv []string `json:"winExtraEnv,omitempty" yaml:"winExtraEnv,omitempty"` } diff --git a/client/management/v3/zz_generated_scheduler_service.go b/client/management/v3/zz_generated_scheduler_service.go index 651890b1..1bfad7c0 100644 --- a/client/management/v3/zz_generated_scheduler_service.go +++ b/client/management/v3/zz_generated_scheduler_service.go @@ -1,16 +1,22 @@ package client const ( - SchedulerServiceType = "schedulerService" - SchedulerServiceFieldExtraArgs = "extraArgs" - SchedulerServiceFieldExtraBinds = "extraBinds" - SchedulerServiceFieldExtraEnv = "extraEnv" - SchedulerServiceFieldImage = "image" + SchedulerServiceType = "schedulerService" + SchedulerServiceFieldExtraArgs = "extraArgs" + SchedulerServiceFieldExtraBinds = "extraBinds" + SchedulerServiceFieldExtraEnv = "extraEnv" + SchedulerServiceFieldImage = "image" + SchedulerServiceFieldWindowsExtraArgs = "winExtraArgs" + SchedulerServiceFieldWindowsExtraBinds = "winExtraBinds" + SchedulerServiceFieldWindowsExtraEnv = "winExtraEnv" ) type SchedulerService struct { - ExtraArgs map[string]string `json:"extraArgs,omitempty" yaml:"extraArgs,omitempty"` - ExtraBinds []string `json:"extraBinds,omitempty" yaml:"extraBinds,omitempty"` - ExtraEnv []string `json:"extraEnv,omitempty" yaml:"extraEnv,omitempty"` - Image string `json:"image,omitempty" yaml:"image,omitempty"` + ExtraArgs map[string]string `json:"extraArgs,omitempty" yaml:"extraArgs,omitempty"` + ExtraBinds []string `json:"extraBinds,omitempty" yaml:"extraBinds,omitempty"` + ExtraEnv []string `json:"extraEnv,omitempty" yaml:"extraEnv,omitempty"` + Image string `json:"image,omitempty" yaml:"image,omitempty"` + WindowsExtraArgs map[string]string `json:"winExtraArgs,omitempty" yaml:"winExtraArgs,omitempty"` + WindowsExtraBinds []string `json:"winExtraBinds,omitempty" yaml:"winExtraBinds,omitempty"` + WindowsExtraEnv []string `json:"winExtraEnv,omitempty" yaml:"winExtraEnv,omitempty"` }