LaconicNetwork/kompose
7
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix openshift DeploymentConfig and ImageStream APIVersions (#1598)

Browse Source 
* fix openshift dc and image stream api version

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>

* e2e: Update Openshift manifests to update the API Version

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>

---------

Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>
This commit is contained in:
AhmedGrati
2023-04-05 14:28:19 -04:00
committed by GitHub
parent 78700a215f
commit 59d5532181
19 changed files with 67 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/test/cmd/tests_new.sh
+1
View File
@@ -232,6 +232,7 @@ os_cmd="kompose --provider=openshift -f $KOMPOSE_ROOT/script/test/fixtures/exter
os_output="$KOMPOSE_ROOT/script/test/fixtures/external-traffic-policy/output-os-v1.yaml"
convert::expect_success_and_warning "$k8s_cmd" "$k8s_output"
convert::expect_success "$os_cmd" "$os_output"
# Test external traffic policy feature with warning, because we have nodeport with external traffic policy
k8s_cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/external-traffic-policy/docker-compose-v2.yaml convert --stdout --with-kompose-annotation=false"
k8s_output="$KOMPOSE_ROOT/script/test/fixtures/external-traffic-policy/output-k8s-v2.yaml"
script/test/fixtures/change-in-volume/output-os-empty-vols-template.yaml
Vendored
+4 -4
View File
@@ -38,7 +38,7 @@ status:
loadBalancer: {}
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
annotations:
@@ -85,7 +85,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
@@ -109,7 +109,7 @@ status:
dockerImageRepository: ""
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
creationTimestamp: null
@@ -168,7 +168,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
script/test/fixtures/change-in-volume/output-os.yaml
Vendored
+6 -4
View File
@@ -38,7 +38,7 @@ status:
loadBalancer: {}
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
annotations:
@@ -85,7 +85,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
@@ -109,7 +109,7 @@ status:
dockerImageRepository: ""
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
creationTimestamp: null
@@ -138,6 +138,8 @@ spec:
name: web
ports:
- containerPort: 5000
hostPort: 5000
protocol: TCP
resources: {}
volumeMounts:
- mountPath: /code
@@ -166,7 +168,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
script/test/fixtures/configmap-volume/output-os-withlabel.yaml
Vendored
+4 -4
View File
@@ -1,5 +1,5 @@
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
annotations:
@@ -58,7 +58,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
@@ -95,7 +95,7 @@ metadata:
name: db-cm0
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
annotations:
@@ -159,7 +159,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
script/test/fixtures/configmap-volume/output-os.yaml
Vendored
+4 -4
View File
@@ -1,5 +1,5 @@
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
creationTimestamp: null
@@ -56,7 +56,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
@@ -93,7 +93,7 @@ metadata:
name: db-cm0
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
creationTimestamp: null
@@ -155,7 +155,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
script/test/fixtures/deploy/placement/output-placement-os.yaml
Vendored
+2 -2
View File
@@ -17,7 +17,7 @@ status:
loadBalancer: {}
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
creationTimestamp: null
@@ -95,7 +95,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
script/test/fixtures/envvars-interpolation/output-os.yaml
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
creationTimestamp: null
@@ -52,7 +52,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
script/test/fixtures/expose/output-os.yaml
Vendored
+4 -4
View File
@@ -39,7 +39,7 @@ status:
loadBalancer: {}
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
creationTimestamp: null
@@ -87,7 +87,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
@@ -111,7 +111,7 @@ status:
dockerImageRepository: ""
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
annotations:
@@ -164,7 +164,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
script/test/fixtures/external-traffic-policy/output-os-v1.yaml
Vendored
+2 -2
View File
@@ -24,7 +24,7 @@ status:
loadBalancer: {}
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
annotations:
@@ -81,7 +81,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
script/test/fixtures/external-traffic-policy/output-os-v2.yaml
Vendored
+2 -2
View File
@@ -24,7 +24,7 @@ status:
loadBalancer: {}
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
annotations:
@@ -81,7 +81,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
script/test/fixtures/healthcheck/output-healthcheck-os.yaml
Vendored
+8 -8
View File
@@ -98,7 +98,7 @@ status:
loadBalancer: {}
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
annotations:
@@ -165,7 +165,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
@@ -189,7 +189,7 @@ status:
dockerImageRepository: ""
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
annotations:
@@ -256,7 +256,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
@@ -280,7 +280,7 @@ status:
dockerImageRepository: ""
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
annotations:
@@ -350,7 +350,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
@@ -374,7 +374,7 @@ status:
dockerImageRepository: ""
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
annotations:
@@ -442,7 +442,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
script/test/fixtures/host-port-protocol/output-os.yaml
Vendored
+2 -2
View File
@@ -17,7 +17,7 @@ status:
loadBalancer: {}
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
creationTimestamp: null
@@ -66,7 +66,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
script/test/fixtures/multiple-files/output-os.yaml
Vendored
+4 -4
View File
@@ -1,5 +1,5 @@
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
creationTimestamp: null
@@ -44,7 +44,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
@@ -68,7 +68,7 @@ status:
dockerImageRepository: ""
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
creationTimestamp: null
@@ -113,7 +113,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
script/test/fixtures/multiple-type-volumes/output-os.yaml
Vendored
+4 -4
View File
@@ -1,5 +1,5 @@
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
annotations:
@@ -54,7 +54,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
@@ -94,7 +94,7 @@ spec:
status: {}
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
annotations:
@@ -158,7 +158,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
script/test/fixtures/statefulset/output-os.yaml
Vendored
+4 -4
View File
@@ -94,7 +94,7 @@ status:
replicas: 0
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
creationTimestamp: null
@@ -156,7 +156,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
@@ -239,7 +239,7 @@ status:
replicas: 0
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
creationTimestamp: null
@@ -301,7 +301,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
script/test/fixtures/v3.0/output-os.yaml
Vendored
+5 -4
View File
@@ -20,7 +20,7 @@ status:
loadBalancer: {}
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
creationTimestamp: null
@@ -71,7 +71,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
@@ -95,7 +95,7 @@ status:
dockerImageRepository: ""
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
annotations:
@@ -149,7 +149,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null
@@ -171,3 +171,4 @@ spec:
type: ""
status:
dockerImageRepository: ""
script/test/fixtures/volume-mounts/windows/output-os.yaml
Vendored
+2 -2
View File
@@ -17,7 +17,7 @@ status:
loadBalancer: {}
---
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
metadata:
creationTimestamp: null
@@ -73,7 +73,7 @@ status:
updatedReplicas: 0
---
apiVersion: v1
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
creationTimestamp: null