Skip to content

Commit a60c07d

Browse files
TessaIOTessaIO
committed
e2e: Update Openshift manifests to update the API Version
Signed-off-by: AhmedGrati <[email protected]>
1 parent 3f0c1c3 commit a60c07d

File tree

17 files changed

+59
-63
lines changed

17 files changed

+59
-63
lines changed

‎script/test/cmd/tests_new.sh

-7
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,3 @@ os_cmd="kompose --provider=openshift -f $KOMPOSE_ROOT/script/test/fixtures/exter
232232
os_output="$KOMPOSE_ROOT/script/test/fixtures/external-traffic-policy/output-os-v1.yaml"
233233
convert::expect_success_and_warning "$k8s_cmd" "$k8s_output"
234234
convert::expect_success "$os_cmd" "$os_output"
235-
# Test external traffic policy feature with warning, because we have nodeport with external traffic policy
236-
k8s_cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/external-traffic-policy/docker-compose-v2.yaml convert --stdout --with-kompose-annotation=false"
237-
k8s_output="$KOMPOSE_ROOT/script/test/fixtures/external-traffic-policy/output-k8s-v2.yaml"
238-
os_cmd="kompose --provider=openshift -f $KOMPOSE_ROOT/script/test/fixtures/external-traffic-policy/docker-compose-v2.yaml convert --stdout --with-kompose-annotation=false"
239-
os_output="$KOMPOSE_ROOT/script/test/fixtures/external-traffic-policy/output-os-v2.yaml"
240-
convert::expect_success_and_warning "$k8s_cmd" "$k8s_output"
241-
convert::expect_success_and_warning "$os_cmd" "$os_output"

‎script/test/fixtures/change-in-volume/output-os-empty-vols-template.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ status:
3838
loadBalancer: {}
3939

4040
---
41-
apiVersion: v1
41+
apiVersion: apps.openshift.io/v1
4242
kind: DeploymentConfig
4343
metadata:
4444
annotations:
@@ -85,7 +85,7 @@ status:
8585
updatedReplicas: 0
8686

8787
---
88-
apiVersion: v1
88+
apiVersion: image.openshift.io/v1
8989
kind: ImageStream
9090
metadata:
9191
creationTimestamp: null
@@ -109,7 +109,7 @@ status:
109109
dockerImageRepository: ""
110110

111111
---
112-
apiVersion: v1
112+
apiVersion: apps.openshift.io/v1
113113
kind: DeploymentConfig
114114
metadata:
115115
creationTimestamp: null
@@ -168,7 +168,7 @@ status:
168168
updatedReplicas: 0
169169

170170
---
171-
apiVersion: v1
171+
apiVersion: image.openshift.io/v1
172172
kind: ImageStream
173173
metadata:
174174
creationTimestamp: null

‎script/test/fixtures/change-in-volume/output-os.yaml

+6-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ status:
3838
loadBalancer: {}
3939

4040
---
41-
apiVersion: v1
41+
apiVersion: apps.openshift.io/v1
4242
kind: DeploymentConfig
4343
metadata:
4444
annotations:
@@ -85,7 +85,7 @@ status:
8585
updatedReplicas: 0
8686

8787
---
88-
apiVersion: v1
88+
apiVersion: image.openshift.io/v1
8989
kind: ImageStream
9090
metadata:
9191
creationTimestamp: null
@@ -109,7 +109,7 @@ status:
109109
dockerImageRepository: ""
110110

111111
---
112-
apiVersion: v1
112+
apiVersion: apps.openshift.io/v1
113113
kind: DeploymentConfig
114114
metadata:
115115
creationTimestamp: null
@@ -138,6 +138,8 @@ spec:
138138
name: web
139139
ports:
140140
- containerPort: 5000
141+
hostPort: 5000
142+
protocol: TCP
141143
resources: {}
142144
volumeMounts:
143145
- mountPath: /code
@@ -166,7 +168,7 @@ status:
166168
updatedReplicas: 0
167169

168170
---
169-
apiVersion: v1
171+
apiVersion: image.openshift.io/v1
170172
kind: ImageStream
171173
metadata:
172174
creationTimestamp: null

‎script/test/fixtures/configmap-volume/output-os-withlabel.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: v1
2+
apiVersion: apps.openshift.io/v1
33
kind: DeploymentConfig
44
metadata:
55
annotations:
@@ -58,7 +58,7 @@ status:
5858
updatedReplicas: 0
5959

6060
---
61-
apiVersion: v1
61+
apiVersion: image.openshift.io/v1
6262
kind: ImageStream
6363
metadata:
6464
creationTimestamp: null
@@ -95,7 +95,7 @@ metadata:
9595
name: db-cm0
9696

9797
---
98-
apiVersion: v1
98+
apiVersion: apps.openshift.io/v1
9999
kind: DeploymentConfig
100100
metadata:
101101
annotations:
@@ -159,7 +159,7 @@ status:
159159
updatedReplicas: 0
160160

161161
---
162-
apiVersion: v1
162+
apiVersion: image.openshift.io/v1
163163
kind: ImageStream
164164
metadata:
165165
creationTimestamp: null

‎script/test/fixtures/configmap-volume/output-os.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: v1
2+
apiVersion: apps.openshift.io/v1
33
kind: DeploymentConfig
44
metadata:
55
creationTimestamp: null
@@ -56,7 +56,7 @@ status:
5656
updatedReplicas: 0
5757

5858
---
59-
apiVersion: v1
59+
apiVersion: image.openshift.io/v1
6060
kind: ImageStream
6161
metadata:
6262
creationTimestamp: null
@@ -93,7 +93,7 @@ metadata:
9393
name: db-cm0
9494

9595
---
96-
apiVersion: v1
96+
apiVersion: apps.openshift.io/v1
9797
kind: DeploymentConfig
9898
metadata:
9999
creationTimestamp: null
@@ -155,7 +155,7 @@ status:
155155
updatedReplicas: 0
156156

157157
---
158-
apiVersion: v1
158+
apiVersion: image.openshift.io/v1
159159
kind: ImageStream
160160
metadata:
161161
creationTimestamp: null

‎script/test/fixtures/deploy/placement/output-placement-os.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ status:
1717
loadBalancer: {}
1818

1919
---
20-
apiVersion: v1
20+
apiVersion: apps.openshift.io/v1
2121
kind: DeploymentConfig
2222
metadata:
2323
creationTimestamp: null
@@ -95,7 +95,7 @@ status:
9595
updatedReplicas: 0
9696

9797
---
98-
apiVersion: v1
98+
apiVersion: image.openshift.io/v1
9999
kind: ImageStream
100100
metadata:
101101
creationTimestamp: null

‎script/test/fixtures/envvars-interpolation/output-os.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: v1
2+
apiVersion: apps.openshift.io/v1
33
kind: DeploymentConfig
44
metadata:
55
creationTimestamp: null
@@ -52,7 +52,7 @@ status:
5252
updatedReplicas: 0
5353

5454
---
55-
apiVersion: v1
55+
apiVersion: image.openshift.io/v1
5656
kind: ImageStream
5757
metadata:
5858
creationTimestamp: null

‎script/test/fixtures/expose/output-os.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ status:
3939
loadBalancer: {}
4040

4141
---
42-
apiVersion: v1
42+
apiVersion: apps.openshift.io/v1
4343
kind: DeploymentConfig
4444
metadata:
4545
creationTimestamp: null
@@ -87,7 +87,7 @@ status:
8787
updatedReplicas: 0
8888

8989
---
90-
apiVersion: v1
90+
apiVersion: image.openshift.io/v1
9191
kind: ImageStream
9292
metadata:
9393
creationTimestamp: null
@@ -111,7 +111,7 @@ status:
111111
dockerImageRepository: ""
112112

113113
---
114-
apiVersion: v1
114+
apiVersion: apps.openshift.io/v1
115115
kind: DeploymentConfig
116116
metadata:
117117
annotations:
@@ -164,7 +164,7 @@ status:
164164
updatedReplicas: 0
165165

166166
---
167-
apiVersion: v1
167+
apiVersion: image.openshift.io/v1
168168
kind: ImageStream
169169
metadata:
170170
creationTimestamp: null

‎script/test/fixtures/external-traffic-policy/output-os-v1.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ status:
2424
loadBalancer: {}
2525

2626
---
27-
apiVersion: v1
27+
apiVersion: apps.openshift.io/v1
2828
kind: DeploymentConfig
2929
metadata:
3030
annotations:
@@ -81,7 +81,7 @@ status:
8181
updatedReplicas: 0
8282

8383
---
84-
apiVersion: v1
84+
apiVersion: image.openshift.io/v1
8585
kind: ImageStream
8686
metadata:
8787
creationTimestamp: null

‎script/test/fixtures/external-traffic-policy/output-os-v2.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ status:
2424
loadBalancer: {}
2525

2626
---
27-
apiVersion: v1
27+
apiVersion: apps.openshift.io/v1
2828
kind: DeploymentConfig
2929
metadata:
3030
annotations:
@@ -81,7 +81,7 @@ status:
8181
updatedReplicas: 0
8282

8383
---
84-
apiVersion: v1
84+
apiVersion: image.openshift.io/v1
8585
kind: ImageStream
8686
metadata:
8787
creationTimestamp: null

‎script/test/fixtures/healthcheck/output-healthcheck-os.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ status:
9898
loadBalancer: {}
9999

100100
---
101-
apiVersion: v1
101+
apiVersion: apps.openshift.io/v1
102102
kind: DeploymentConfig
103103
metadata:
104104
annotations:
@@ -165,7 +165,7 @@ status:
165165
updatedReplicas: 0
166166

167167
---
168-
apiVersion: v1
168+
apiVersion: image.openshift.io/v1
169169
kind: ImageStream
170170
metadata:
171171
creationTimestamp: null
@@ -189,7 +189,7 @@ status:
189189
dockerImageRepository: ""
190190

191191
---
192-
apiVersion: v1
192+
apiVersion: apps.openshift.io/v1
193193
kind: DeploymentConfig
194194
metadata:
195195
annotations:
@@ -256,7 +256,7 @@ status:
256256
updatedReplicas: 0
257257

258258
---
259-
apiVersion: v1
259+
apiVersion: image.openshift.io/v1
260260
kind: ImageStream
261261
metadata:
262262
creationTimestamp: null
@@ -280,7 +280,7 @@ status:
280280
dockerImageRepository: ""
281281

282282
---
283-
apiVersion: v1
283+
apiVersion: apps.openshift.io/v1
284284
kind: DeploymentConfig
285285
metadata:
286286
annotations:
@@ -350,7 +350,7 @@ status:
350350
updatedReplicas: 0
351351

352352
---
353-
apiVersion: v1
353+
apiVersion: image.openshift.io/v1
354354
kind: ImageStream
355355
metadata:
356356
creationTimestamp: null
@@ -374,7 +374,7 @@ status:
374374
dockerImageRepository: ""
375375

376376
---
377-
apiVersion: v1
377+
apiVersion: apps.openshift.io/v1
378378
kind: DeploymentConfig
379379
metadata:
380380
annotations:
@@ -442,7 +442,7 @@ status:
442442
updatedReplicas: 0
443443

444444
---
445-
apiVersion: v1
445+
apiVersion: image.openshift.io/v1
446446
kind: ImageStream
447447
metadata:
448448
creationTimestamp: null

‎script/test/fixtures/host-port-protocol/output-os.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ status:
1717
loadBalancer: {}
1818

1919
---
20-
apiVersion: v1
20+
apiVersion: apps.openshift.io/v1
2121
kind: DeploymentConfig
2222
metadata:
2323
creationTimestamp: null
@@ -66,7 +66,7 @@ status:
6666
updatedReplicas: 0
6767

6868
---
69-
apiVersion: v1
69+
apiVersion: image.openshift.io/v1
7070
kind: ImageStream
7171
metadata:
7272
creationTimestamp: null

‎script/test/fixtures/multiple-files/output-os.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: v1
2+
apiVersion: apps.openshift.io/v1
33
kind: DeploymentConfig
44
metadata:
55
creationTimestamp: null
@@ -44,7 +44,7 @@ status:
4444
updatedReplicas: 0
4545

4646
---
47-
apiVersion: v1
47+
apiVersion: image.openshift.io/v1
4848
kind: ImageStream
4949
metadata:
5050
creationTimestamp: null
@@ -68,7 +68,7 @@ status:
6868
dockerImageRepository: ""
6969

7070
---
71-
apiVersion: v1
71+
apiVersion: apps.openshift.io/v1
7272
kind: DeploymentConfig
7373
metadata:
7474
creationTimestamp: null
@@ -113,7 +113,7 @@ status:
113113
updatedReplicas: 0
114114

115115
---
116-
apiVersion: v1
116+
apiVersion: image.openshift.io/v1
117117
kind: ImageStream
118118
metadata:
119119
creationTimestamp: null

0 commit comments

Comments
 (0)