Skip to content

Commit 10144b3

Browse files
yangcao77yangcao77
committed
pull latest devfile/api which includes resource requirement validation
Signed-off-by: Stephanie <[email protected]>
1 parent 49d635c commit 10144b3

File tree

3 files changed

+87
-3
lines changed

3 files changed

+87
-3
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
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-20211021164004-dabee4e633ed
6+
github.com/devfile/api/v2 v2.0.0-20211118170330-959f3c8007c3
77
github.com/fatih/color v1.7.0
88
github.com/gobwas/glob v0.2.3
99
github.com/golang/mock v1.5.0

‎go.sum

Lines changed: 2 additions & 2 deletions
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-20211021164004-dabee4e633ed h1:OXF9l+MlJrirXAqKN6EZUVaHB0FKm7nh0EjpktwnBig=
87-
github.com/devfile/api/v2 v2.0.0-20211021164004-dabee4e633ed/go.mod h1:d99eTN6QxgzihOOFyOZA+VpUyD4Q1pYRYHZ/ci9J96Q=
86+
github.com/devfile/api/v2 v2.0.0-20211118170330-959f3c8007c3 h1:G7TIrgpGx5lcZ3X7bpQeVCeeeO7tv6SAzPPvB9ThHXE=
87+
github.com/devfile/api/v2 v2.0.0-20211118170330-959f3c8007c3/go.mod h1:d99eTN6QxgzihOOFyOZA+VpUyD4Q1pYRYHZ/ci9J96Q=
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=

‎pkg/devfile/parser/data/v2/2.2.0/devfileJsonSchema220.go

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,27 @@ const JsonSchema220 = `{
269269
"image"
270270
],
271271
"properties": {
272+
"annotation": {
273+
"description": "Annotations that should be added to specific resources for this container",
274+
"type": "object",
275+
"properties": {
276+
"deployment": {
277+
"description": "Annotations to be added to deployment",
278+
"type": "object",
279+
"additionalProperties": {
280+
"type": "string"
281+
}
282+
},
283+
"service": {
284+
"description": "Annotations to be added to service",
285+
"type": "object",
286+
"additionalProperties": {
287+
"type": "string"
288+
}
289+
}
290+
},
291+
"additionalProperties": false
292+
},
272293
"args": {
273294
"description": "The arguments to supply to the command running the dockerimage component. The arguments are supplied either to the default command provided in the image or to the overridden command.\n\nDefaults to an empty array, meaning use whatever is defined in the image.",
274295
"type": "array",
@@ -302,6 +323,13 @@ const JsonSchema220 = `{
302323
"targetPort"
303324
],
304325
"properties": {
326+
"annotation": {
327+
"description": "Annotations to be added to Kubernetes Ingress or Openshift Route",
328+
"type": "object",
329+
"additionalProperties": {
330+
"type": "string"
331+
}
332+
},
305333
"attributes": {
306334
"description": "Map of implementation-dependant string-based free-form attributes.\n\nExamples of Che-specific attributes:\n- cookiesAuthEnabled: \"true\" / \"false\",\n- type: \"terminal\" / \"ide\" / \"ide-dev\",",
307335
"type": "object",
@@ -558,6 +586,13 @@ const JsonSchema220 = `{
558586
"targetPort"
559587
],
560588
"properties": {
589+
"annotation": {
590+
"description": "Annotations to be added to Kubernetes Ingress or Openshift Route",
591+
"type": "object",
592+
"additionalProperties": {
593+
"type": "string"
594+
}
595+
},
561596
"attributes": {
562597
"description": "Map of implementation-dependant string-based free-form attributes.\n\nExamples of Che-specific attributes:\n- cookiesAuthEnabled: \"true\" / \"false\",\n- type: \"terminal\" / \"ide\" / \"ide-dev\",",
563598
"type": "object",
@@ -648,6 +683,13 @@ const JsonSchema220 = `{
648683
"targetPort"
649684
],
650685
"properties": {
686+
"annotation": {
687+
"description": "Annotations to be added to Kubernetes Ingress or Openshift Route",
688+
"type": "object",
689+
"additionalProperties": {
690+
"type": "string"
691+
}
692+
},
651693
"attributes": {
652694
"description": "Map of implementation-dependant string-based free-form attributes.\n\nExamples of Che-specific attributes:\n- cookiesAuthEnabled: \"true\" / \"false\",\n- type: \"terminal\" / \"ide\" / \"ide-dev\",",
653695
"type": "object",
@@ -1101,6 +1143,27 @@ const JsonSchema220 = `{
11011143
"description": "Allows adding and configuring devworkspace-related containers",
11021144
"type": "object",
11031145
"properties": {
1146+
"annotation": {
1147+
"description": "Annotations that should be added to specific resources for this container",
1148+
"type": "object",
1149+
"properties": {
1150+
"deployment": {
1151+
"description": "Annotations to be added to deployment",
1152+
"type": "object",
1153+
"additionalProperties": {
1154+
"type": "string"
1155+
}
1156+
},
1157+
"service": {
1158+
"description": "Annotations to be added to service",
1159+
"type": "object",
1160+
"additionalProperties": {
1161+
"type": "string"
1162+
}
1163+
}
1164+
},
1165+
"additionalProperties": false
1166+
},
11041167
"args": {
11051168
"description": "The arguments to supply to the command running the dockerimage component. The arguments are supplied either to the default command provided in the image or to the overridden command.\n\nDefaults to an empty array, meaning use whatever is defined in the image.",
11061169
"type": "array",
@@ -1133,6 +1196,13 @@ const JsonSchema220 = `{
11331196
"name"
11341197
],
11351198
"properties": {
1199+
"annotation": {
1200+
"description": "Annotations to be added to Kubernetes Ingress or Openshift Route",
1201+
"type": "object",
1202+
"additionalProperties": {
1203+
"type": "string"
1204+
}
1205+
},
11361206
"attributes": {
11371207
"description": "Map of implementation-dependant string-based free-form attributes.\n\nExamples of Che-specific attributes:\n- cookiesAuthEnabled: \"true\" / \"false\",\n- type: \"terminal\" / \"ide\" / \"ide-dev\",",
11381208
"type": "object",
@@ -1375,6 +1445,13 @@ const JsonSchema220 = `{
13751445
"name"
13761446
],
13771447
"properties": {
1448+
"annotation": {
1449+
"description": "Annotations to be added to Kubernetes Ingress or Openshift Route",
1450+
"type": "object",
1451+
"additionalProperties": {
1452+
"type": "string"
1453+
}
1454+
},
13781455
"attributes": {
13791456
"description": "Map of implementation-dependant string-based free-form attributes.\n\nExamples of Che-specific attributes:\n- cookiesAuthEnabled: \"true\" / \"false\",\n- type: \"terminal\" / \"ide\" / \"ide-dev\",",
13801457
"type": "object",
@@ -1462,6 +1539,13 @@ const JsonSchema220 = `{
14621539
"name"
14631540
],
14641541
"properties": {
1542+
"annotation": {
1543+
"description": "Annotations to be added to Kubernetes Ingress or Openshift Route",
1544+
"type": "object",
1545+
"additionalProperties": {
1546+
"type": "string"
1547+
}
1548+
},
14651549
"attributes": {
14661550
"description": "Map of implementation-dependant string-based free-form attributes.\n\nExamples of Che-specific attributes:\n- cookiesAuthEnabled: \"true\" / \"false\",\n- type: \"terminal\" / \"ide\" / \"ide-dev\",",
14671551
"type": "object",

0 commit comments

Comments
 (0)