Skip to content

Commit 2ccdb1d

Browse files
committed
move ingress/route annotation to endpoints
Signed-off-by: Stephanie <yangcao@redhat.com>
1 parent c77edcd commit 2ccdb1d

22 files changed

+1180
-484
lines changed

crds/workspace.devfile.io_devworkspaces.v1beta1.yaml

Lines changed: 79 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -344,16 +344,10 @@ spec:
344344
type: string
345345
description: Annotations to be added to deployment
346346
type: object
347-
ingress:
348-
additionalProperties:
349-
type: string
350-
description: Annotations to be added to Kubernetes
351-
Ingress or Openshift Route
352-
type: object
353347
service:
354348
additionalProperties:
355349
type: string
356-
description: Annotations to be added to service
350+
description: Annotations to be added to services
357351
type: object
358352
type: object
359353
args:
@@ -386,6 +380,12 @@ spec:
386380
endpoints:
387381
items:
388382
properties:
383+
annotation:
384+
additionalProperties:
385+
type: string
386+
description: Annotations to be added to Kubernetes
387+
Ingress or Openshift Route
388+
type: object
389389
attributes:
390390
description: "Map of implementation-dependant string-based
391391
free-form attributes. \n Examples of Che-specific
@@ -669,6 +669,12 @@ spec:
669669
endpoints:
670670
items:
671671
properties:
672+
annotation:
673+
additionalProperties:
674+
type: string
675+
description: Annotations to be added to Kubernetes
676+
Ingress or Openshift Route
677+
type: object
672678
attributes:
673679
description: "Map of implementation-dependant string-based
674680
free-form attributes. \n Examples of Che-specific
@@ -777,6 +783,12 @@ spec:
777783
endpoints:
778784
items:
779785
properties:
786+
annotation:
787+
additionalProperties:
788+
type: string
789+
description: Annotations to be added to Kubernetes
790+
Ingress or Openshift Route
791+
type: object
780792
attributes:
781793
description: "Map of implementation-dependant string-based
782794
free-form attributes. \n Examples of Che-specific
@@ -1113,17 +1125,11 @@ spec:
11131125
description: Annotations to be added to
11141126
deployment
11151127
type: object
1116-
ingress:
1117-
additionalProperties:
1118-
type: string
1119-
description: Annotations to be added to
1120-
Kubernetes Ingress or Openshift Route
1121-
type: object
11221128
service:
11231129
additionalProperties:
11241130
type: string
11251131
description: Annotations to be added to
1126-
service
1132+
services
11271133
type: object
11281134
type: object
11291135
args:
@@ -1157,6 +1163,12 @@ spec:
11571163
endpoints:
11581164
items:
11591165
properties:
1166+
annotation:
1167+
additionalProperties:
1168+
type: string
1169+
description: Annotations to be added to
1170+
Kubernetes Ingress or Openshift Route
1171+
type: object
11601172
attributes:
11611173
description: "Map of implementation-dependant
11621174
string-based free-form attributes. \n
@@ -1431,6 +1443,12 @@ spec:
14311443
endpoints:
14321444
items:
14331445
properties:
1446+
annotation:
1447+
additionalProperties:
1448+
type: string
1449+
description: Annotations to be added to
1450+
Kubernetes Ingress or Openshift Route
1451+
type: object
14341452
attributes:
14351453
description: "Map of implementation-dependant
14361454
string-based free-form attributes. \n
@@ -1549,6 +1567,12 @@ spec:
15491567
endpoints:
15501568
items:
15511569
properties:
1570+
annotation:
1571+
additionalProperties:
1572+
type: string
1573+
description: Annotations to be added to
1574+
Kubernetes Ingress or Openshift Route
1575+
type: object
15521576
attributes:
15531577
description: "Map of implementation-dependant
15541578
string-based free-form attributes. \n
@@ -1996,16 +2020,10 @@ spec:
19962020
type: string
19972021
description: Annotations to be added to deployment
19982022
type: object
1999-
ingress:
2000-
additionalProperties:
2001-
type: string
2002-
description: Annotations to be added to Kubernetes
2003-
Ingress or Openshift Route
2004-
type: object
20052023
service:
20062024
additionalProperties:
20072025
type: string
2008-
description: Annotations to be added to service
2026+
description: Annotations to be added to services
20092027
type: object
20102028
type: object
20112029
args:
@@ -2039,6 +2057,12 @@ spec:
20392057
endpoints:
20402058
items:
20412059
properties:
2060+
annotation:
2061+
additionalProperties:
2062+
type: string
2063+
description: Annotations to be added to Kubernetes
2064+
Ingress or Openshift Route
2065+
type: object
20422066
attributes:
20432067
description: "Map of implementation-dependant
20442068
string-based free-form attributes. \n Examples
@@ -2298,6 +2322,12 @@ spec:
22982322
endpoints:
22992323
items:
23002324
properties:
2325+
annotation:
2326+
additionalProperties:
2327+
type: string
2328+
description: Annotations to be added to Kubernetes
2329+
Ingress or Openshift Route
2330+
type: object
23012331
attributes:
23022332
description: "Map of implementation-dependant
23032333
string-based free-form attributes. \n Examples
@@ -2407,6 +2437,12 @@ spec:
24072437
endpoints:
24082438
items:
24092439
properties:
2440+
annotation:
2441+
additionalProperties:
2442+
type: string
2443+
description: Annotations to be added to Kubernetes
2444+
Ingress or Openshift Route
2445+
type: object
24102446
attributes:
24112447
description: "Map of implementation-dependant
24122448
string-based free-form attributes. \n Examples
@@ -2750,18 +2786,11 @@ spec:
27502786
description: Annotations to be added
27512787
to deployment
27522788
type: object
2753-
ingress:
2754-
additionalProperties:
2755-
type: string
2756-
description: Annotations to be added
2757-
to Kubernetes Ingress or Openshift
2758-
Route
2759-
type: object
27602789
service:
27612790
additionalProperties:
27622791
type: string
27632792
description: Annotations to be added
2764-
to service
2793+
to services
27652794
type: object
27662795
type: object
27672796
args:
@@ -2797,6 +2826,13 @@ spec:
27972826
endpoints:
27982827
items:
27992828
properties:
2829+
annotation:
2830+
additionalProperties:
2831+
type: string
2832+
description: Annotations to be added
2833+
to Kubernetes Ingress or Openshift
2834+
Route
2835+
type: object
28002836
attributes:
28012837
description: "Map of implementation-dependant
28022838
string-based free-form attributes.
@@ -3088,6 +3124,13 @@ spec:
30883124
endpoints:
30893125
items:
30903126
properties:
3127+
annotation:
3128+
additionalProperties:
3129+
type: string
3130+
description: Annotations to be added
3131+
to Kubernetes Ingress or Openshift
3132+
Route
3133+
type: object
30913134
attributes:
30923135
description: "Map of implementation-dependant
30933136
string-based free-form attributes.
@@ -3212,6 +3255,13 @@ spec:
32123255
endpoints:
32133256
items:
32143257
properties:
3258+
annotation:
3259+
additionalProperties:
3260+
type: string
3261+
description: Annotations to be added
3262+
to Kubernetes Ingress or Openshift
3263+
Route
3264+
type: object
32153265
attributes:
32163266
description: "Map of implementation-dependant
32173267
string-based free-form attributes.

0 commit comments

Comments
 (0)