works

hack/argo-cd/ingress.yaml.tmpl

@@ -12,7 +12,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: {{ .Host }}
+    - host: {{ .IngressHost }}
       http:
         paths:
           - path: /argocd(/|$)(.*)
@@ -36,7 +36,7 @@ metadata:
 spec:
   ingressClassName: "nginx"
   rules:
-    - host: argocd.{{ .Host }}
+    - host: argocd.{{ .IngressHost }}
       http:
         paths:
           - path: /

hack/gitea/ingress.yaml.tmpl

@@ -12,7 +12,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: {{ .Host }}
+    - host: {{ .IngressHost }}
       http:
         paths:
           - backend:
@@ -34,7 +34,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: gitea.{{ .Host }}
+    - host: gitea.{{ .IngressHost }}
       http:
         paths:
           - path: /

pkg/cmd/create/root.go

@@ -28,6 +28,7 @@ var (
 	noExit            bool
 	protocol          string
 	host              string
+	ingressHost       string
 	port              string
 	pathRouting       bool
 )
@@ -47,6 +48,7 @@ func init() {
 	CreateCmd.PersistentFlags().StringVar(&extraPortsMapping, "extra-ports", "", "List of extra ports to expose on the docker container and kubernetes cluster as nodePort (e.g. \"22:32222,9090:39090,etc\").")
 	CreateCmd.PersistentFlags().StringVar(&kindConfigPath, "kind-config", "", "Path of the kind config file to be used instead of the default.")
 	CreateCmd.PersistentFlags().StringVar(&host, "host", "cnoe.localtest.me", "Host name to access resources in this cluster.")
+	CreateCmd.PersistentFlags().StringVar(&ingressHost, "ingress-host-name", "", "Host name used by ingresses. Useful when you have another proxy infront of idpbuilder.")
 	CreateCmd.PersistentFlags().StringVar(&protocol, "protocol", "https", "Protocol to use to access web UIs. http or https.")
 	CreateCmd.PersistentFlags().StringVar(&port, "port", "8443", "Port number under which idpBuilder tools are accessible.")
 	CreateCmd.PersistentFlags().BoolVar(&pathRouting, "use-path-routing", false, "When set to true, web UIs are exposed under single domain name.")
@@ -66,6 +68,9 @@ func create(cmd *cobra.Command, args []string) error {
 
 	protocol = strings.ToLower(protocol)
 	host = strings.ToLower(host)
+	if ingressHost == "" {
+		ingressHost = host
+	}
 
 	err := validate()
 	if err != nil {
@@ -91,6 +96,7 @@ func create(cmd *cobra.Command, args []string) error {
 		util.CorePackageTemplateConfig{
 			Protocol:       protocol,
 			Host:           host,
+			IngressHost:    ingressHost,
 			Port:           port,
 			UsePathRouting: pathRouting,
 		},

pkg/controllers/gitrepository/controller.go

@@ -184,10 +184,10 @@ func (r *RepositoryReconciler) reconcileRepoContent(ctx context.Context, repo *v
 		// if we cannot clone with gitea's configured url, then we fallback to using the url provided in spec.
 		logger.V(1).Info("failed cloning with returned clone URL. Falling back to default url.", "err", err)
 
-		cloneOptions.URL = fmt.Sprintf("%s://%s:%s/%s.git", r.Config.Protocol, repo.Spec.GitURL, r.Config.Port, giteaRepo.FullName)
+		cloneOptions.URL = fmt.Sprintf("%s/%s.git", repo.Spec.GitURL, giteaRepo.FullName)
 		c, retErr := git.PlainClone(tempDir, false, cloneOptions)
 		if retErr != nil {
-			return fmt.Errorf("cloning repo fall back url: %w", err)
+			return fmt.Errorf("cloning repo with fall back url: %w", retErr)
 		}
 		clonedRepo = c
 	}

pkg/controllers/localbuild/resources/argo/ingress.yaml

@@ -12,7 +12,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: {{ .Host }}
+    - host: {{ .IngressHost }}
       http:
         paths:
           - path: /argocd(/|$)(.*)
@@ -36,7 +36,7 @@ metadata:
 spec:
   ingressClassName: "nginx"
   rules:
-    - host: argocd.{{ .Host }}
+    - host: argocd.{{ .IngressHost }}
       http:
         paths:
           - path: /

pkg/controllers/localbuild/resources/gitea/k8s/install.yaml

@@ -566,7 +566,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: {{ .Host }}
+    - host: {{ .IngressHost }}
       http:
         paths:
           - backend:
@@ -588,7 +588,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: gitea.{{ .Host }}
+    - host: gitea.{{ .IngressHost }}
       http:
         paths:
           - path: /

pkg/util/build_config.go

@@ -3,6 +3,7 @@ package util
 type CorePackageTemplateConfig struct {
 	Protocol       string
 	Host           string
+	IngressHost    string
 	Port           string
 	UsePathRouting bool
 }