Skip to content

Commit e1e8ffb

Browse files
authored
Merge pull request #138 from yangcao77/testKubeComponent
906- variable substitution in kubernetes uri content
2 parents abb8431 + 384fdeb commit e1e8ffb

File tree

11 files changed

+599
-132
lines changed

11 files changed

+599
-132
lines changed

devfile.yaml

+120-105
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,121 @@
1-
schemaVersion: 2.2.0-latest
2-
metadata:
3-
name: nodejs
4-
version: 1.0.0
5-
attributes:
6-
alpha.build-dockerfile: /relative/path/to/Dockerfile
7-
variables:
8-
test: testValue
9-
parent:
10-
# uri: https://raw.githubusercontent.com/odo-devfiles/registry/master/devfiles/nodejs/devfile.yaml
11-
id: nodejs
12-
registryUrl: "https://registry.devfile.io"
13-
version: latest
14-
commands:
15-
- id: install
16-
exec:
17-
component: runtime
18-
commandLine: npm install
19-
workingDir: /project-starter
20-
group:
21-
kind: build
22-
isDefault: true
23-
starterProjects:
24-
- name: nodejs-starter2
25-
git:
26-
remotes:
27-
origin: https://github.com/odo-devfiles/nodejs-ex.git
281
components:
29-
- name: runtime2
30-
attributes:
31-
tool: console-import
32-
import:
33-
strategy: Dockerfile
34-
container:
35-
endpoints:
36-
- name: http-8888
37-
targetPort: 8888
38-
image: registry.access.redhat.com/ubi8/nodejs-12:1-45
39-
memoryLimit: 1024Mi
40-
mountSources: true
41-
sourceMapping: /project
42-
command:
43-
- npm install
44-
- name: runtime3
45-
attributes:
46-
tool: odo
47-
cli:
48-
usage: deploy
49-
container:
50-
endpoints:
51-
- name: http-8080
52-
targetPort: 8080
53-
image: registry.access.redhat.com/ubi8/nodejs-12:1-45
54-
memoryLimit: 1024Mi
55-
mountSources: true
56-
sourceMapping: /project
57-
- name: runtime4
58-
attributes:
59-
tool: workspace-operator
60-
container:
61-
endpoints:
62-
- name: http-9090
63-
targetPort: 9090
64-
image: "{{invalid-var}}"
65-
memoryLimit: 1024Mi
66-
mountSources: true
67-
sourceMapping: /project
68-
commands:
69-
- exec:
70-
commandLine: npm install
71-
component: runtime2
72-
group:
73-
isDefault: false
74-
kind: build
75-
workingDir: "{{test}}"
76-
id: install2
77-
attributes:
78-
tool: odo
79-
mandatory: false
80-
- exec:
81-
commandLine: npm start
82-
component: runtime2
83-
group:
84-
isDefault: false
85-
kind: run
86-
workingDir: /project
87-
id: run2
88-
attributes:
89-
tool: odo
90-
mandatory: true
91-
- exec:
92-
commandLine: npm run debug
93-
component: runtime2
94-
group:
95-
isDefault: false
96-
kind: debug
97-
workingDir: /project
98-
id: debug2
99-
- exec:
100-
commandLine: npm test
101-
component: runtime2
102-
group:
103-
isDefault: false
104-
kind: test
105-
workingDir: /project
106-
id: test2
2+
- kubernetes:
3+
endpoints:
4+
- name: jsct05850
5+
secure: false
6+
targetPort: 4061
7+
- exposure: internal
8+
name: fttrf05851
9+
secure: false
10+
targetPort: 2794
11+
- name: pediv05852
12+
path: /Path_GpjjJ
13+
secure: false
14+
targetPort: 4061
15+
- name: w05853
16+
protocol: tcp
17+
secure: false
18+
targetPort: 4061
19+
- name: ve05854
20+
path: /Path_rUnibQXIL
21+
secure: true
22+
targetPort: 4061
23+
name: sxi05849
24+
- kubernetes:
25+
endpoints:
26+
- name: bj05856
27+
path: /Path_QEqKHLrqVSS
28+
secure: false
29+
targetPort: 1985
30+
- exposure: internal
31+
name: udbeo05857
32+
secure: true
33+
targetPort: 1985
34+
- exposure: internal
35+
name: yol05858
36+
protocol: wss
37+
secure: false
38+
targetPort: 1985
39+
name: lsk05855
40+
- kubernetes: {}
41+
name: shf05859
42+
- kubernetes:
43+
endpoints:
44+
- name: grmex05861
45+
protocol: tcp
46+
secure: true
47+
targetPort: 429
48+
- name: ork05862
49+
path: /Path_MofEhbd
50+
protocol: wss
51+
secure: false
52+
targetPort: 3214
53+
name: zrk05860
54+
- kubernetes: {}
55+
name: igh05863
56+
- kubernetes:
57+
endpoints:
58+
- name: emf05865
59+
path: /Path_ZkPBw
60+
protocol: wss
61+
secure: true
62+
targetPort: 970
63+
- name: wqnaf05866
64+
path: /Path_UpxBmbMJDr
65+
secure: true
66+
targetPort: 1863
67+
- exposure: internal
68+
name: rbk05867
69+
path: /Path_TTlXWYESKJwelJ
70+
protocol: udp
71+
secure: true
72+
targetPort: 2706
73+
- exposure: none
74+
name: zjiv05868
75+
path: /Path_JUQlS
76+
protocol: udp
77+
secure: true
78+
targetPort: 970
79+
name: ecw05864
80+
- kubernetes:
81+
endpoints:
82+
- exposure: none
83+
name: i05870
84+
protocol: tcp
85+
secure: true
86+
targetPort: 565
87+
- name: yln05871
88+
protocol: https
89+
secure: true
90+
targetPort: 4386
91+
- name: qyrrk05872
92+
path: /Path_gtsayNeeuFJ
93+
secure: false
94+
targetPort: 3546
95+
- exposure: none
96+
name: vv05873
97+
secure: false
98+
targetPort: 2295
99+
- name: dat05874
100+
path: /Path_kWxdWGLbCmZYf
101+
protocol: wss
102+
secure: false
103+
targetPort: 2474
104+
name: lgv05869
105+
- kubernetes:
106+
endpoints:
107+
- name: koac05876
108+
secure: false
109+
targetPort: 4318
110+
- name: lelw05877
111+
path: /Path_EhnGCYPmFHrZPA
112+
protocol: ws
113+
secure: true
114+
targetPort: 592
115+
- name: j05878
116+
protocol: tcp
117+
secure: false
118+
targetPort: 4318
119+
name: qcu05875
120+
metadata: {}
121+
schemaVersion: 2.2.0

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/devfile/library
33
go 1.15
44

55
require (
6-
github.com/devfile/api/v2 v2.0.0-20220309195345-48ebbf1e51cf
6+
github.com/devfile/api/v2 v2.0.0-20220614133608-351f05b7c2b1
77
github.com/fatih/color v1.7.0
88
github.com/fsnotify/fsnotify v1.4.9
99
github.com/gobwas/glob v0.2.3

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ
8383
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
8484
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
8585
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
86-
github.com/devfile/api/v2 v2.0.0-20220309195345-48ebbf1e51cf h1:FkwAOQtepscB5B0j++9S/eoicXj707MaP5HPIScz0sA=
87-
github.com/devfile/api/v2 v2.0.0-20220309195345-48ebbf1e51cf/go.mod h1:kLX/nW93gigOHXK3NLeJL2fSS/sgEe+OHu8bo3aoOi4=
86+
github.com/devfile/api/v2 v2.0.0-20220614133608-351f05b7c2b1 h1:rwhw0TQUCS/qT4iDsoOPV/AaopUiYYYXs5zXeX1n6Ts=
87+
github.com/devfile/api/v2 v2.0.0-20220614133608-351f05b7c2b1/go.mod h1:dN7xFrOVG+iPqn4UKGibXLd5oVsdE8XyK9OEb5JL3aI=
8888
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
8989
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
9090
github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=

0 commit comments

Comments
 (0)