fix oci source use-case

Author: Diaphteiros

api/crds/manifests/dns.openmcp.cloud_dnsserviceconfigs.yaml

@@ -103,9 +103,9 @@ spec:
                   chartName:
                     description: |-
                       ChartName specifies the name of the external-dns chart.
-                      Depending on the source, this can also be a relative path within the repository.
-                      When using a source that needs a version (helm or oci), append the version to the chart name using '@', e.g. '[email protected]' or omit for latest version.
-                    minLength: 1
+                      Can be omitted for oci sources, required for git and helm sources.
+                      For git sources, this is the path within the git repository to the chart.
+                      For helm sources, append the version to the chart name using '@', e.g. '[email protected]' or omit for latest version.
                     type: string
                   git:
                     description: |-
@@ -639,10 +639,11 @@ spec:
                     - interval
                     - url
                     type: object
-                required:
-                - chartName
                 type: object
                 x-kubernetes-validations:
+                - message: chartName must be set if git is used as source
+                  rule: '(has(self.git) || has(self.helm)) ? (has(self.chartName)
+                    && size(self.chartName) > 0) : true'
                 - message: exactly one of the fields in [helm git oci] must be set
                   rule: '[has(self.helm),has(self.git),has(self.oci)].filter(x,x==true).size()
                     == 1'

api/dns/v1alpha1/config_types.go

@@ -49,11 +49,13 @@ type SecretsToCopy struct {
 // Exactly one of 'HelmRepository', 'GitRepository' or 'OCIRepository' must be set.
 // If 'copyAuthSecret' is set, the referenced source secret is copied into the namespace where the Flux resources are created with the specified target name.
 // +kubebuilder:validation:ExactlyOneOf=helm;git;oci
+// +kubebuilder:validation:XValidation:rule="(has(self.git) || has(self.helm)) ? (has(self.chartName) && size(self.chartName) > 0) : true", message="chartName must be set if git is used as source"
 type ExternalDNSSource struct {
 	// ChartName specifies the name of the external-dns chart.
-	// Depending on the source, this can also be a relative path within the repository.
-	// When using a source that needs a version (helm or oci), append the version to the chart name using '@', e.g. '[email protected]' or omit for latest version.
-	// +kubebuilder:validation:MinLength=1
+	// Can be omitted for oci sources, required for git and helm sources.
+	// For git sources, this is the path within the git repository to the chart.
+	// For helm sources, append the version to the chart name using '@', e.g. '[email protected]' or omit for latest version.
+	// +optional
 	ChartName string                     `json:"chartName"`
 	Helm      *fluxv1.HelmRepositorySpec `json:"helm,omitempty"`
 	Git       *fluxv1.GitRepositorySpec  `json:"git,omitempty"`

internal/controllers/cluster/controller.go

@@ -47,9 +47,15 @@ import (
 	dnsv1alpha1 "github.com/openmcp-project/platform-service-dns/api/dns/v1alpha1"
 )
 
-const ControllerName = "DNSCluster"
-const defaultRequeueAfterDuration = 30 * time.Second
-const TargetClusterNamespace = "external-dns"
+const (
+	ControllerName              = "DNSCluster"
+	defaultRequeueAfterDuration = 30 * time.Second
+	TargetClusterNamespace      = "external-dns"
+
+	SourceKindHelmRepository = "HelmRepository"
+	SourceKindGitRepository  = "GitRepository"
+	SourceKindOCIRepository  = "OCIRepository"
+)
 
 type ClusterReconciler struct {
 	PlatformCluster    *clusters.Cluster
@@ -558,7 +564,7 @@ func (r *ClusterReconciler) deployHelmChartSource(ctx context.Context, c *cluste
 			helmRepo.Spec = *rr.ProviderConfig.Spec.ExternalDNSSource.Helm.DeepCopy()
 			return nil
 		}
-		rr.SourceKind = "HelmRepository"
+		rr.SourceKind = SourceKindHelmRepository
 		for i := range existingHelm.Items {
 			obj := &existingHelm.Items[i]
 			if obj.GetName() != sourceName {
@@ -577,7 +583,7 @@ func (r *ClusterReconciler) deployHelmChartSource(ctx context.Context, c *cluste
 			gitRepo.Spec = *rr.ProviderConfig.Spec.ExternalDNSSource.Git.DeepCopy()
 			return nil
 		}
-		rr.SourceKind = "GitRepository"
+		rr.SourceKind = SourceKindGitRepository
 		for i := range existingGit.Items {
 			obj := &existingGit.Items[i]
 			if obj.GetName() != sourceName {
@@ -596,7 +602,7 @@ func (r *ClusterReconciler) deployHelmChartSource(ctx context.Context, c *cluste
 			ociRepo.Spec = *rr.ProviderConfig.Spec.ExternalDNSSource.OCI.DeepCopy()
 			return nil
 		}
-		rr.SourceKind = "OCIRepository"
+		rr.SourceKind = SourceKindOCIRepository
 		for i := range existingOCI.Items {
 			obj := &existingOCI.Items[i]
 			if obj.GetName() != sourceName {
@@ -655,20 +661,31 @@ func (r *ClusterReconciler) deployHelmRelease(ctx context.Context, c *clustersv1
 		// labels
 		hr.Labels = maputils.Merge(hr.Labels, expectedLabels)
 		// chart
-		hr.Spec.Chart = &fluxhelmv2.HelmChartTemplate{
-			Spec: fluxhelmv2.HelmChartTemplateSpec{
-				SourceRef: fluxhelmv2.CrossNamespaceObjectReference{
-					APIVersion: fluxsourcev1.SchemeBuilder.GroupVersion.String(),
-					Kind:       rr.SourceKind,
-					Name:       hr.Name,
-					Namespace:  hr.Namespace,
+		if rr.SourceKind == SourceKindOCIRepository {
+			hr.Spec.Chart = nil
+			hr.Spec.ChartRef = &fluxhelmv2.CrossNamespaceSourceReference{
+				APIVersion: fluxsourcev1.SchemeBuilder.GroupVersion.String(),
+				Kind:       rr.SourceKind,
+				Name:       hr.Name,
+				Namespace:  hr.Namespace,
+			}
+		} else {
+			hr.Spec.ChartRef = nil
+			hr.Spec.Chart = &fluxhelmv2.HelmChartTemplate{
+				Spec: fluxhelmv2.HelmChartTemplateSpec{
+					SourceRef: fluxhelmv2.CrossNamespaceObjectReference{
+						APIVersion: fluxsourcev1.SchemeBuilder.GroupVersion.String(),
+						Kind:       rr.SourceKind,
+						Name:       hr.Name,
+						Namespace:  hr.Namespace,
+					},
 				},
-			},
-		}
-		chartNameVersion := strings.Split(rr.ProviderConfig.Spec.ExternalDNSSource.ChartName, "@")
-		hr.Spec.Chart.Spec.Chart = chartNameVersion[0]
-		if len(chartNameVersion) > 1 {
-			hr.Spec.Chart.Spec.Version = chartNameVersion[1]
+			}
+			chartNameVersion := strings.Split(rr.ProviderConfig.Spec.ExternalDNSSource.ChartName, "@")
+			hr.Spec.Chart.Spec.Chart = chartNameVersion[0]
+			if len(chartNameVersion) > 1 {
+				hr.Spec.Chart.Spec.Version = chartNameVersion[1]
+			}
 		}
 		// release information
 		hr.Spec.ReleaseName = "external-dns"
@@ -797,19 +814,19 @@ func (r *ClusterReconciler) undeployHelmChartSource(ctx context.Context, c *clus
 	toBeDeleted := []client.Object{}
 	toBeDeleted = append(toBeDeleted, collections.ProjectSliceToSlice(existingHelm.Items, func(obj fluxsourcev1.HelmRepository) client.Object {
 		if obj.GetObjectKind().GroupVersionKind().Kind == "" {
-			obj.SetGroupVersionKind(schema.GroupVersionKind{Group: fluxsourcev1.GroupVersion.Group, Version: fluxsourcev1.GroupVersion.Version, Kind: "HelmRepository"})
+			obj.SetGroupVersionKind(schema.GroupVersionKind{Group: fluxsourcev1.GroupVersion.Group, Version: fluxsourcev1.GroupVersion.Version, Kind: SourceKindHelmRepository})
 		}
 		return &obj
 	})...)
 	toBeDeleted = append(toBeDeleted, collections.ProjectSliceToSlice(existingGit.Items, func(obj fluxsourcev1.GitRepository) client.Object {
 		if obj.GetObjectKind().GroupVersionKind().Kind == "" {
-			obj.SetGroupVersionKind(schema.GroupVersionKind{Group: fluxsourcev1.GroupVersion.Group, Version: fluxsourcev1.GroupVersion.Version, Kind: "GitRepository"})
+			obj.SetGroupVersionKind(schema.GroupVersionKind{Group: fluxsourcev1.GroupVersion.Group, Version: fluxsourcev1.GroupVersion.Version, Kind: SourceKindGitRepository})
 		}
 		return &obj
 	})...)
 	toBeDeleted = append(toBeDeleted, collections.ProjectSliceToSlice(existingOCI.Items, func(obj fluxsourcev1.OCIRepository) client.Object {
 		if obj.GetObjectKind().GroupVersionKind().Kind == "" {
-			obj.SetGroupVersionKind(schema.GroupVersionKind{Group: fluxsourcev1.GroupVersion.Group, Version: fluxsourcev1.GroupVersion.Version, Kind: "OCIRepository"})
+			obj.SetGroupVersionKind(schema.GroupVersionKind{Group: fluxsourcev1.GroupVersion.Group, Version: fluxsourcev1.GroupVersion.Version, Kind: SourceKindOCIRepository})
 		}
 		return &obj
 	})...)