Skip to content

pull latest devfile/api which includes resource requirement validation #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/devfile/library
go 1.15

require (
github.com/devfile/api/v2 v2.0.0-20211021164004-dabee4e633ed
github.com/devfile/api/v2 v2.0.0-20211118170330-959f3c8007c3
github.com/fatih/color v1.7.0
github.com/gobwas/glob v0.2.3
github.com/golang/mock v1.5.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/devfile/api/v2 v2.0.0-20211021164004-dabee4e633ed h1:OXF9l+MlJrirXAqKN6EZUVaHB0FKm7nh0EjpktwnBig=
github.com/devfile/api/v2 v2.0.0-20211021164004-dabee4e633ed/go.mod h1:d99eTN6QxgzihOOFyOZA+VpUyD4Q1pYRYHZ/ci9J96Q=
github.com/devfile/api/v2 v2.0.0-20211118170330-959f3c8007c3 h1:G7TIrgpGx5lcZ3X7bpQeVCeeeO7tv6SAzPPvB9ThHXE=
github.com/devfile/api/v2 v2.0.0-20211118170330-959f3c8007c3/go.mod h1:d99eTN6QxgzihOOFyOZA+VpUyD4Q1pYRYHZ/ci9J96Q=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
Expand Down
84 changes: 84 additions & 0 deletions pkg/devfile/parser/data/v2/2.2.0/devfileJsonSchema220.go
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,27 @@ const JsonSchema220 = `{
"image"
],
"properties": {
"annotation": {
"description": "Annotations that should be added to specific resources for this container",
"type": "object",
"properties": {
"deployment": {
"description": "Annotations to be added to deployment",
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"service": {
"description": "Annotations to be added to service",
"type": "object",
"additionalProperties": {
"type": "string"
}
}
},
"additionalProperties": false
},
"args": {
"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.",
"type": "array",
Expand Down Expand Up @@ -302,6 +323,13 @@ const JsonSchema220 = `{
"targetPort"
],
"properties": {
"annotation": {
"description": "Annotations to be added to Kubernetes Ingress or Openshift Route",
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"attributes": {
"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\",",
"type": "object",
Expand Down Expand Up @@ -558,6 +586,13 @@ const JsonSchema220 = `{
"targetPort"
],
"properties": {
"annotation": {
"description": "Annotations to be added to Kubernetes Ingress or Openshift Route",
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"attributes": {
"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\",",
"type": "object",
Expand Down Expand Up @@ -648,6 +683,13 @@ const JsonSchema220 = `{
"targetPort"
],
"properties": {
"annotation": {
"description": "Annotations to be added to Kubernetes Ingress or Openshift Route",
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"attributes": {
"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\",",
"type": "object",
Expand Down Expand Up @@ -1101,6 +1143,27 @@ const JsonSchema220 = `{
"description": "Allows adding and configuring devworkspace-related containers",
"type": "object",
"properties": {
"annotation": {
"description": "Annotations that should be added to specific resources for this container",
"type": "object",
"properties": {
"deployment": {
"description": "Annotations to be added to deployment",
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"service": {
"description": "Annotations to be added to service",
"type": "object",
"additionalProperties": {
"type": "string"
}
}
},
"additionalProperties": false
},
"args": {
"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.",
"type": "array",
Expand Down Expand Up @@ -1133,6 +1196,13 @@ const JsonSchema220 = `{
"name"
],
"properties": {
"annotation": {
"description": "Annotations to be added to Kubernetes Ingress or Openshift Route",
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"attributes": {
"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\",",
"type": "object",
Expand Down Expand Up @@ -1375,6 +1445,13 @@ const JsonSchema220 = `{
"name"
],
"properties": {
"annotation": {
"description": "Annotations to be added to Kubernetes Ingress or Openshift Route",
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"attributes": {
"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\",",
"type": "object",
Expand Down Expand Up @@ -1462,6 +1539,13 @@ const JsonSchema220 = `{
"name"
],
"properties": {
"annotation": {
"description": "Annotations to be added to Kubernetes Ingress or Openshift Route",
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"attributes": {
"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\",",
"type": "object",
Expand Down