Skip to content

Commit 591f62b

Browse files
pantierrapantierra
committed
Renamed externalService to apiServices.
1 parent 91c83da commit 591f62b

File tree

11 files changed

+47
-47
lines changed

11 files changed

+47
-47
lines changed

‎helm-chart/eoapi/templates/_helpers.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ so we use this helper function to check autoscaling rules
160160
{{- if and .Values.ingress.enabled (ne .Values.ingress.className "nginx") }}
161161
{{/* "requestRate" cannot be enabled for any service if not "nginx" so give feedback and fail */}}
162162
{{- $hasRequestRate := false }}
163-
{{- range $serviceName, $service := .Values.externalServices }}
163+
{{- range $serviceName, $service := .Values.apiServices }}
164164
{{- if and $service.autoscaling.enabled (eq $service.autoscaling.type "requestRate") }}
165165
{{- $hasRequestRate = true }}
166166
{{- end }}
@@ -170,7 +170,7 @@ so we use this helper function to check autoscaling rules
170170
{{- end }}
171171
{{/* "both" cannot be enabled for any service if not "nginx" so give feedback and fail */}}
172172
{{- $hasBoth := false }}
173-
{{- range $serviceName, $service := .Values.externalServices }}
173+
{{- range $serviceName, $service := .Values.apiServices }}
174174
{{- if and $service.autoscaling.enabled (eq $service.autoscaling.type "both") }}
175175
{{- $hasBoth = true }}
176176
{{- end }}

‎helm-chart/eoapi/templates/services/configmap.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- range $serviceName, $v := .Values.externalServices -}}
1+
{{- range $serviceName, $v := .Values.apiServices -}}
22
{{- if index $v "enabled" }}
33
apiVersion: v1
44
kind: ConfigMap
@@ -11,5 +11,5 @@ data:
1111
---
1212
{{/* END: if index $v "enabled" */}}
1313
{{- end }}
14-
{{/* END: range $serviceName, $v := .Values.externalServices */}}
14+
{{/* END: range $serviceName, $v := .Values.apiServices */}}
1515
{{- end }}

‎helm-chart/eoapi/templates/services/deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ include "eoapi.validateTempDB" . }}
2-
{{- range $serviceName, $v := .Values.externalServices -}}
2+
{{- range $serviceName, $v := .Values.apiServices -}}
33
{{- if index $v "enabled" }}
44
apiVersion: apps/v1
55
kind: Deployment
@@ -81,5 +81,5 @@ spec:
8181
---
8282
{{/* END: if index $v "enabled" */}}
8383
{{- end }}
84-
{{/* END: range $serviceName, $v := .Values.externalServices */}}
84+
{{/* END: range $serviceName, $v := .Values.apiServices */}}
8585
{{- end }}

‎helm-chart/eoapi/templates/services/hpa.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- include "eoapi.validateAutoscaleRules" . -}}
2-
{{- range $serviceName, $v := .Values.externalServices -}}
2+
{{- range $serviceName, $v := .Values.apiServices -}}
33
{{- if index $v "autoscaling" "enabled" }}
44
apiVersion: autoscaling/v2
55
kind: HorizontalPodAutoscaler

‎helm-chart/eoapi/templates/services/ingress-nginx.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
rules:
3131
- http:
3232
paths:
33-
{{- range $serviceName, $v := .Values.externalServices }}
33+
{{- range $serviceName, $v := .Values.apiServices }}
3434
{{- if (and (index $v "enabled") (not $.Values.testing)) }}
3535
- pathType: Prefix
3636
path: "/{{ $serviceName }}(/|$)(.*)"
@@ -48,7 +48,7 @@ spec:
4848
port:
4949
number: {{ $.Values.service.port }}
5050
{{- end }}{{/* END: if index $v "enabled" */}}
51-
{{- end }}{{/* END: range $serviceName, $v := .Values.externalServices */}}
51+
{{- end }}{{/* END: range $serviceName, $v := .Values.apiServices */}}
5252
{{- if (and (not $.Values.testing) (.Values.docServer.enabled)) }}
5353
- pathType: Prefix
5454
path: /(/|$)

‎helm-chart/eoapi/templates/services/service.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- range $serviceName, $v := .Values.externalServices -}}
1+
{{- range $serviceName, $v := .Values.apiServices -}}
22
{{- if index $v "enabled" }}
33
apiVersion: v1
44
kind: Service
@@ -27,5 +27,5 @@ spec:
2727
---
2828
{{/* END: if index $v "enabled" */}}
2929
{{- end }}
30-
{{/* END: range $serviceName, $v := .Values.externalServices */}}
30+
{{/* END: range $serviceName, $v := .Values.apiServices */}}
3131
{{- end }}

‎helm-chart/eoapi/tests/config_tests.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ templates:
44
tests:
55
- it: "vector configmap defaults"
66
set:
7-
externalServices.raster.enabled: false
8-
externalServices.stac.enabled: false
9-
externalServices.vector.enabled: true
7+
apiServices.raster.enabled: false
8+
apiServices.stac.enabled: false
9+
apiServices.vector.enabled: true
1010
asserts:
1111
- isKind:
1212
of: ConfigMap
@@ -18,9 +18,9 @@ tests:
1818
value: "300"
1919
- it: "raster configmap defaults"
2020
set:
21-
externalServices.raster.enabled: true
22-
externalServices.stac.enabled: false
23-
externalServices.vector.enabled: false
21+
apiServices.raster.enabled: true
22+
apiServices.stac.enabled: false
23+
apiServices.vector.enabled: false
2424
asserts:
2525
- isKind:
2626
of: ConfigMap
@@ -32,9 +32,9 @@ tests:
3232
value: "YES"
3333
- it: "stac configmap defaults"
3434
set:
35-
externalServices.raster.enabled: false
36-
externalServices.stac.enabled: true
37-
externalServices.vector.enabled: false
35+
apiServices.raster.enabled: false
36+
apiServices.stac.enabled: true
37+
apiServices.vector.enabled: false
3838
asserts:
3939
- isKind:
4040
of: ConfigMap

‎helm-chart/eoapi/tests/deploy_tests.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ templates:
44
tests:
55
- it: "vector deploy defaults"
66
set:
7-
externalServices.raster.enabled: false
8-
externalServices.stac.enabled: false
9-
externalServices.vector.enabled: true
7+
apiServices.raster.enabled: false
8+
apiServices.stac.enabled: false
9+
apiServices.vector.enabled: true
1010
asserts:
1111
- isKind:
1212
of: Deployment
@@ -33,9 +33,9 @@ tests:
3333
value: "ABC123"
3434
- it: "raster deploy defaults"
3535
set:
36-
externalServices.raster.enabled: true
37-
externalServices.stac.enabled: false
38-
externalServices.vector.enabled: false
36+
apiServices.raster.enabled: true
37+
apiServices.stac.enabled: false
38+
apiServices.vector.enabled: false
3939
asserts:
4040
- isKind:
4141
of: Deployment
@@ -62,9 +62,9 @@ tests:
6262
value: "ABC123"
6363
- it: "stac deploy defaults"
6464
set:
65-
externalServices.raster.enabled: false
66-
externalServices.stac.enabled: true
67-
externalServices.vector.enabled: false
65+
apiServices.raster.enabled: false
66+
apiServices.stac.enabled: true
67+
apiServices.vector.enabled: false
6868
asserts:
6969
- isKind:
7070
of: Deployment

‎helm-chart/eoapi/tests/hpa_tests.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ templates:
44
tests:
55
- it: "vector hpa fail for requestRate"
66
set:
7-
externalServices.raster.enabled: false
8-
externalServices.stac.enabled: false
9-
externalServices.vector.enabled: true
7+
apiServices.raster.enabled: false
8+
apiServices.stac.enabled: false
9+
apiServices.vector.enabled: true
1010
ingress.className: "testing123"
11-
externalServices.vector.autoscaling.enabled: true
12-
externalServices.vector.autoscaling.type: "requestRate"
11+
apiServices.vector.autoscaling.enabled: true
12+
apiServices.vector.autoscaling.type: "requestRate"
1313
asserts:
1414
- failedTemplate:
1515
errorMessage: When using an 'ingress.className' other than 'nginx' you cannot enable autoscaling by 'requestRate' at this time b/c it's solely an nginx metric

‎helm-chart/eoapi/tests/ingress_tests_nginx.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ templates:
44
tests:
55
- it: "vector ingress defaults"
66
set:
7-
externalServices.ingress.className: "nginx"
8-
externalServices.raster.enabled: false
9-
externalServices.stac.enabled: false
10-
externalServices.vector.enabled: true
7+
apiServices.ingress.className: "nginx"
8+
apiServices.raster.enabled: false
9+
apiServices.stac.enabled: false
10+
apiServices.vector.enabled: true
1111
asserts:
1212
- isKind:
1313
of: Ingress
@@ -26,10 +26,10 @@ tests:
2626
value: "nginx"
2727
- it: "raster ingress defaults"
2828
set:
29-
externalServices.ingress.className: "nginx"
30-
externalServices.raster.enabled: true
31-
externalServices.stac.enabled: false
32-
externalServices.vector.enabled: false
29+
apiServices.ingress.className: "nginx"
30+
apiServices.raster.enabled: true
31+
apiServices.stac.enabled: false
32+
apiServices.vector.enabled: false
3333
asserts:
3434
- isKind:
3535
of: Ingress
@@ -48,10 +48,10 @@ tests:
4848
value: "nginx"
4949
- it: "stac ingress defaults"
5050
set:
51-
externalServices.ingress.className: "nginx"
52-
externalServices.raster.enabled: false
53-
externalServices.stac.enabled: true
54-
externalServices.vector.enabled: false
51+
apiServices.ingress.className: "nginx"
52+
apiServices.raster.enabled: false
53+
apiServices.stac.enabled: true
54+
apiServices.vector.enabled: false
5555
asserts:
5656
- isKind:
5757
of: Ingress

0 commit comments

Comments
 (0)