From 1ebe784395854d9fc5d9d980b9eac2a5ff40d2c3 Mon Sep 17 00:00:00 2001 From: Gazal K Date: Tue, 31 Mar 2020 12:58:16 +1100 Subject: [PATCH] feat: add AWS specific requirements fix #6990 Signed-off-by: Gazal K --- pkg/config/install_requirements.go | 10 ++++++++++ pkg/config/zz_generated.deepcopy.go | 21 +++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/pkg/config/install_requirements.go b/pkg/config/install_requirements.go index 48a21659b3..c2e7efbc9a 100644 --- a/pkg/config/install_requirements.go +++ b/pkg/config/install_requirements.go @@ -282,6 +282,14 @@ type StorageConfig struct { Backup StorageEntryConfig `json:"backup"` } +// AWSConfig contains AWS specific requirements +type AWSConfig struct { + // AccountID the unique 12-digit number assigned to your AWS account + AccountID string `json:"accountId,omitempty"` + // HelmSA if true, ServiceAccounts will be managed by helm and IRSA annotations will be applied for IAM roles + HelmSA bool `json:"helmSa,omitempty"` +} + // AzureConfig contains Azure specific requirements type AzureConfig struct { // RegistrySubscription the registry subscription for defaulting the container registry. @@ -297,6 +305,8 @@ type GKEConfig struct { // ClusterConfig contains cluster specific requirements type ClusterConfig struct { + // AWSConfig the aws specific configuration + AWSConfig *AWSConfig `json:"aws,omitempty"` // AzureConfig the azure specific configuration AzureConfig *AzureConfig `json:"azure,omitempty"` // ChartRepository the repository URL to deploy charts to diff --git a/pkg/config/zz_generated.deepcopy.go b/pkg/config/zz_generated.deepcopy.go index db845beb7c..0751c5a914 100644 --- a/pkg/config/zz_generated.deepcopy.go +++ b/pkg/config/zz_generated.deepcopy.go @@ -9,6 +9,22 @@ import ( v1 "k8s.io/api/core/v1" ) +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AWSConfig) DeepCopyInto(out *AWSConfig) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSConfig. +func (in *AWSConfig) DeepCopy() *AWSConfig { + if in == nil { + return nil + } + out := new(AWSConfig) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AddonConfig) DeepCopyInto(out *AddonConfig) { *out = *in @@ -260,6 +276,11 @@ func (in *ChatConfig) DeepCopy() *ChatConfig { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClusterConfig) DeepCopyInto(out *ClusterConfig) { *out = *in + if in.AWSConfig != nil { + in, out := &in.AWSConfig, &out.AWSConfig + *out = new(AWSConfig) + **out = **in + } if in.AzureConfig != nil { in, out := &in.AzureConfig, &out.AzureConfig *out = new(AzureConfig)