From 51436a09a33417d5d7c727052ec67f892159f4d7 Mon Sep 17 00:00:00 2001 From: Omar Date: Mon, 23 Oct 2023 11:54:04 +0100 Subject: [PATCH 1/5] Shorten base hostnames --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 531a8425..a6af065c 100644 --- a/README.md +++ b/README.md @@ -27,9 +27,9 @@ This can be useful in several ways: Kubernetes: `kubectl get pods` -Argo: https://argocd.idpbuilder.cnoe.io.localtest.me:8443/ +Argo: https://argocd.cnoe.localtest.me:8443/ -Backstage: https://backstage.idpbuilder.cnoe.io.localtest.me:8443/ +Backstage: https://backstage.cnoe.localtest.me:8443/ ## Architecture From d85814f03dc2db2802c410b627b2035b6ede84dc Mon Sep 17 00:00:00 2001 From: Omar Date: Mon, 23 Oct 2023 11:55:07 +0100 Subject: [PATCH 2/5] Shorten base hostnames --- pkg/apps/srv/argocd/ingress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/apps/srv/argocd/ingress.yaml b/pkg/apps/srv/argocd/ingress.yaml index 7b17b118..5ac96cd3 100644 --- a/pkg/apps/srv/argocd/ingress.yaml +++ b/pkg/apps/srv/argocd/ingress.yaml @@ -10,7 +10,7 @@ metadata: spec: ingressClassName: "nginx" rules: - - host: argocd.idpbuilder.cnoe.io.localtest.me + - host: argocd.cnoe.localtest.me http: paths: - path: / From 0b55705d45d2e4fd7997eae547cd433c97b25603 Mon Sep 17 00:00:00 2001 From: Omar Date: Mon, 23 Oct 2023 11:56:19 +0100 Subject: [PATCH 3/5] Shorten base hostnames --- pkg/apps/srv/backstage/install.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/apps/srv/backstage/install.yaml b/pkg/apps/srv/backstage/install.yaml index 959b07fa..fb960b2d 100644 --- a/pkg/apps/srv/backstage/install.yaml +++ b/pkg/apps/srv/backstage/install.yaml @@ -130,7 +130,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: backstage.idpbuilder.cnoe.io.localtest.me + - host: backstage.cnoe.localtest.me http: paths: - backend: @@ -152,17 +152,17 @@ data: app-config.yaml: | app: title: CNOE - baseUrl: "https://backstage.idpbuilder.cnoe.io.localtest.me:8443" + baseUrl: "https://backstage.cnoe.localtest.me:8443" organization: name: CNOE backend: - baseUrl: "https://backstage.idpbuilder.cnoe.io.localtest.me:8443" + baseUrl: "https://backstage.cnoe.localtest.me:8443" listen: port: 7007 csp: connect-src: ["'self'", 'http:', 'https:'] cors: - origin: "https://backstage.idpbuilder.cnoe.io.localtest.me:8443" + origin: "https://backstage.cnoe.localtest.me:8443" methods: [GET, HEAD, PATCH, POST, PUT, DELETE] credentials: true database: From 8fe7d8e7caa3dd0caa1c43ef34480c3009997ea7 Mon Sep 17 00:00:00 2001 From: Omar Date: Mon, 23 Oct 2023 11:57:10 +0100 Subject: [PATCH 4/5] Shorten base hostnames --- pkg/controllers/gitserver/controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controllers/gitserver/controller.go b/pkg/controllers/gitserver/controller.go index 72cb5a10..dc112c5b 100644 --- a/pkg/controllers/gitserver/controller.go +++ b/pkg/controllers/gitserver/controller.go @@ -23,7 +23,7 @@ import ( const ( gitServerResourceName string = "gitserver" gitServerDeploymentContainerName string = "httpd" - gitServerIngressHostnameBase string = ".idpbuilder.cnoe.io.localtest.me" + gitServerIngressHostnameBase string = ".cnoe.localtest.me" repoUrlFmt string = "http://%s.%s.svc/idpbuilder-resources.git" ) From 89efd2d2ea2bd7f4607f71402cfe46886160cabb Mon Sep 17 00:00:00 2001 From: Omar Date: Mon, 23 Oct 2023 11:57:40 +0100 Subject: [PATCH 5/5] Shorten base hostnames --- pkg/controllers/localbuild/controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controllers/localbuild/controller.go b/pkg/controllers/localbuild/controller.go index f89f81e0..74fc89de 100644 --- a/pkg/controllers/localbuild/controller.go +++ b/pkg/controllers/localbuild/controller.go @@ -24,7 +24,7 @@ const ( EmbeddedGitServerName string = "embedded" gitServerResourceName string = "gitserver" gitServerDeploymentContainerName string = "httpd" - gitServerIngressHostnameBase string = ".idpbuilder.cnoe.io.localtest.me" + gitServerIngressHostnameBase string = ".cnoe.localtest.me" repoUrlFmt string = "http://%s.%s.svc/idpbuilder-resources.git" )