Skip to content

Commit faf5dc6

Browse files
apollo_deployments: remove ingress from testing deployment config (#8612)
1 parent b1149aa commit faf5dc6

File tree

2 files changed

+12
-20
lines changed

2 files changed

+12
-20
lines changed

crates/apollo_deployments/resources/deployments/testing/deployment_config_hybrid.json

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,7 @@
5757
"deployments/testing/hybrid.json",
5858
"services/hybrid/http_server.json"
5959
],
60-
"ingress": {
61-
"domain": "sw-dev.io",
62-
"alternative_names": [],
63-
"internal": true,
64-
"rules": [
65-
{
66-
"path": "/gateway",
67-
"port": 8080,
68-
"backend": null
69-
}
70-
]
71-
},
60+
"ingress": null,
7261
"k8s_service_config": null,
7362
"autoscale": false,
7463
"replicas": 1,

crates/apollo_deployments/src/deployments/hybrid.rs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,17 @@ impl ServiceNameInner for HybridNodeServiceName {
206206
ingress_params: IngressParams,
207207
) -> Option<Ingress> {
208208
match self {
209-
HybridNodeServiceName::Core => None,
210-
HybridNodeServiceName::HttpServer => {
211-
get_ingress(ingress_params, get_environment_ingress_internal(environment))
212-
}
213-
HybridNodeServiceName::Gateway => None,
214-
HybridNodeServiceName::L1 => None,
215-
HybridNodeServiceName::Mempool => None,
216-
HybridNodeServiceName::SierraCompiler => None,
209+
HybridNodeServiceName::Core
210+
| HybridNodeServiceName::Gateway
211+
| HybridNodeServiceName::L1
212+
| HybridNodeServiceName::Mempool
213+
| HybridNodeServiceName::SierraCompiler => None,
214+
HybridNodeServiceName::HttpServer => match &environment {
215+
Environment::CloudK8s(_) => {
216+
get_ingress(ingress_params, get_environment_ingress_internal(environment))
217+
}
218+
Environment::LocalK8s => None,
219+
},
217220
}
218221
}
219222

0 commit comments

Comments
 (0)