From ba9a11d38e93a8a564bedf71879c626a95ff857a Mon Sep 17 00:00:00 2001 From: Matt Nikkel Date: Fri, 4 Sep 2020 11:02:39 -0400 Subject: [PATCH 1/2] Add Secret config fields to vSphere cloud provider --- apis/management.cattle.io/v3/rke_types.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go index 8aa65264..aa595a68 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -573,6 +573,8 @@ type VsphereCloudProvider struct { type GlobalVsphereOpts struct { User string `json:"user,omitempty" yaml:"user,omitempty" ini:"user,omitempty"` Password string `json:"password,omitempty" yaml:"password,omitempty" ini:"password,omitempty" norman:"type=password"` + SecretName string `json:"secret-name,omitempty" yaml:"secret-name,omitempty" ini:"secret-name,omitempty"` + SecretNamespace string `json:"secret-namespace,omitempty" yaml:"secret-namespace,omitempty" ini:"secret-namespace,omitempty"` VCenterIP string `json:"server,omitempty" yaml:"server,omitempty" ini:"server,omitempty"` VCenterPort string `json:"port,omitempty" yaml:"port,omitempty" ini:"port,omitempty"` InsecureFlag bool `json:"insecure-flag,omitempty" yaml:"insecure-flag,omitempty" ini:"insecure-flag,omitempty"` @@ -588,6 +590,8 @@ type GlobalVsphereOpts struct { type VirtualCenterConfig struct { User string `json:"user,omitempty" yaml:"user,omitempty" ini:"user,omitempty"` Password string `json:"password,omitempty" yaml:"password,omitempty" ini:"password,omitempty" norman:"type=password"` + SecretName string `json:"secret-name,omitempty" yaml:"secret-name,omitempty" ini:"secret-name,omitempty"` + SecretNamespace string `json:"secret-namespace,omitempty" yaml:"secret-namespace,omitempty" ini:"secret-namespace,omitempty"` VCenterPort string `json:"port,omitempty" yaml:"port,omitempty" ini:"port,omitempty"` Datacenters string `json:"datacenters,omitempty" yaml:"datacenters,omitempty" ini:"datacenters,omitempty"` RoundTripperCount int `json:"soap-roundtrip-count,omitempty" yaml:"soap-roundtrip-count,omitempty" ini:"soap-roundtrip-count,omitempty"` From 035ec1ad0bed154c7c26d9e9cac5d7eb74ac63f4 Mon Sep 17 00:00:00 2001 From: Matt Nikkel Date: Fri, 4 Sep 2020 11:23:39 -0400 Subject: [PATCH 2/2] Generate files: Add Secret config fields to vSphere cloud provider --- client/management/v3/zz_generated_global_vsphere_opts.go | 4 ++++ client/management/v3/zz_generated_virtual_center_config.go | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/client/management/v3/zz_generated_global_vsphere_opts.go b/client/management/v3/zz_generated_global_vsphere_opts.go index 3b515a06..161b2a6b 100644 --- a/client/management/v3/zz_generated_global_vsphere_opts.go +++ b/client/management/v3/zz_generated_global_vsphere_opts.go @@ -8,6 +8,8 @@ const ( GlobalVsphereOptsFieldInsecureFlag = "insecure-flag" GlobalVsphereOptsFieldPassword = "password" GlobalVsphereOptsFieldRoundTripperCount = "soap-roundtrip-count" + GlobalVsphereOptsFieldSecretName = "secret-name" + GlobalVsphereOptsFieldSecretNamespace = "secret-namespace" GlobalVsphereOptsFieldUser = "user" GlobalVsphereOptsFieldVCenterIP = "server" GlobalVsphereOptsFieldVCenterPort = "port" @@ -23,6 +25,8 @@ type GlobalVsphereOpts struct { InsecureFlag bool `json:"insecure-flag,omitempty" yaml:"insecure-flag,omitempty"` Password string `json:"password,omitempty" yaml:"password,omitempty"` RoundTripperCount int64 `json:"soap-roundtrip-count,omitempty" yaml:"soap-roundtrip-count,omitempty"` + SecretName string `json:"secret-name,omitempty" yaml:"secret-name,omitempty"` + SecretNamespace string `json:"secret-namespace,omitempty" yaml:"secret-namespace,omitempty"` User string `json:"user,omitempty" yaml:"user,omitempty"` VCenterIP string `json:"server,omitempty" yaml:"server,omitempty"` VCenterPort string `json:"port,omitempty" yaml:"port,omitempty"` diff --git a/client/management/v3/zz_generated_virtual_center_config.go b/client/management/v3/zz_generated_virtual_center_config.go index b29d74df..24738fc4 100644 --- a/client/management/v3/zz_generated_virtual_center_config.go +++ b/client/management/v3/zz_generated_virtual_center_config.go @@ -5,6 +5,8 @@ const ( VirtualCenterConfigFieldDatacenters = "datacenters" VirtualCenterConfigFieldPassword = "password" VirtualCenterConfigFieldRoundTripperCount = "soap-roundtrip-count" + VirtualCenterConfigFieldSecretName = "secret-name" + VirtualCenterConfigFieldSecretNamespace = "secret-namespace" VirtualCenterConfigFieldUser = "user" VirtualCenterConfigFieldVCenterPort = "port" ) @@ -13,6 +15,8 @@ type VirtualCenterConfig struct { Datacenters string `json:"datacenters,omitempty" yaml:"datacenters,omitempty"` Password string `json:"password,omitempty" yaml:"password,omitempty"` RoundTripperCount int64 `json:"soap-roundtrip-count,omitempty" yaml:"soap-roundtrip-count,omitempty"` + SecretName string `json:"secret-name,omitempty" yaml:"secret-name,omitempty"` + SecretNamespace string `json:"secret-namespace,omitempty" yaml:"secret-namespace,omitempty"` User string `json:"user,omitempty" yaml:"user,omitempty"` VCenterPort string `json:"port,omitempty" yaml:"port,omitempty"` }