Merge pull request #1174 from luthermonson/wins

win_ Params for RKE
2025-09-12 21:13:18 +00:00 · 2020-07-23 15:40:53 -07:00
parent 5932ed83e2 2316279385
commit ae84b42a47
11 changed files with 125 additions and 49 deletions
--- 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"`
 }
--- 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"`
 }
--- 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"`
 }
--- 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"`
 }
--- 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"`
 }
--- a/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go
+++ b/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go
@@ -26,6 +26,7 @@ const (
 	RancherKubernetesEngineConfigFieldServices            = "services"
 	RancherKubernetesEngineConfigFieldUpgradeStrategy     = "upgradeStrategy"
 	RancherKubernetesEngineConfigFieldVersion             = "kubernetesVersion"
+	RancherKubernetesEngineConfigFieldWindowsPrefixPath   = "winPrefixPath"
 )

 type RancherKubernetesEngineConfig struct {
@@ -53,4 +54,5 @@ type RancherKubernetesEngineConfig struct {
 	Services            *RKEConfigServices   `json:"services,omitempty" yaml:"services,omitempty"`
 	UpgradeStrategy     *NodeUpgradeStrategy `json:"upgradeStrategy,omitempty" yaml:"upgradeStrategy,omitempty"`
 	Version             string               `json:"kubernetesVersion,omitempty" yaml:"kubernetesVersion,omitempty"`
+	WindowsPrefixPath   string               `json:"winPrefixPath,omitempty" yaml:"winPrefixPath,omitempty"`
 }
--- 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"`
 }