File tree Expand file tree Collapse file tree 2 files changed +6
-1
lines changed
Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Original file line number Diff line number Diff line change 1+ Fixed a bug that caused the CONTENT_ORIGIN scheme to always be https.
Original file line number Diff line number Diff line change @@ -446,12 +446,16 @@ func (r *RepoManagerReconciler) isNginxIngress(pulp *repomanagerpulpprojectorgv1
446446
447447// getRootURL handles user facing URLs
448448func getRootURL (resource controllers.FunctionResources ) string {
449+ scheme := "https"
449450 if isIngress (resource .Pulp ) {
451+ if resource .Pulp .Spec .IngressTLSSecret == "" {
452+ scheme = "http"
453+ }
450454 hostname := resource .Pulp .Spec .IngressHost
451455 if len (resource .Pulp .Spec .Hostname ) > 0 { // [DEPRECATED] Temporarily adding to keep compatibility with ansible version.
452456 hostname = resource .Pulp .Spec .Hostname
453457 }
454- return "https ://" + hostname
458+ return scheme + " ://" + hostname
455459 }
456460 if isRoute (resource .Pulp ) {
457461 return "https://" + pulp_ocp .GetRouteHost (resource .Pulp )
You can’t perform that action at this time.
0 commit comments