Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes #22 #46

Merged
merged 3 commits into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ This can be useful in several ways:

Kubernetes: `kubectl get pods`

Argo: Visit https://argocd.idpbuilder.cnoe.io.localtest.me:8443/
Argo: https://argocd.idpbuilder.cnoe.io.localtest.me:8443/

Backstage: http://backstage.idpbuilder.cnoe.io.localtest.me/
Backstage: https://backstage.idpbuilder.cnoe.io.localtest.me:8443/

## Architecture

Expand Down
44 changes: 40 additions & 4 deletions pkg/apps/srv/backstage/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,49 @@ spec:
image: public.ecr.aws/cnoe-io/backstage:v0.0.3
imagePullPolicy: IfNotPresent
ports:
- name: http
- name: backend
containerPort: 7007
volumeMounts:
- mountPath: /app/config
name: backstage-config
readOnly: true
---
---
apiVersion: v1
kind: Service
metadata:
name: backstage
namespace: backstage
spec:
ports:
- name: http-backend
port: 7007
protocol: TCP
targetPort: backend
selector:
app: backstage
sessionAffinity: None
type: ClusterIP
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: backstage
namespace: backstage
spec:
ingressClassName: nginx
rules:
- host: backstage.idpbuilder.cnoe.io.localtest.me
http:
paths:
- backend:
service:
name: backstage
port:
number: 7007
path: /
pathType: Prefix
---
apiVersion: v1
kind: ConfigMap
metadata:
Expand All @@ -116,17 +152,17 @@ data:
app-config.yaml: |
app:
title: CNOE
baseUrl: http://localhost:3000
baseUrl: "https://backstage.idpbuilder.cnoe.io.localtest.me:8443"
organization:
name: CNOE
backend:
baseUrl: http://localhost:7007
baseUrl: "https://backstage.idpbuilder.cnoe.io.localtest.me:8443"
listen:
port: 7007
csp:
connect-src: ["'self'", 'http:', 'https:']
cors:
origin: http://localhost:3000
origin: "https://backstage.idpbuilder.cnoe.io.localtest.me:8443"
methods: [GET, HEAD, PATCH, POST, PUT, DELETE]
credentials: true
database:
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/gitserver/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
const (
gitServerResourceName string = "gitserver"
gitServerDeploymentContainerName string = "httpd"
gitServerIngressHostnameBase string = ".idpbuilder.cnoe.io.local"
gitServerIngressHostnameBase string = ".idpbuilder.cnoe.io.localtest.me"
repoUrlFmt string = "http://%s.%s.svc/idpbuilder-resources.git"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/localbuild/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const (
EmbeddedGitServerName string = "embedded"
gitServerResourceName string = "gitserver"
gitServerDeploymentContainerName string = "httpd"
gitServerIngressHostnameBase string = ".idpbuilder.cnoe.io.local"
gitServerIngressHostnameBase string = ".idpbuilder.cnoe.io.localtest.me"
repoUrlFmt string = "http://%s.%s.svc/idpbuilder-resources.git"
)

Expand Down
Loading