Fix conflicts

Signed-off-by: Rizwana777 <rizwananaaz177@gmail.com>

controllers/argocd/route.go

@@ -393,6 +393,11 @@ func shortenHostname(hostname string) (string, error) {
 	// Check and truncate the FIRST label if longer than 63 characters
 	if len(labels[0]) > 63 {
 		labels[0] = labels[0][:63]
+
+		// Check if the FIRST label is < 20 after truncating and return an error if true
+		if len(labels[0]) < 20 {
+			return "", fmt.Errorf("first label length is less than 20 characters")
+		}
 	}
 
 	// Check other labels and return an error if any is longer than 63 characters

controllers/argocd/route_test.go

@@ -221,9 +221,9 @@ func TestReconcileRouteForShorteningHostname(t *testing.T) {
 	ctx := context.Background()
 	logf.SetLogger(ZapLogger(true))
 	hostname := "myhostnameaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.redhat.com"
-
 	argoCD := makeArgoCD(func(a *argoproj.ArgoCD) {
 		a.Spec.Server.Route.Enabled = true
+		a.Spec.Server.Host = hostname
 		a.Spec.ApplicationSet = &argoproj.ArgoCDApplicationSet{
 			WebhookServer: argoproj.WebhookServerSpec{
 				Route: argoproj.ArgoCDRouteSpec{