Skip to content

Commit c20543b

Browse files
Szymongibakgalwas
authored andcommitted
Remove Echo Service from Application Connector (#1098)
1 parent c73b279 commit c20543b

File tree

7 files changed

+0
-50
lines changed

7 files changed

+0
-50
lines changed

components/remote-environment-controller/charts/remote-environments/templates/service.yaml

-18
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,6 @@ spec:
2121
---
2222
apiVersion: v1
2323
kind: Service
24-
metadata:
25-
name: {{ .Release.Name }}-gateway-echo
26-
labels:
27-
app: {{ .Release.Name }}-gateway
28-
release: {{ .Release.Name }}-gateway
29-
heritage: {{ .Release.Service }}-gateway
30-
spec:
31-
type: {{ .Values.service.echo.serviceType }}
32-
ports:
33-
- port: {{ .Values.service.echo.port }}
34-
protocol: TCP
35-
name: echo-port
36-
selector:
37-
app: {{ .Release.Name }}-gateway
38-
release: {{ .Release.Name }}-gateway
39-
---
40-
apiVersion: v1
41-
kind: Service
4224
metadata:
4325
annotations:
4426
"auth.istio.io/{{ .Values.eventService.service.externalapi.port }}": NONE

components/remote-environment-controller/charts/remote-environments/values.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ deployment:
1313
service:
1414
externalapi:
1515
port: *externalAPIPort
16-
echo:
17-
serviceType: ClusterIP
18-
port: *proxyPort
1916

2017
ingress:
2118
enabled: true

resources/remote-environments/templates/service.yaml

-18
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,6 @@ spec:
2121
---
2222
apiVersion: v1
2323
kind: Service
24-
metadata:
25-
name: {{ .Release.Name }}-gateway-echo
26-
labels:
27-
app: {{ .Release.Name }}-gateway
28-
release: {{ .Release.Name }}-gateway
29-
heritage: {{ .Release.Service }}-gateway
30-
spec:
31-
type: {{ .Values.service.echo.serviceType }}
32-
ports:
33-
- port: {{ .Values.service.echo.port }}
34-
protocol: TCP
35-
name: echo-port
36-
selector:
37-
app: {{ .Release.Name }}-gateway
38-
release: {{ .Release.Name }}-gateway
39-
---
40-
apiVersion: v1
41-
kind: Service
4224
metadata:
4325
annotations:
4426
"auth.istio.io/{{ .Values.eventService.service.externalapi.port }}": NONE

resources/remote-environments/values.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ deployment:
2626
service:
2727
externalapi:
2828
port: *externalAPIPort
29-
echo:
30-
serviceType: ClusterIP
31-
port: *proxyPort
3229

3330
ingress:
3431
enabled: true

tests/connector-service-tests/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ PASSED: test-ec-default-acceptance
3535
$ kubectl get po --show-all
3636
NAME READY STATUS RESTARTS AGE
3737
ec-default-gateway-5dffff49f-drr7n 2/2 Running 0 1h
38-
echo-service-745c674944-r67zj 1/1 Running 0 1h
3938
hmc-default-gateway-669965894-5wwv8 2/2 Running 0 3h
4039
test-ec-default-acceptance 0/1 Completed 0 7m # <<<<<< this one
4140
```

tests/gateway-tests/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ PASSED: test-ec-default-acceptance
4141
$ kubectl get po --show-all
4242
NAME READY STATUS RESTARTS AGE
4343
ec-default-gateway-5dffff49f-drr7n 2/2 Running 0 1h
44-
echo-service-745c674944-r67zj 1/1 Running 0 1h
4544
hmc-default-gateway-669965894-5wwv8 2/2 Running 0 3h
4645
test-ec-default-acceptance 0/1 Completed 0 7m # <<<<<< this one
4746
```

tests/remote-environment-controller-tests/test/testkit/k8sresources_check.go

-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const (
1414
gatewayRoleFormat = "%s-gateway-role"
1515
gatewayRoleBindingFormat = "%s-gateway-rolebinding"
1616
gatewayApiFormat = "%s-gateway-external-api"
17-
gatewayEchoFormat = "%s-gateway-echo"
1817

1918
eventServiceNameFormat = "%s-event-service"
2019
eventServiceApiFormat = "%s-gateway-external-api"
@@ -97,17 +96,12 @@ func (checker *k8sChecker) checkRoleBinding(t *testing.T, errCheckFunc func(*tes
9796

9897
func (checker *k8sChecker) checkServices(t *testing.T, errCheckFunc func(*testing.T, error), resourceCheckFunc func(*testing.T, interface{})) {
9998
gatewayApiName := fmt.Sprintf(gatewayApiFormat, checker.remoteEnvName)
100-
gatewayEchoName := fmt.Sprintf(gatewayEchoFormat, checker.remoteEnvName)
10199
eventsApiName := fmt.Sprintf(eventServiceApiFormat, checker.remoteEnvName)
102100

103101
gatewayApiSvc, err := checker.client.GetService(gatewayApiName, v1.GetOptions{})
104102
errCheckFunc(t, err)
105103
resourceCheckFunc(t, gatewayApiSvc)
106104

107-
gatewayEchoSvc, err := checker.client.GetService(gatewayEchoName, v1.GetOptions{})
108-
errCheckFunc(t, err)
109-
resourceCheckFunc(t, gatewayEchoSvc)
110-
111105
eventsSvc, err := checker.client.GetService(eventsApiName, v1.GetOptions{})
112106
errCheckFunc(t, err)
113107
resourceCheckFunc(t, eventsSvc)

0 commit comments

Comments
 (0)