Skip to content

Commit d5fd8c4

Browse files
fix: elasticsearch is actually elasticsearch-persistent (#350)
1 parent 2fa66e0 commit d5fd8c4

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

internal/servicetypes/elasticsearch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
var defaultElasticsearchPort int32 = 9200
1414

1515
var elasticsearch = ServiceType{
16-
Name: "elasticsearch",
16+
Name: "elasticsearch-persistent",
1717
Ports: ServicePorts{
1818
Ports: []corev1.ServicePort{
1919
{

internal/templating/services/test-resources/deployment/result-elasticsearch-1.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ metadata:
99
labels:
1010
app.kubernetes.io/instance: myservice
1111
app.kubernetes.io/managed-by: build-deploy-tool
12-
app.kubernetes.io/name: elasticsearch
12+
app.kubernetes.io/name: elasticsearch-persistent
1313
lagoon.sh/buildType: branch
1414
lagoon.sh/environment: environment-name
1515
lagoon.sh/environmentType: production
1616
lagoon.sh/project: example-project
1717
lagoon.sh/service: myservice
18-
lagoon.sh/service-type: elasticsearch
19-
lagoon.sh/template: elasticsearch-0.1.0
18+
lagoon.sh/service-type: elasticsearch-persistent
19+
lagoon.sh/template: elasticsearch-persistent-0.1.0
2020
name: myservice
2121
spec:
2222
replicas: 1
2323
selector:
2424
matchLabels:
2525
app.kubernetes.io/instance: myservice
26-
app.kubernetes.io/name: elasticsearch
26+
app.kubernetes.io/name: elasticsearch-persistent
2727
strategy:
2828
type: Recreate
2929
template:
@@ -39,14 +39,14 @@ spec:
3939
labels:
4040
app.kubernetes.io/instance: myservice
4141
app.kubernetes.io/managed-by: build-deploy-tool
42-
app.kubernetes.io/name: elasticsearch
42+
app.kubernetes.io/name: elasticsearch-persistent
4343
lagoon.sh/buildType: branch
4444
lagoon.sh/environment: environment-name
4545
lagoon.sh/environmentType: production
4646
lagoon.sh/project: example-project
4747
lagoon.sh/service: myservice
48-
lagoon.sh/service-type: elasticsearch
49-
lagoon.sh/template: elasticsearch-0.1.0
48+
lagoon.sh/service-type: elasticsearch-persistent
49+
lagoon.sh/template: elasticsearch-persistent-0.1.0
5050
spec:
5151
containers:
5252
- env:
@@ -124,21 +124,21 @@ metadata:
124124
labels:
125125
app.kubernetes.io/instance: myservice-size
126126
app.kubernetes.io/managed-by: build-deploy-tool
127-
app.kubernetes.io/name: elasticsearch
127+
app.kubernetes.io/name: elasticsearch-persistent
128128
lagoon.sh/buildType: branch
129129
lagoon.sh/environment: environment-name
130130
lagoon.sh/environmentType: production
131131
lagoon.sh/project: example-project
132132
lagoon.sh/service: myservice-size
133-
lagoon.sh/service-type: elasticsearch
134-
lagoon.sh/template: elasticsearch-0.1.0
133+
lagoon.sh/service-type: elasticsearch-persistent
134+
lagoon.sh/template: elasticsearch-persistent-0.1.0
135135
name: myservice-size
136136
spec:
137137
replicas: 1
138138
selector:
139139
matchLabels:
140140
app.kubernetes.io/instance: myservice-size
141-
app.kubernetes.io/name: elasticsearch
141+
app.kubernetes.io/name: elasticsearch-persistent
142142
strategy:
143143
type: Recreate
144144
template:
@@ -154,14 +154,14 @@ spec:
154154
labels:
155155
app.kubernetes.io/instance: myservice-size
156156
app.kubernetes.io/managed-by: build-deploy-tool
157-
app.kubernetes.io/name: elasticsearch
157+
app.kubernetes.io/name: elasticsearch-persistent
158158
lagoon.sh/buildType: branch
159159
lagoon.sh/environment: environment-name
160160
lagoon.sh/environmentType: production
161161
lagoon.sh/project: example-project
162162
lagoon.sh/service: myservice-size
163-
lagoon.sh/service-type: elasticsearch
164-
lagoon.sh/template: elasticsearch-0.1.0
163+
lagoon.sh/service-type: elasticsearch-persistent
164+
lagoon.sh/template: elasticsearch-persistent-0.1.0
165165
spec:
166166
containers:
167167
- env:

internal/templating/services/test-resources/pvc/result-elasticsearch-1.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ metadata:
1111
labels:
1212
app.kubernetes.io/instance: myservice
1313
app.kubernetes.io/managed-by: build-deploy-tool
14-
app.kubernetes.io/name: elasticsearch
14+
app.kubernetes.io/name: elasticsearch-persistent
1515
lagoon.sh/buildType: branch
1616
lagoon.sh/environment: environment-name
1717
lagoon.sh/environmentType: production
1818
lagoon.sh/project: example-project
1919
lagoon.sh/service: myservice
20-
lagoon.sh/service-type: elasticsearch
21-
lagoon.sh/template: elasticsearch-0.1.0
20+
lagoon.sh/service-type: elasticsearch-persistent
21+
lagoon.sh/template: elasticsearch-persistent-0.1.0
2222
name: myservice
2323
spec:
2424
accessModes:
@@ -40,14 +40,14 @@ metadata:
4040
labels:
4141
app.kubernetes.io/instance: myservice-size
4242
app.kubernetes.io/managed-by: build-deploy-tool
43-
app.kubernetes.io/name: elasticsearch
43+
app.kubernetes.io/name: elasticsearch-persistent
4444
lagoon.sh/buildType: branch
4545
lagoon.sh/environment: environment-name
4646
lagoon.sh/environmentType: production
4747
lagoon.sh/project: example-project
4848
lagoon.sh/service: myservice-size
49-
lagoon.sh/service-type: elasticsearch
50-
lagoon.sh/template: elasticsearch-0.1.0
49+
lagoon.sh/service-type: elasticsearch-persistent
50+
lagoon.sh/template: elasticsearch-persistent-0.1.0
5151
name: myservice-size
5252
spec:
5353
accessModes:

internal/templating/services/test-resources/service/result-elasticsearch-1.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ metadata:
99
labels:
1010
app.kubernetes.io/instance: myservice
1111
app.kubernetes.io/managed-by: build-deploy-tool
12-
app.kubernetes.io/name: elasticsearch
12+
app.kubernetes.io/name: elasticsearch-persistent
1313
lagoon.sh/buildType: branch
1414
lagoon.sh/environment: environment-name
1515
lagoon.sh/environmentType: production
1616
lagoon.sh/project: example-project
1717
lagoon.sh/service: myservice
18-
lagoon.sh/service-type: elasticsearch
19-
lagoon.sh/template: elasticsearch-0.1.0
18+
lagoon.sh/service-type: elasticsearch-persistent
19+
lagoon.sh/template: elasticsearch-persistent-0.1.0
2020
name: myservice
2121
spec:
2222
ports:
@@ -26,7 +26,7 @@ spec:
2626
targetPort: 9200
2727
selector:
2828
app.kubernetes.io/instance: myservice
29-
app.kubernetes.io/name: elasticsearch
29+
app.kubernetes.io/name: elasticsearch-persistent
3030
status:
3131
loadBalancer: {}
3232
---
@@ -40,14 +40,14 @@ metadata:
4040
labels:
4141
app.kubernetes.io/instance: myservice-size
4242
app.kubernetes.io/managed-by: build-deploy-tool
43-
app.kubernetes.io/name: elasticsearch
43+
app.kubernetes.io/name: elasticsearch-persistent
4444
lagoon.sh/buildType: branch
4545
lagoon.sh/environment: environment-name
4646
lagoon.sh/environmentType: production
4747
lagoon.sh/project: example-project
4848
lagoon.sh/service: myservice-size
49-
lagoon.sh/service-type: elasticsearch
50-
lagoon.sh/template: elasticsearch-0.1.0
49+
lagoon.sh/service-type: elasticsearch-persistent
50+
lagoon.sh/template: elasticsearch-persistent-0.1.0
5151
name: myservice-size
5252
spec:
5353
ports:
@@ -57,6 +57,6 @@ spec:
5757
targetPort: 9200
5858
selector:
5959
app.kubernetes.io/instance: myservice-size
60-
app.kubernetes.io/name: elasticsearch
60+
app.kubernetes.io/name: elasticsearch-persistent
6161
status:
6262
loadBalancer: {}

0 commit comments

Comments
 (0)