Skip to content

Commit 1392456

Browse files
AObuchowAObuchow
committed
chore: remove mentions of Theia in test data
Fix #1028 Signed-off-by: Andrew Obuchowicz <[email protected]>
1 parent f441fda commit 1392456

File tree

7 files changed

+313
-365
lines changed

7 files changed

+313
-365
lines changed

‎pkg/library/flatten/testdata/container-contributions/theia-merge-usecase.yaml renamed to ‎pkg/library/flatten/testdata/container-contributions/generic-ide-merge-usecase.yaml

+50-50
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Merges Theia IDE contribution"
1+
name: "Merges generic IDE contribution"
22

33
input:
44
devworkspace:
@@ -18,15 +18,15 @@ input:
1818
targetPort: 8080
1919
memoryLimit: 2Gi
2020
mountSources: true
21-
- name: theia-ide
21+
- name: generic-ide
2222
plugin:
23-
uri: theia-ide.yaml
23+
uri: generic-ide.yaml
2424

2525
devfileResources:
26-
theia-ide.yaml:
26+
generic-ide.yaml:
2727
schemaVersion: 2.1.0
2828
metadata:
29-
name: theia-ide
29+
name: generic-ide
3030
commands:
3131
- id: init-container-command
3232
apply:
@@ -35,7 +35,7 @@ input:
3535
preStart:
3636
- init-container-command
3737
components:
38-
- name: theia-ide-contributions
38+
- name: generic-ide-contributions
3939
attributes:
4040
controller.devfile.io/container-contribution: true
4141
container:
@@ -46,7 +46,7 @@ input:
4646
env:
4747
- name: PLUGIN_REMOTE_ENDPOINT_EXECUTABLE
4848
value: /remote-endpoint/plugin-remote-endpoint
49-
- name: THEIA_PLUGINS
49+
- name: IDE_PLUGINS
5050
value: local-dir:///plugins/sidecars/tools
5151
memoryLimit: 512Mi
5252
volumeMounts:
@@ -55,29 +55,29 @@ input:
5555
- name: remote-endpoint
5656
path: /remote-endpoint
5757
image: quay.io/devfile/universal-developer-image@sha256:53cec58dd190dd1e06100478ae879d7c28abd8fc883d5fdf5be3eb6e943fe5e7
58-
- name: theia-ide
58+
- name: generic-ide
5959
container:
60-
image: quay.io/eclipse/che-theia:next
60+
image: quay.io/eclipse/generic-ide:next
6161
env:
62-
- name: THEIA_PLUGINS
62+
- name: IDE_PLUGINS
6363
value: local-dir:///plugins
6464
- name: HOSTED_PLUGIN_HOSTNAME
6565
value: 0.0.0.0
6666
- name: HOSTED_PLUGIN_PORT
6767
value: '3130'
68-
- name: THEIA_HOST
68+
- name: IDE_HOST
6969
value: 127.0.0.1
7070
volumeMounts:
7171
- name: plugins
7272
path: /plugins
73-
- name: theia-local
74-
path: /home/theia/.theia
73+
- name: ide-local
74+
path: /home/ide/.ide
7575
mountSources: true
7676
memoryLimit: 512M
7777
cpuLimit: 1500m
7878
cpuRequest: 100m
7979
endpoints:
80-
- name: theia
80+
- name: ide
8181
attributes:
8282
type: main
8383
cookiesAuthEnabled: true
@@ -109,29 +109,29 @@ input:
109109
exposure: public
110110
secure: false
111111
protocol: https
112-
- name: theia-dev
112+
- name: ide-dev
113113
attributes:
114114
type: ide-dev
115115
discoverable: false
116116
urlRewriteSupported: true
117117
targetPort: 3130
118118
exposure: public
119119
protocol: http
120-
- name: theia-redirect-1
120+
- name: ide-redirect-1
121121
attributes:
122122
discoverable: false
123123
urlRewriteSupported: true
124124
targetPort: 13131
125125
exposure: public
126126
protocol: http
127-
- name: theia-redirect-2
127+
- name: ide-redirect-2
128128
attributes:
129129
discoverable: false
130130
urlRewriteSupported: true
131131
targetPort: 13132
132132
exposure: public
133133
protocol: http
134-
- name: theia-redirect-3
134+
- name: ide-redirect-3
135135
attributes:
136136
discoverable: false
137137
urlRewriteSupported: true
@@ -149,11 +149,11 @@ input:
149149
secure: false
150150
protocol: wss
151151
attributes:
152-
app.kubernetes.io/component: che-theia
153-
app.kubernetes.io/part-of: che-theia.eclipse.org
152+
app.kubernetes.io/component: generic-ide
153+
app.kubernetes.io/part-of: generic-ide.eclipse.org
154154
- name: plugins
155155
volume: {}
156-
- name: theia-local
156+
- name: ide-local
157157
volume: {}
158158
- name: che-machine-exec
159159
container:
@@ -170,10 +170,10 @@ input:
170170
cpuRequest: 30m
171171
attributes:
172172
app.kubernetes.io/component: machine-exec
173-
app.kubernetes.io/part-of: che-theia.eclipse.org
173+
app.kubernetes.io/part-of: generic-ide.eclipse.org
174174
- name: remote-runtime-injector
175175
container:
176-
image: quay.io/eclipse/che-theia-endpoint-runtime-binary:next
176+
image: quay.io/eclipse/generic-ide-endpoint-runtime-binary:next
177177
env:
178178
- name: PLUGIN_REMOTE_ENDPOINT_EXECUTABLE
179179
value: /remote-endpoint/plugin-remote-endpoint
@@ -190,7 +190,7 @@ input:
190190
cpuRequest: 30m
191191
attributes:
192192
app.kubernetes.io/component: remote-runtime-injector
193-
app.kubernetes.io/part-of: che-theia.eclipse.org
193+
app.kubernetes.io/part-of: generic-ide.eclipse.org
194194
- name: remote-endpoint
195195
volume:
196196
ephemeral: true
@@ -201,7 +201,7 @@ output:
201201
components:
202202
- name: tools
203203
attributes:
204-
controller.devfile.io/merged-contributions: "theia-ide"
204+
controller.devfile.io/merged-contributions: "generic-ide"
205205
container:
206206
image: quay.io/devfile/universal-developer-image:latest
207207
env:
@@ -211,7 +211,7 @@ output:
211211
value: /tmp/.cache
212212
- name: PLUGIN_REMOTE_ENDPOINT_EXECUTABLE
213213
value: /remote-endpoint/plugin-remote-endpoint
214-
- name: THEIA_PLUGINS
214+
- name: IDE_PLUGINS
215215
value: local-dir:///plugins/sidecars/tools
216216
args:
217217
- sh
@@ -227,33 +227,33 @@ output:
227227
path: /remote-endpoint
228228
memoryLimit: 2560Mi # 2Gi = 2048Mi + 512Mi
229229
mountSources: true
230-
- name: theia-ide
230+
- name: generic-ide
231231
attributes:
232-
app.kubernetes.io/component: che-theia
233-
app.kubernetes.io/part-of: che-theia.eclipse.org
234-
controller.devfile.io/imported-by: theia-ide
232+
app.kubernetes.io/component: generic-ide
233+
app.kubernetes.io/part-of: generic-ide.eclipse.org
234+
controller.devfile.io/imported-by: generic-ide
235235
container:
236-
image: quay.io/eclipse/che-theia:next
236+
image: quay.io/eclipse/generic-ide:next
237237
env:
238-
- name: THEIA_PLUGINS
238+
- name: IDE_PLUGINS
239239
value: local-dir:///plugins
240240
- name: HOSTED_PLUGIN_HOSTNAME
241241
value: 0.0.0.0
242242
- name: HOSTED_PLUGIN_PORT
243243
value: '3130'
244-
- name: THEIA_HOST
244+
- name: IDE_HOST
245245
value: 127.0.0.1
246246
volumeMounts:
247247
- name: plugins
248248
path: /plugins
249-
- name: theia-local
250-
path: /home/theia/.theia
249+
- name: ide-local
250+
path: /home/ide/.ide
251251
mountSources: true
252252
memoryLimit: 512M
253253
cpuLimit: 1500m
254254
cpuRequest: 100m
255255
endpoints:
256-
- name: theia
256+
- name: ide
257257
attributes:
258258
type: main
259259
cookiesAuthEnabled: true
@@ -285,29 +285,29 @@ output:
285285
exposure: public
286286
secure: false
287287
protocol: https
288-
- name: theia-dev
288+
- name: ide-dev
289289
attributes:
290290
type: ide-dev
291291
discoverable: false
292292
urlRewriteSupported: true
293293
targetPort: 3130
294294
exposure: public
295295
protocol: http
296-
- name: theia-redirect-1
296+
- name: ide-redirect-1
297297
attributes:
298298
discoverable: false
299299
urlRewriteSupported: true
300300
targetPort: 13131
301301
exposure: public
302302
protocol: http
303-
- name: theia-redirect-2
303+
- name: ide-redirect-2
304304
attributes:
305305
discoverable: false
306306
urlRewriteSupported: true
307307
targetPort: 13132
308308
exposure: public
309309
protocol: http
310-
- name: theia-redirect-3
310+
- name: ide-redirect-3
311311
attributes:
312312
discoverable: false
313313
urlRewriteSupported: true
@@ -326,17 +326,17 @@ output:
326326
protocol: wss
327327
- name: plugins
328328
attributes:
329-
controller.devfile.io/imported-by: theia-ide
329+
controller.devfile.io/imported-by: generic-ide
330330
volume: {}
331-
- name: theia-local
331+
- name: ide-local
332332
attributes:
333-
controller.devfile.io/imported-by: theia-ide
333+
controller.devfile.io/imported-by: generic-ide
334334
volume: {}
335335
- name: che-machine-exec
336336
attributes:
337337
app.kubernetes.io/component: machine-exec
338-
app.kubernetes.io/part-of: che-theia.eclipse.org
339-
controller.devfile.io/imported-by: theia-ide
338+
app.kubernetes.io/part-of: generic-ide.eclipse.org
339+
controller.devfile.io/imported-by: generic-ide
340340
container:
341341
image: quay.io/eclipse/che-machine-exec:next
342342
command:
@@ -351,11 +351,11 @@ output:
351351
cpuRequest: 30m
352352
- name: remote-runtime-injector
353353
attributes:
354-
controller.devfile.io/imported-by: theia-ide
354+
controller.devfile.io/imported-by: generic-ide
355355
app.kubernetes.io/component: remote-runtime-injector
356-
app.kubernetes.io/part-of: che-theia.eclipse.org
356+
app.kubernetes.io/part-of: generic-ide.eclipse.org
357357
container:
358-
image: quay.io/eclipse/che-theia-endpoint-runtime-binary:next
358+
image: quay.io/eclipse/generic-ide-endpoint-runtime-binary:next
359359
env:
360360
- name: PLUGIN_REMOTE_ENDPOINT_EXECUTABLE
361361
value: /remote-endpoint/plugin-remote-endpoint
@@ -372,13 +372,13 @@ output:
372372
cpuRequest: 30m
373373
- name: remote-endpoint
374374
attributes:
375-
controller.devfile.io/imported-by: theia-ide
375+
controller.devfile.io/imported-by: generic-ide
376376
volume:
377377
ephemeral: true
378378
commands:
379379
- id: init-container-command
380380
attributes:
381-
controller.devfile.io/imported-by: theia-ide
381+
controller.devfile.io/imported-by: generic-ide
382382
apply:
383383
component: remote-runtime-injector
384384
events:

0 commit comments

Comments
 (0)