Skip to content

fix(control-plane): use FQDN for sandbox-injected service URLs #465

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

Closed
JuanmaBM wants to merge 1 commit into from
Closed

fix(control-plane): use FQDN for sandbox-injected service URLs #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 components/ambient-control-plane/internal/reconciler/sandbox_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,8 @@ func acpInternalRule(namespace string) *sandboxpb.NetworkPolicyRule {
return &sandboxpb.NetworkPolicyRule{
Name: "acp-internal",
Endpoints: []*sandboxpb.NetworkEndpoint{
{Host: "ambient-control-plane." + namespace + ".svc", Port: 8080},
{Host: "ambient-control-plane." + namespace + ".svc.cluster.local", Port: 8080},
{Host: "ambient-api-server." + namespace + ".svc", Port: 8000},
{Host: "ambient-api-server." + namespace + ".svc.cluster.local", Port: 8000},
{Host: "ambient-api-server." + namespace + ".svc", Port: 9000},
{Host: "ambient-api-server." + namespace + ".svc.cluster.local", Port: 9000},
},
Binaries: []*sandboxpb.NetworkBinary{
Expand Down
2 changes: 1 addition & 1 deletion components/manifests/overlays/hcmais-dev/control-plane-env-patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- name: AMBIENT_GRPC_USE_TLS
value: "false"
- name: CP_TOKEN_URL
value: "http://ambient-control-plane.ambient-dev.svc:8080/token"
value: "http://ambient-control-plane.ambient-dev.svc.cluster.local:8080/token"
- name: OIDC_TOKEN_URL
value: "https://keycloak-ambient-keycloak.apps.rosa.hcmais01ue1.s9m2.p3.openshiftapps.com/realms/ambient-code/protocol/openid-connect/token"
- name: OIDC_CLIENT_ID
Expand Down
2 changes: 1 addition & 1 deletion components/manifests/overlays/hcmais/control-plane-env-patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- name: AMBIENT_GRPC_USE_TLS
value: "false"
- name: CP_TOKEN_URL
value: "http://ambient-control-plane.ambient-api.svc:8080/token"
value: "http://ambient-control-plane.ambient-api.svc.cluster.local:8080/token"
- name: OIDC_TOKEN_URL
value: "https://keycloak-ambient-keycloak.apps.rosa.hcmais01ue1.s9m2.p3.openshiftapps.com/realms/ambient-code/protocol/openid-connect/token"
- name: OIDC_CLIENT_ID
Expand Down
2 changes: 1 addition & 1 deletion components/manifests/templates/template-services.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ objects:
- name: MCP_API_SERVER_URL
value: "http://ambient-api-server.${NAMESPACE}.svc:8000"
- name: CP_TOKEN_URL
value: "http://ambient-control-plane.${NAMESPACE}.svc:8080/token"
value: "http://ambient-control-plane.${NAMESPACE}.svc.cluster.local:8080/token"
- name: CP_RUNTIME_NAMESPACE
valueFrom:
fieldRef:
Expand Down
Loading