fix rebasing issue

Author: Diaphteiros

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

@@ -229,6 +229,11 @@ spec:
                         required:
                         - name
                         type: object
+                      serviceAccountName:
+                        description: |-
+                          ServiceAccountName is the name of the Kubernetes ServiceAccount used to
+                          authenticate to the GitRepository. This field is only supported for 'azure' provider.
+                        type: string
                       sparseCheckout:
                         description: |-
                           SparseCheckout specifies a list of directories to checkout when cloning
@@ -290,6 +295,11 @@ spec:
                     - interval
                     - url
                     type: object
+                    x-kubernetes-validations:
+                    - message: serviceAccountName can only be set when provider is
+                        'azure'
+                      rule: '!has(self.serviceAccountName) || (has(self.provider)
+                        && self.provider == ''azure'')'
                   helm:
                     description: |-
                       HelmRepositorySpec specifies the required configuration to produce an

internal/controllers/cluster/controller.go

@@ -563,7 +563,7 @@ func (r *ClusterReconciler) deployHelmRelease(ctx context.Context, c *clustersv1
 		hr.Spec.Upgrade.Remediation.Retries = 3
 		// reference Cluster kubeconfig
 		hr.Spec.KubeConfig = &fluxmeta.KubeConfigReference{
-			SecretRef: fluxmeta.SecretKeyReference{
+			SecretRef: &fluxmeta.SecretKeyReference{
 				Name: rr.AccessRequest.Status.SecretRef.Name,
 				Key:  clustersv1alpha1.SecretKeyKubeconfig,
 			},