[BOP-1364] use json instead of string for addon values (#96)

* BOP-1364: Use json instead of string for chart Values * Regen manifest
Mirantis · Oct 30, 2024 · eeced5d · eeced5d
1 parent 5318af6
commit eeced5d
Show file tree

Hide file tree

Showing 6 changed files with 964 additions and 377 deletions.
diff --git a/api/v1alpha1/addon_types.go b/api/v1alpha1/addon_types.go
@@ -1,6 +1,7 @@
 package v1alpha1
 
 import (
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
@@ -32,7 +33,7 @@ type ChartInfo struct {
 
 	DependsOn []string                      `json:"dependsOn,omitempty"`
 	Set       map[string]intstr.IntOrString `json:"set,omitempty"`
-	Values    string                        `json:"values,omitempty"`
+	Values    *apiextensionsv1.JSON         `json:"values,omitempty"`
 }
 
 type ManifestInfo struct {

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/blueprint.mirantis.com_addons.yaml b/config/crd/bases/blueprint.mirantis.com_addons.yaml
@@ -62,7 +62,7 @@ spec:
                       x-kubernetes-int-or-string: true
                     type: object
                   values:
-                    type: string
+                    x-kubernetes-preserve-unknown-fields: true
                   version:
                     type: string
                 required:

diff --git a/config/crd/bases/blueprint.mirantis.com_blueprints.yaml b/config/crd/bases/blueprint.mirantis.com_blueprints.yaml
@@ -65,7 +65,7 @@ spec:
                                 x-kubernetes-int-or-string: true
                               type: object
                             values:
-                              type: string
+                              x-kubernetes-preserve-unknown-fields: true
                             version:
                               type: string
                           required: