From 87eca0c71238ebd7d827cf3b4c8c72bebe0ec421 Mon Sep 17 00:00:00 2001
From: Chris Mellard <chrism@datacom.co.nz>
Date: Fri, 25 Sep 2020 21:29:36 +1200
Subject: [PATCH] fix: simplified azure kubernetes external secret config

---
 pkg/config/install_requirements.go  | 12 ---------
 pkg/config/zz_generated.deepcopy.go | 42 -----------------------------
 2 files changed, 54 deletions(-)

diff --git a/pkg/config/install_requirements.go b/pkg/config/install_requirements.go
index b21bccd..0f01273 100644
--- a/pkg/config/install_requirements.go
+++ b/pkg/config/install_requirements.go
@@ -539,16 +539,6 @@ type UserNameEmailConfig struct {
 	Email string `json:"email,omitempty"`
 }
 
-type AzureSecretStorageConfig struct {
-	TenantId     string `json:"tenantId,omitempty"`
-	ClientId     string `json:"clientId,omitempty"`
-	KeyVaultName string `json:"keyVaultName,omitempty"`
-}
-
-type SecretStorageConfig struct {
-	AzureSecretStorage *AzureSecretStorageConfig `json:"azure,omitempty"`
-}
-
 // RequirementsConfig contains the logical installation requirements in the `jx-requirements.yml` file when
 // installing, configuring or upgrading Jenkins X via `jx boot`
 type RequirementsConfig struct {
@@ -580,8 +570,6 @@ type RequirementsConfig struct {
 	Repository RepositoryType `json:"repository,omitempty" envconfig:"JX_REQUIREMENT_REPOSITORY"`
 	// SecretStorage how should we store secrets for the cluster
 	SecretStorage SecretStorageType `json:"secretStorage,omitempty" envconfig:"JX_REQUIREMENT_SECRET_STORAGE_TYPE"`
-	// SecretStorageConfig provide configuration to configure secret storage for the cluster
-	SecretStorageConfig *SecretStorageConfig `json:"secretStorageConfig,omitempty"`
 	// Storage contains storage requirements
 	Storage StorageConfig `json:"storage"`
 	// Terraform specifies if  we are managing the kubernetes cluster and cloud resources with Terraform
diff --git a/pkg/config/zz_generated.deepcopy.go b/pkg/config/zz_generated.deepcopy.go
index 90fe932..c3a0e4f 100644
--- a/pkg/config/zz_generated.deepcopy.go
+++ b/pkg/config/zz_generated.deepcopy.go
@@ -73,22 +73,6 @@ func (in *AzureConfig) DeepCopy() *AzureConfig {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AzureSecretStorageConfig) DeepCopyInto(out *AzureSecretStorageConfig) {
-	*out = *in
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AzureSecretStorageConfig.
-func (in *AzureSecretStorageConfig) DeepCopy() *AzureSecretStorageConfig {
-	if in == nil {
-		return nil
-	}
-	out := new(AzureSecretStorageConfig)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *BuildPackConfig) DeepCopyInto(out *BuildPackConfig) {
 	*out = *in
@@ -265,11 +249,6 @@ func (in *RequirementsConfig) DeepCopyInto(out *RequirementsConfig) {
 		*out = new(UserNameEmailConfig)
 		**out = **in
 	}
-	if in.SecretStorageConfig != nil {
-		in, out := &in.SecretStorageConfig, &out.SecretStorageConfig
-		*out = new(SecretStorageConfig)
-		(*in).DeepCopyInto(*out)
-	}
 	out.Storage = in.Storage
 	in.Vault.DeepCopyInto(&out.Vault)
 	out.Velero = in.Velero
@@ -308,27 +287,6 @@ func (in *RequirementsValues) DeepCopy() *RequirementsValues {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SecretStorageConfig) DeepCopyInto(out *SecretStorageConfig) {
-	*out = *in
-	if in.AzureSecretStorage != nil {
-		in, out := &in.AzureSecretStorage, &out.AzureSecretStorage
-		*out = new(AzureSecretStorageConfig)
-		**out = **in
-	}
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretStorageConfig.
-func (in *SecretStorageConfig) DeepCopy() *SecretStorageConfig {
-	if in == nil {
-		return nil
-	}
-	out := new(SecretStorageConfig)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *StorageConfig) DeepCopyInto(out *StorageConfig) {
 	*out = *in