Have charts be specified as raw strings

These aren't large or secret data, so just an inline string is the appropriate typing here.
pluralsh · Jan 2, 2024 · ac096df · ac096df
1 parent 108bca9
commit ac096df
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 60 deletions.
diff --git a/charts/controller/crds/servicedeployment-crd.yaml b/charts/controller/crds/servicedeployment-crd.yaml
@@ -160,23 +160,7 @@ spec:
               helm:
                 properties:
                   chart:
-                    description: Selects a key from a ConfigMap.
-                    properties:
-                      key:
-                        description: The key to select.
-                        type: string
-                      name:
-                        description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                          TODO: Add other useful fields. apiVersion, kind, uid?'
-                        type: string
-                      optional:
-                        description: Specify whether the ConfigMap or its key must
-                          be defined
-                        type: boolean
-                    required:
-                    - key
-                    type: object
-                    x-kubernetes-map-type: atomic
+                    type: string
                   repository:
                     properties:
                       name:
@@ -301,7 +285,6 @@ spec:
             required:
             - clusterRef
             - repositoryRef
-            - version
             type: object
           status:
             properties:

diff --git a/charts/controller/templates/deployment.yaml b/charts/controller/templates/deployment.yaml
@@ -79,4 +79,4 @@ spec:
         seccompProfile:
           type: RuntimeDefault
       serviceAccountName: {{ include "controller.fullname" . }}-controller-manager
-      terminationGracePeriodSeconds: 10
+      terminationGracePeriodSeconds: 10
diff --git a/controller/api/v1alpha1/servicedeployment_types.go.go b/controller/api/v1alpha1/servicedeployment_types.go.go
@@ -33,7 +33,7 @@ type ServiceHelm struct {
 	// +optional
 	ValuesFiles []*string `json:"valuesFiles,omitempty"`
 	// +optional
-	ChartRef *corev1.ConfigMapKeySelector `json:"chart,omitempty"`
+	Chart *string `json:"chart,omitempty"`
 	// +optional
 	Version *string `json:"version,omitempty"`
 	// +optional
@@ -51,6 +51,7 @@ type SyncConfigAttributes struct {
 type ServiceSpec struct {
 	// +optional
 	DocsPath *string `json:"docsPath,omitempty"`
+	// +kubebuilder:validation:Optional
 	// +kubebuilder:default:='0.0.1'
 	Version string `json:"version"`
 	// +optional

diff --git a/controller/api/v1alpha1/zz_generated.deepcopy.go b/controller/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/controller/config/crd/bases/deployments.plural.sh_servicedeployments.yaml b/controller/config/crd/bases/deployments.plural.sh_servicedeployments.yaml
@@ -157,23 +157,7 @@ spec:
               helm:
                 properties:
                   chart:
-                    description: Selects a key from a ConfigMap.
-                    properties:
-                      key:
-                        description: The key to select.
-                        type: string
-                      name:
-                        description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                          TODO: Add other useful fields. apiVersion, kind, uid?'
-                        type: string
-                      optional:
-                        description: Specify whether the ConfigMap or its key must
-                          be defined
-                        type: boolean
-                    required:
-                    - key
-                    type: object
-                    x-kubernetes-map-type: atomic
+                    type: string
                   repository:
                     properties:
                       name:
@@ -298,7 +282,6 @@ spec:
             required:
             - clusterRef
             - repositoryRef
-            - version
             type: object
           status:
             properties:

diff --git a/controller/internal/controller/servicedeployment_controller.go b/controller/internal/controller/servicedeployment_controller.go
@@ -269,12 +269,8 @@ func (r *ServiceReconciler) genServiceAttributes(ctx context.Context, service *v
 			}
 			attr.Helm.Values = &val
 		}
-		if service.Spec.Helm.ChartRef != nil {
-			val, err := utils.GetConfigMapData(ctx, r.Client, service.Namespace, service.Spec.Helm.ChartRef)
-			if err != nil {
-				return nil, err
-			}
-			attr.Helm.Chart = &val
+		if service.Spec.Helm.Chart != nil {
+			attr.Helm.Chart = service.Spec.Helm.Chart
 		}
 	}
 	if service.Spec.SyncConfig != nil {
@@ -331,18 +327,6 @@ func (r *ServiceReconciler) addOwnerReferences(ctx context.Context, service *v1a
 			return err
 		}
 	}
-	if service.Spec.Helm != nil && service.Spec.Helm.ChartRef != nil {
-		configMap := &corev1.ConfigMap{}
-		name := types.NamespacedName{Name: service.Spec.Helm.ChartRef.Name, Namespace: service.Namespace}
-		err := r.Get(ctx, name, configMap)
-		if err != nil {
-			return err
-		}
-		err = utils.TryAddControllerRef(ctx, r.Client, service, configMap, r.Scheme)
-		if err != nil {
-			return err
-		}
-	}
 
 	return nil
 }