feat: add caFile Helm option (#166)

* feat: add CA file Helm option Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com> * feat: add CA file Helm option Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com> --------- Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
validator-labs · Dec 26, 2023 · 2425599 · 2425599
1 parent ad78ea4
commit 2425599
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/api/v1alpha1/validatorconfig_types.go b/api/v1alpha1/validatorconfig_types.go
@@ -43,6 +43,7 @@ type HelmChart struct {
 	Name                  string `json:"name" yaml:"name"`
 	Repository            string `json:"repository" yaml:"repository"`
 	Version               string `json:"version" yaml:"version"`
+	CaFile                string `json:"caFile,omitempty" yaml:"caFile,omitempty"`
 	InsecureSkipTlsVerify bool   `json:"insecureSkipVerify,omitempty" yaml:"insecureSkipVerify,omitempty"`
 	AuthSecretName        string `json:"authSecretName,omitempty" yaml:"authSecretName,omitempty"`
 }

diff --git a/chart/validator/crds/validation.spectrocloud.labs_validatorconfigs.yaml b/chart/validator/crds/validation.spectrocloud.labs_validatorconfigs.yaml
@@ -41,6 +41,8 @@ spec:
                       properties:
                         authSecretName:
                           type: string
+                        caFile:
+                          type: string
                         insecureSkipVerify:
                           type: boolean
                         name:

diff --git a/config/crd/bases/validation.spectrocloud.labs_validatorconfigs.yaml b/config/crd/bases/validation.spectrocloud.labs_validatorconfigs.yaml
@@ -41,6 +41,8 @@ spec:
                       properties:
                         authSecretName:
                           type: string
+                        caFile:
+                          type: string
                         insecureSkipVerify:
                           type: boolean
                         name:

diff --git a/pkg/helm/helm.go b/pkg/helm/helm.go
@@ -196,6 +196,11 @@ func (c *helmClient) run(name, namespace string, options UpgradeOptions, command
 	if options.Atomic {
 		args = append(args, "--atomic")
 	}
+
+	// TLS options
+	if options.CaFile != "" {
+		args = append(args, "--ca-file", options.CaFile)
+	}
 	if options.InsecureSkipTlsVerify {
 		args = append(args, "--insecure-skip-tls-verify")
 	}

diff --git a/pkg/helm/types.go b/pkg/helm/types.go
@@ -67,6 +67,7 @@ type UpgradeOptions struct {
 	Force           bool
 	CreateNamespace bool
 
+	CaFile                string
 	InsecureSkipTlsVerify bool
 
 	ExtraArgs []string