From 42385c756c9fadbaa85b2f7ef9537881ee1ec187 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Mon, 15 Apr 2024 05:12:38 -0700 Subject: [PATCH] Add helm registry cert option (#360) Signed-off-by: Tamal Saha --- apis/installer/v1alpha1/ace_options_types.go | 8 ++++++++ apis/installer/v1alpha1/zz_generated.deepcopy.go | 16 ++++++++++++++++ schema/ace-options/values.openapiv3_schema.yaml | 9 +++++++++ 3 files changed, 33 insertions(+) diff --git a/apis/installer/v1alpha1/ace_options_types.go b/apis/installer/v1alpha1/ace_options_types.go index 6ca55c7f8..031b83526 100644 --- a/apis/installer/v1alpha1/ace_options_types.go +++ b/apis/installer/v1alpha1/ace_options_types.go @@ -95,6 +95,8 @@ type RegistrySpec struct { //+optional Credentials RepositoryCredential `json:"credentials"` //+optional + Certs RepositoryCertificates `json:"certs"` + //+optional Helm HelmOptions `json:"helm"` //+optional AllowNondistributableArtifacts bool `json:"allowNondistributableArtifacts"` @@ -107,6 +109,12 @@ type RepositoryCredential struct { Password string `json:"password"` } +type RepositoryCertificates struct { + CACert string `json:"caCert,omitempty"` + ClientCert string `json:"clientCert,omitempty"` + ClientKey string `json:"clientKey,omitempty"` +} + type HelmOptions struct { // +optional CreateNamespace bool `json:"createNamespace,omitempty"` diff --git a/apis/installer/v1alpha1/zz_generated.deepcopy.go b/apis/installer/v1alpha1/zz_generated.deepcopy.go index 09a4e9290..75bc26819 100644 --- a/apis/installer/v1alpha1/zz_generated.deepcopy.go +++ b/apis/installer/v1alpha1/zz_generated.deepcopy.go @@ -6588,6 +6588,7 @@ func (in *RegistrySpec) DeepCopyInto(out *RegistrySpec) { *out = *in out.Image = in.Image out.Credentials = in.Credentials + out.Certs = in.Certs out.Helm = in.Helm } @@ -7244,6 +7245,21 @@ func (in *ReloaderVerticalPodAutoscaler) DeepCopy() *ReloaderVerticalPodAutoscal return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *RepositoryCertificates) DeepCopyInto(out *RepositoryCertificates) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RepositoryCertificates. +func (in *RepositoryCertificates) DeepCopy() *RepositoryCertificates { + if in == nil { + return nil + } + out := new(RepositoryCertificates) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *RepositoryCredential) DeepCopyInto(out *RepositoryCredential) { *out = *in diff --git a/schema/ace-options/values.openapiv3_schema.yaml b/schema/ace-options/values.openapiv3_schema.yaml index 1e15ead7e..87b1cf9cf 100644 --- a/schema/ace-options/values.openapiv3_schema.yaml +++ b/schema/ace-options/values.openapiv3_schema.yaml @@ -1396,6 +1396,15 @@ properties: properties: allowNondistributableArtifacts: type: boolean + certs: + properties: + caCert: + type: string + clientCert: + type: string + clientKey: + type: string + type: object credentials: properties: password: