Skip to content

Commit

Permalink
feat: remove useless routed stargate service
Browse files Browse the repository at this point in the history
  • Loading branch information
@gfyrag
gfyrag committed Sep 28, 2023
1 parent abdc4f2 commit 9bc77fa
Show file tree
Hide file tree
Showing 21 changed files with 4 additions and 236 deletions.
2 changes: 0 additions & 2 deletions ...rs/stack/testdata/monopod-disabled-one-service/results/configmaps--v1/gateway-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ data:
import handle_path_route_with_auth /api/payments 127.0.0.1:10002
import handle_path_route_with_auth /api/search 127.0.0.1:10003
import handle_path_route_with_auth /api/search-benthos 127.0.0.1:4195
import handle_path_route_with_auth /api/stargate 127.0.0.1:10004
import handle_path_route_with_auth /api/wallets 127.0.0.1:10005
import handle_path_route_with_auth /api/webhooks 127.0.0.1:10006
Expand All @@ -81,7 +80,6 @@ data:
auth http://127.0.0.1:10001/_info http://127.0.0.1:10001/_healthcheck
payments http://127.0.0.1:10002/_info http://127.0.0.1:10002/_health
search http://127.0.0.1:10003/_info http://127.0.0.1:10003/_healthcheck
stargate http://127.0.0.1:10004/_info http://127.0.0.1:10004/_healthcheck
wallets http://127.0.0.1:10005/_info http://127.0.0.1:10005/_healthcheck
webhooks http://127.0.0.1:10006/_info http://127.0.0.1:10006/_healthcheck
}
Expand Down
24 changes: 0 additions & 24 deletions ...ontrollers/stack/testdata/monopod-disabled-one-service/results/services--v1/stargate.yaml
View file

This file was deleted.

2 changes: 0 additions & 2 deletions ...rnal/controllers/stack/testdata/monopod-latest/results/configmaps--v1/gateway-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ data:
import handle_path_route_with_auth /api/payments 127.0.0.1:10003
import handle_path_route_with_auth /api/search 127.0.0.1:10004
import handle_path_route_with_auth /api/search-benthos 127.0.0.1:4195
import handle_path_route_with_auth /api/stargate 127.0.0.1:10005
import handle_path_route_with_auth /api/wallets 127.0.0.1:10006
import handle_path_route_with_auth /api/webhooks 127.0.0.1:10007
Expand All @@ -85,7 +84,6 @@ data:
orchestration http://127.0.0.1:8080/_info http://127.0.0.1:8080/_healthcheck
payments http://127.0.0.1:10003/_info http://127.0.0.1:10003/_health
search http://127.0.0.1:10004/_info http://127.0.0.1:10004/_healthcheck
stargate http://127.0.0.1:10005/_info http://127.0.0.1:10005/_healthcheck
wallets http://127.0.0.1:10006/_info http://127.0.0.1:10006/_healthcheck
webhooks http://127.0.0.1:10007/_info http://127.0.0.1:10007/_healthcheck
}
Expand Down
24 changes: 0 additions & 24 deletions ...tor/internal/controllers/stack/testdata/monopod-latest/results/services--v1/stargate.yaml
View file

This file was deleted.

2 changes: 0 additions & 2 deletions ...al/controllers/stack/testdata/monopod-ledgerv1/results/configmaps--v1/gateway-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ data:
import handle_path_route_with_auth /api/payments 127.0.0.1:10003
import handle_path_route_with_auth /api/search 127.0.0.1:10004
import handle_path_route_with_auth /api/search-benthos 127.0.0.1:4195
import handle_path_route_with_auth /api/stargate 127.0.0.1:10005
import handle_path_route_with_auth /api/wallets 127.0.0.1:10006
import handle_path_route_with_auth /api/webhooks 127.0.0.1:10007
Expand All @@ -85,7 +84,6 @@ data:
orchestration http://127.0.0.1:8080/_info http://127.0.0.1:8080/_healthcheck
payments http://127.0.0.1:10003/_info http://127.0.0.1:10003/_health
search http://127.0.0.1:10004/_info http://127.0.0.1:10004/_healthcheck
stargate http://127.0.0.1:10005/_info http://127.0.0.1:10005/_healthcheck
wallets http://127.0.0.1:10006/_info http://127.0.0.1:10006/_healthcheck
webhooks http://127.0.0.1:10007/_info http://127.0.0.1:10007/_healthcheck
}
Expand Down
24 changes: 0 additions & 24 deletions ...r/internal/controllers/stack/testdata/monopod-ledgerv1/results/services--v1/stargate.yaml
View file

This file was deleted.

2 changes: 0 additions & 2 deletions ...rs/stack/testdata/monopod-search-before-v0.7.0/results/configmaps--v1/gateway-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ data:
import handle_path_route_with_auth /api/payments 127.0.0.1:10003
import handle_path_route_with_auth /api/search 127.0.0.1:10004
import handle_path_route_with_auth /api/search-benthos 127.0.0.1:4195
import handle_path_route_with_auth /api/stargate 127.0.0.1:10005
import handle_path_route_with_auth /api/wallets 127.0.0.1:10006
import handle_path_route_with_auth /api/webhooks 127.0.0.1:10007
Expand All @@ -85,7 +84,6 @@ data:
orchestration http://127.0.0.1:8080/_info http://127.0.0.1:8080/_healthcheck
payments http://127.0.0.1:10003/_info http://127.0.0.1:10003/_health
search http://127.0.0.1:10004/_info http://127.0.0.1:10004/_healthcheck
stargate http://127.0.0.1:10005/_info http://127.0.0.1:10005/_healthcheck
wallets http://127.0.0.1:10006/_info http://127.0.0.1:10006/_healthcheck
webhooks http://127.0.0.1:10007/_info http://127.0.0.1:10007/_healthcheck
}
Expand Down
24 changes: 0 additions & 24 deletions ...ontrollers/stack/testdata/monopod-search-before-v0.7.0/results/services--v1/stargate.yaml
View file

This file was deleted.

2 changes: 0 additions & 2 deletions ...rnal/controllers/stack/testdata/multipod-debug/results/configmaps--v1/gateway-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ data:
import handle_path_route_with_auth /api/payments payments:8080
import handle_path_route_with_auth /api/search search:8080
import handle_path_route_with_auth /api/search-benthos search-benthos:4195
import handle_path_route_with_auth /api/stargate stargate:8080
import handle_path_route_with_auth /api/wallets wallets:8080
import handle_path_route_with_auth /api/webhooks webhooks:8080
Expand All @@ -86,7 +85,6 @@ data:
orchestration http://orchestration:8080/_info http://orchestration:8080/_healthcheck
payments http://payments:8080/_info http://payments:8080/_health
search http://search:8080/_info http://search:8080/_healthcheck
stargate http://stargate:8080/_info http://stargate:8080/_healthcheck
wallets http://wallets:8080/_info http://wallets:8080/_healthcheck
webhooks http://webhooks:8080/_info http://webhooks:8080/_healthcheck
}
Expand Down
24 changes: 0 additions & 24 deletions ...tor/internal/controllers/stack/testdata/multipod-debug/results/services--v1/stargate.yaml
View file

This file was deleted.

2 changes: 0 additions & 2 deletions ...s/stack/testdata/multipod-disabled-one-service/results/configmaps--v1/gateway-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ data:
import handle_path_route_with_auth /api/payments payments:8080
import handle_path_route_with_auth /api/search search:8080
import handle_path_route_with_auth /api/search-benthos search-benthos:4195
import handle_path_route_with_auth /api/stargate stargate:8080
import handle_path_route_with_auth /api/wallets wallets:8080
import handle_path_route_with_auth /api/webhooks webhooks:8080
Expand All @@ -83,7 +82,6 @@ data:
ledger http://ledger:8080/_info http://ledger:8080/_healthcheck
payments http://payments:8080/_info http://payments:8080/_health
search http://search:8080/_info http://search:8080/_healthcheck
stargate http://stargate:8080/_info http://stargate:8080/_healthcheck
wallets http://wallets:8080/_info http://wallets:8080/_healthcheck
webhooks http://webhooks:8080/_info http://webhooks:8080/_healthcheck
}
Expand Down
24 changes: 0 additions & 24 deletions ...ntrollers/stack/testdata/multipod-disabled-one-service/results/services--v1/stargate.yaml
View file

This file was deleted.

2 changes: 0 additions & 2 deletions ...s/stack/testdata/multipod-latest-no-monitoring/results/configmaps--v1/gateway-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ data:
import handle_path_route_with_auth /api/payments payments:8080
import handle_path_route_with_auth /api/search search:8080
import handle_path_route_with_auth /api/search-benthos search-benthos:4195
import handle_path_route_with_auth /api/stargate stargate:8080
import handle_path_route_with_auth /api/wallets wallets:8080
import handle_path_route_with_auth /api/webhooks webhooks:8080
Expand All @@ -85,7 +84,6 @@ data:
orchestration http://orchestration:8080/_info http://orchestration:8080/_healthcheck
payments http://payments:8080/_info http://payments:8080/_health
search http://search:8080/_info http://search:8080/_healthcheck
stargate http://stargate:8080/_info http://stargate:8080/_healthcheck
wallets http://wallets:8080/_info http://wallets:8080/_healthcheck
webhooks http://webhooks:8080/_info http://webhooks:8080/_healthcheck
}
Expand Down
24 changes: 0 additions & 24 deletions ...ntrollers/stack/testdata/multipod-latest-no-monitoring/results/services--v1/stargate.yaml
View file

This file was deleted.

2 changes: 0 additions & 2 deletions ...nal/controllers/stack/testdata/multipod-latest/results/configmaps--v1/gateway-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ data:
import handle_path_route_with_auth /api/payments payments:8080
import handle_path_route_with_auth /api/search search:8080
import handle_path_route_with_auth /api/search-benthos search-benthos:4195
import handle_path_route_with_auth /api/stargate stargate:8080
import handle_path_route_with_auth /api/wallets wallets:8080
import handle_path_route_with_auth /api/webhooks webhooks:8080
Expand All @@ -85,7 +84,6 @@ data:
orchestration http://orchestration:8080/_info http://orchestration:8080/_healthcheck
payments http://payments:8080/_info http://payments:8080/_health
search http://search:8080/_info http://search:8080/_healthcheck
stargate http://stargate:8080/_info http://stargate:8080/_healthcheck
wallets http://wallets:8080/_info http://wallets:8080/_healthcheck
webhooks http://webhooks:8080/_info http://webhooks:8080/_healthcheck
}
Expand Down
24 changes: 0 additions & 24 deletions ...or/internal/controllers/stack/testdata/multipod-latest/results/services--v1/stargate.yaml
View file

This file was deleted.

2 changes: 0 additions & 2 deletions ...ers/stack/testdata/multipod-service-annotation/results/configmaps--v1/gateway-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ data:
import handle_path_route_with_auth /api/payments payments:8080
import handle_path_route_with_auth /api/search search:8080
import handle_path_route_with_auth /api/search-benthos search-benthos:4195
import handle_path_route_with_auth /api/stargate stargate:8080
import handle_path_route_with_auth /api/wallets wallets:8080
import handle_path_route_with_auth /api/webhooks webhooks:8080
Expand All @@ -85,7 +84,6 @@ data:
orchestration http://orchestration:8080/_info http://orchestration:8080/_healthcheck
payments http://payments:8080/_info http://payments:8080/_health
search http://search:8080/_info http://search:8080/_healthcheck
stargate http://stargate:8080/_info http://stargate:8080/_healthcheck
wallets http://wallets:8080/_info http://wallets:8080/_healthcheck
webhooks http://webhooks:8080/_info http://webhooks:8080/_healthcheck
}
Expand Down
24 changes: 0 additions & 24 deletions ...controllers/stack/testdata/multipod-service-annotation/results/services--v1/stargate.yaml
View file

This file was deleted.

3 changes: 3 additions & 0 deletions components/operator/internal/modules/gateway/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ func createCaddyfile(context modules.ServiceInstallContext) string {
continue
}
for _, s := range module.Services {
if !s.ExposeHTTP {
continue
}
usedPort := s.GetUsedPort()
if usedPort == 0 {
continue
Expand Down
2 changes: 1 addition & 1 deletion components/operator/internal/modules/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ func (service *Service) Prepare(ctx ModuleContext, serviceName string) {
if service.AuthConfiguration != nil {
_ = ctx.Stack.GetOrCreateClient(serviceName, service.AuthConfiguration(ctx))
}
if service.ExposeHTTP {
if service.ExposeHTTP || service.Liveness != LivenessDisable {
service.usedPort = service.Port
if service.usedPort == 0 {
service.usedPort = ctx.PortAllocator.NextPort()
Expand Down
1 change: 0 additions & 1 deletion components/operator/internal/modules/stargate/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ func (s module) Versions() map[string]modules.Version {
{
ListenEnvVar: "BIND",
HasVersionEndpoint: true,
ExposeHTTP: true,
Liveness: modules.LivenessDefault,
Annotations: ctx.Configuration.Spec.Services.Stargate.Annotations.Service,
Container: func(resolveContext modules.ContainerResolutionContext) modules.Container {
Expand Down

0 comments on commit 9bc77fa

Please sign in to comment.