From 59d5532181772a31aed3b8e17405ab24140085ca Mon Sep 17 00:00:00 2001 From: AhmedGrati <48932084+AhmedGrati@users.noreply.github.com> Date: Wed, 5 Apr 2023 19:28:19 +0100 Subject: [PATCH] Fix openshift DeploymentConfig and ImageStream APIVersions (#1598) * fix openshift dc and image stream api version Signed-off-by: AhmedGrati * e2e: Update Openshift manifests to update the API Version Signed-off-by: AhmedGrati --------- Signed-off-by: AhmedGrati --- pkg/transformer/openshift/openshift.go | 4 ++-- pkg/transformer/openshift/openshift_test.go | 5 +++++ script/test/cmd/tests_new.sh | 1 + .../output-os-empty-vols-template.yaml | 8 ++++---- .../fixtures/change-in-volume/output-os.yaml | 10 ++++++---- .../configmap-volume/output-os-withlabel.yaml | 8 ++++---- .../fixtures/configmap-volume/output-os.yaml | 8 ++++---- .../deploy/placement/output-placement-os.yaml | 4 ++-- .../envvars-interpolation/output-os.yaml | 4 ++-- script/test/fixtures/expose/output-os.yaml | 8 ++++---- .../external-traffic-policy/output-os-v1.yaml | 4 ++-- .../external-traffic-policy/output-os-v2.yaml | 4 ++-- .../healthcheck/output-healthcheck-os.yaml | 16 ++++++++-------- .../fixtures/host-port-protocol/output-os.yaml | 4 ++-- .../test/fixtures/multiple-files/output-os.yaml | 8 ++++---- .../multiple-type-volumes/output-os.yaml | 8 ++++---- script/test/fixtures/statefulset/output-os.yaml | 8 ++++---- script/test/fixtures/v3.0/output-os.yaml | 9 +++++---- .../volume-mounts/windows/output-os.yaml | 4 ++-- 19 files changed, 67 insertions(+), 58 deletions(-) diff --git a/pkg/transformer/openshift/openshift.go b/pkg/transformer/openshift/openshift.go index 56224b2b..780ad4ad 100644 --- a/pkg/transformer/openshift/openshift.go +++ b/pkg/transformer/openshift/openshift.go @@ -79,7 +79,7 @@ func (o *OpenShift) initImageStream(name string, service kobject.ServiceConfig, is := &imageapi.ImageStream{ TypeMeta: kapi.TypeMeta{ Kind: "ImageStream", - APIVersion: "v1", + APIVersion: "image.openshift.io/v1", }, ObjectMeta: kapi.ObjectMeta{ Name: name, @@ -172,7 +172,7 @@ func (o *OpenShift) initDeploymentConfig(name string, service kobject.ServiceCon dc := &deployapi.DeploymentConfig{ TypeMeta: kapi.TypeMeta{ Kind: "DeploymentConfig", - APIVersion: "v1", + APIVersion: "apps.openshift.io/v1", }, ObjectMeta: kapi.ObjectMeta{ Name: name, diff --git a/pkg/transformer/openshift/openshift_test.go b/pkg/transformer/openshift/openshift_test.go index 60fe8bce..b3750172 100644 --- a/pkg/transformer/openshift/openshift_test.go +++ b/pkg/transformer/openshift/openshift_test.go @@ -105,6 +105,11 @@ func TestInitDeploymentConfig(t *testing.T) { if spec.Spec.Triggers[1].ImageChangeParams.ContainerNames[0] != "myfoobarname" { t.Errorf("Expected myfoobarname for name, actual %s", spec.Spec.Triggers[1].ImageChangeParams.ContainerNames[0]) } + + // Check that the APIVersion is equal to "apps.openshift.io/v1" + if spec.APIVersion != "apps.openshift.io/v1" { + t.Errorf("Expected 'apps.openshift.io/v1' for APIVersion, actual %s", spec.APIVersion) + } } func TestKomposeConvertRoute(t *testing.T) { diff --git a/script/test/cmd/tests_new.sh b/script/test/cmd/tests_new.sh index ca669b72..80f5415f 100755 --- a/script/test/cmd/tests_new.sh +++ b/script/test/cmd/tests_new.sh @@ -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" diff --git a/script/test/fixtures/change-in-volume/output-os-empty-vols-template.yaml b/script/test/fixtures/change-in-volume/output-os-empty-vols-template.yaml index 5fe99044..40061b7a 100644 --- a/script/test/fixtures/change-in-volume/output-os-empty-vols-template.yaml +++ b/script/test/fixtures/change-in-volume/output-os-empty-vols-template.yaml @@ -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 diff --git a/script/test/fixtures/change-in-volume/output-os.yaml b/script/test/fixtures/change-in-volume/output-os.yaml index 142fabe2..40061b7a 100644 --- a/script/test/fixtures/change-in-volume/output-os.yaml +++ b/script/test/fixtures/change-in-volume/output-os.yaml @@ -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 diff --git a/script/test/fixtures/configmap-volume/output-os-withlabel.yaml b/script/test/fixtures/configmap-volume/output-os-withlabel.yaml index b8752be8..4ab7aa8a 100644 --- a/script/test/fixtures/configmap-volume/output-os-withlabel.yaml +++ b/script/test/fixtures/configmap-volume/output-os-withlabel.yaml @@ -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 diff --git a/script/test/fixtures/configmap-volume/output-os.yaml b/script/test/fixtures/configmap-volume/output-os.yaml index 92870173..c1a9628e 100644 --- a/script/test/fixtures/configmap-volume/output-os.yaml +++ b/script/test/fixtures/configmap-volume/output-os.yaml @@ -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 diff --git a/script/test/fixtures/deploy/placement/output-placement-os.yaml b/script/test/fixtures/deploy/placement/output-placement-os.yaml index 39a9a797..d59f6b4f 100644 --- a/script/test/fixtures/deploy/placement/output-placement-os.yaml +++ b/script/test/fixtures/deploy/placement/output-placement-os.yaml @@ -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 diff --git a/script/test/fixtures/envvars-interpolation/output-os.yaml b/script/test/fixtures/envvars-interpolation/output-os.yaml index 15dac9a1..d2bc32b4 100644 --- a/script/test/fixtures/envvars-interpolation/output-os.yaml +++ b/script/test/fixtures/envvars-interpolation/output-os.yaml @@ -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 diff --git a/script/test/fixtures/expose/output-os.yaml b/script/test/fixtures/expose/output-os.yaml index 59a63e79..149ceab4 100644 --- a/script/test/fixtures/expose/output-os.yaml +++ b/script/test/fixtures/expose/output-os.yaml @@ -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 diff --git a/script/test/fixtures/external-traffic-policy/output-os-v1.yaml b/script/test/fixtures/external-traffic-policy/output-os-v1.yaml index e7226313..6ce6a5df 100644 --- a/script/test/fixtures/external-traffic-policy/output-os-v1.yaml +++ b/script/test/fixtures/external-traffic-policy/output-os-v1.yaml @@ -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 diff --git a/script/test/fixtures/external-traffic-policy/output-os-v2.yaml b/script/test/fixtures/external-traffic-policy/output-os-v2.yaml index 159116b6..49f64791 100644 --- a/script/test/fixtures/external-traffic-policy/output-os-v2.yaml +++ b/script/test/fixtures/external-traffic-policy/output-os-v2.yaml @@ -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 diff --git a/script/test/fixtures/healthcheck/output-healthcheck-os.yaml b/script/test/fixtures/healthcheck/output-healthcheck-os.yaml index 54479474..a4a29a6b 100644 --- a/script/test/fixtures/healthcheck/output-healthcheck-os.yaml +++ b/script/test/fixtures/healthcheck/output-healthcheck-os.yaml @@ -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 diff --git a/script/test/fixtures/host-port-protocol/output-os.yaml b/script/test/fixtures/host-port-protocol/output-os.yaml index a83baa07..e1659373 100644 --- a/script/test/fixtures/host-port-protocol/output-os.yaml +++ b/script/test/fixtures/host-port-protocol/output-os.yaml @@ -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 diff --git a/script/test/fixtures/multiple-files/output-os.yaml b/script/test/fixtures/multiple-files/output-os.yaml index 68cc31c4..d673d065 100644 --- a/script/test/fixtures/multiple-files/output-os.yaml +++ b/script/test/fixtures/multiple-files/output-os.yaml @@ -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 diff --git a/script/test/fixtures/multiple-type-volumes/output-os.yaml b/script/test/fixtures/multiple-type-volumes/output-os.yaml index 9ab5a4bd..9a4c7b76 100644 --- a/script/test/fixtures/multiple-type-volumes/output-os.yaml +++ b/script/test/fixtures/multiple-type-volumes/output-os.yaml @@ -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 diff --git a/script/test/fixtures/statefulset/output-os.yaml b/script/test/fixtures/statefulset/output-os.yaml index f52e7b3c..849c8b76 100644 --- a/script/test/fixtures/statefulset/output-os.yaml +++ b/script/test/fixtures/statefulset/output-os.yaml @@ -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 diff --git a/script/test/fixtures/v3.0/output-os.yaml b/script/test/fixtures/v3.0/output-os.yaml index 0000c3cf..26117700 100644 --- a/script/test/fixtures/v3.0/output-os.yaml +++ b/script/test/fixtures/v3.0/output-os.yaml @@ -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: "" + diff --git a/script/test/fixtures/volume-mounts/windows/output-os.yaml b/script/test/fixtures/volume-mounts/windows/output-os.yaml index f0f0a762..ac6b530e 100644 --- a/script/test/fixtures/volume-mounts/windows/output-os.yaml +++ b/script/test/fixtures/volume-mounts/windows/output-os.yaml @@ -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