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.

Sign up for GitHub

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

move ingress #91

Merged
merged 3 commits into from
Nov 21, 2023
Merged

move ingress #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
981f515
move ingress
nabuskey Nov 20, 2023
b6700de
fix tests
nabuskey Nov 20, 2023
3d2d4d3
fix test again
nabuskey Nov 21, 2023
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
3 changes: 0 additions & 3 deletions pkg/apps/resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ var (
EmbeddedAppsFS embed.FS

EmbedApps = []EmbedApp{{
Name: "argocd",
Path: "argocd",
}, {
Name: "backstage",
Path: "backstage",
}, {
Expand Down
10 changes: 5 additions & 5 deletions pkg/controllers/localbuild/argo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ func TestGetRawInstallResources(t *testing.T) {
if err != nil {
t.Fatalf("GetRawInstallResources() error: %v", err)
}
if len(resources) != 1 {
t.Fatalf("GetRawInstallResources() resources len != 1, got %d", len(resources))
if len(resources) != 2 {
t.Fatalf("GetRawInstallResources() resources len != 2, got %d", len(resources))
}

resourcePrefix := "# UCP ARGO INSTALL RESOURCES\n"
checkPrefix := resources[0][0:len(resourcePrefix)]
checkPrefix := resources[1][0:len(resourcePrefix)]
if resourcePrefix != string(checkPrefix) {
t.Fatalf("GetRawInstallResources() exptected 1 resource with prefix %q, got %q", resourcePrefix, checkPrefix)
}
Expand All @@ -36,7 +36,7 @@ func TestGetK8sInstallResources(t *testing.T) {
t.Fatalf("GetK8sInstallResources() error: %v", err)
}

if len(objs) != 55 {
t.Fatalf("Expected 57 Argo Install Resources, got: %d", len(objs))
if len(objs) != 56 {
t.Fatalf("Expected 56 Argo Install Resources, got: %d", len(objs))
}
}
20 changes: 10 additions & 10 deletions pkg/apps/srv/argocd/ingress.yaml → ...rs/localbuild/resources/argo/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ metadata:
spec:
ingressClassName: "nginx"
rules:
- host: argocd.cnoe.localtest.me
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: argocd-server
port:
name: https
- host: argocd.cnoe.localtest.me
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: argocd-server
port:
name: https