diff --git a/script/test/cmd/tests_new.sh b/script/test/cmd/tests_new.sh index f4acdb13a..5ad639215 100755 --- a/script/test/cmd/tests_new.sh +++ b/script/test/cmd/tests_new.sh @@ -279,3 +279,9 @@ k8s_output="$KOMPOSE_ROOT/script/test/fixtures/custom-build-push/output-k8s.yaml convert::expect_success "$os_cmd" "$os_output" # Test env_file support +k8s_cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/env/docker-compose.yml convert --stdout --with-kompose-annotation=false" +k8s_output="$KOMPOSE_ROOT/script/test/fixtures/env/output-k8s.yaml" +os_cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/env/docker-compose.yml convert --provider openshift --stdout --with-kompose-annotation=false" +os_output="$KOMPOSE_ROOT/script/test/fixtures/env/output-os.yaml" +convert::expect_success "$k8s_cmd" "$k8s_output" +convert::expect_success "$os_cmd" "$os_output" diff --git a/script/test/cmd/update-e2e.sh b/script/test/cmd/update-e2e.sh index 4fd089bb4..39af02f66 100755 --- a/script/test/cmd/update-e2e.sh +++ b/script/test/cmd/update-e2e.sh @@ -28,6 +28,7 @@ $KOMPOSE_ROOT/kompose -f $KOMPOSE_ROOT/script/test/fixtures/host-port-protocol/d $KOMPOSE_ROOT/kompose -f $KOMPOSE_ROOT/script/test/fixtures/external-traffic-policy/docker-compose-v1.yaml convert --stdout --with-kompose-annotation=false > $KOMPOSE_ROOT/script/test/fixtures/external-traffic-policy/output-k8s-v1.yaml $KOMPOSE_ROOT/kompose -f $KOMPOSE_ROOT/script/test/fixtures/external-traffic-policy/docker-compose-v2.yaml convert --stdout --with-kompose-annotation=false > $KOMPOSE_ROOT/script/test/fixtures/external-traffic-policy/output-k8s-v2.yaml $KOMPOSE_ROOT/kompose -f $KOMPOSE_ROOT/script/test/fixtures/compose-file-support/compose.yaml convert --stdout --with-kompose-annotation=false > $KOMPOSE_ROOT/script/test/fixtures/compose-file-support/output-k8s.yaml +$KOMPOSE_ROOT/kompose -f $KOMPOSE_ROOT/script/test/fixtures/env/docker-compose.yml convert --stdout --with-kompose-annotation=false > $KOMPOSE_ROOT/script/test/fixtures/env/output-k8s.yaml fi if $UPDATE_OS ; then @@ -48,4 +49,5 @@ $KOMPOSE_ROOT/kompose --provider=openshift -f $KOMPOSE_ROOT/script/test/fixtur $KOMPOSE_ROOT/kompose --provider=openshift -f $KOMPOSE_ROOT/script/test/fixtures/host-port-protocol/docker-compose.yaml convert --stdout --with-kompose-annotation=false > $KOMPOSE_ROOT/script/test/fixtures/host-port-protocol/output-os.yaml $KOMPOSE_ROOT/kompose --provider=openshift -f $KOMPOSE_ROOT/script/test/fixtures/external-traffic-policy/docker-compose-v1.yaml convert --stdout --with-kompose-annotation=false > $KOMPOSE_ROOT/script/test/fixtures/external-traffic-policy/output-os-v1.yaml $KOMPOSE_ROOT/kompose --provider=openshift -f $KOMPOSE_ROOT/script/test/fixtures/external-traffic-policy/docker-compose-v2.yaml convert --stdout --with-kompose-annotation=false > $KOMPOSE_ROOT/script/test/fixtures/external-traffic-policy/output-os-v2.yaml +$KOMPOSE_ROOT/kompose -f $KOMPOSE_ROOT/script/test/fixtures/env/docker-compose.yml convert --stdout --with-kompose-annotation=false --provider openshift > $KOMPOSE_ROOT/script/test/fixtures/env/output-os.yaml fi diff --git a/script/test/fixtures/env/docker-compose.yml b/script/test/fixtures/env/docker-compose.yml index 1949dca27..8d989deea 100644 --- a/script/test/fixtures/env/docker-compose.yml +++ b/script/test/fixtures/env/docker-compose.yml @@ -2,16 +2,14 @@ version: '3' services: namenode: image: bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8 - volumes: - - namenode:/hadoop/dfs/name environment: - CLUSTER_NAME=test env_file: - - ./hadoop-hive-namenode.env + - hadoop-hive-namenode.env ports: - "50070:50070" - "8020:8020" another-namenode: image: bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8 env_file: - - ./hadoop-hive-namenode.env \ No newline at end of file + - hadoop-hive-namenode.env diff --git a/script/test/fixtures/env/output-k8s.yaml b/script/test/fixtures/env/output-k8s.yaml new file mode 100644 index 000000000..9d3ff0dd7 --- /dev/null +++ b/script/test/fixtures/env/output-k8s.yaml @@ -0,0 +1,120 @@ +--- +apiVersion: v1 +kind: Service +metadata: + creationTimestamp: null + labels: + io.kompose.service: namenode + name: namenode +spec: + ports: + - name: "50070" + port: 50070 + targetPort: 50070 + - name: "8020" + port: 8020 + targetPort: 8020 + selector: + io.kompose.service: namenode +status: + loadBalancer: {} + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + creationTimestamp: null + labels: + io.kompose.service: another-namenode + name: another-namenode +spec: + replicas: 1 + selector: + matchLabels: + io.kompose.service: another-namenode + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + io.kompose.network/env-default: "true" + io.kompose.service: another-namenode + spec: + containers: + - env: + - name: BAR + valueFrom: + configMapKeyRef: + key: BAR + name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env + - name: FOO + valueFrom: + configMapKeyRef: + key: FOO + name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env + image: bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8 + name: another-namenode + resources: {} + restartPolicy: Always +status: {} + +--- +apiVersion: v1 +data: + BAR: FOO + FOO: BAR +kind: ConfigMap +metadata: + creationTimestamp: null + labels: + io.kompose.service: another-namenode-Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env + name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + creationTimestamp: null + labels: + io.kompose.service: namenode + name: namenode +spec: + replicas: 1 + selector: + matchLabels: + io.kompose.service: namenode + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + io.kompose.network/env-default: "true" + io.kompose.service: namenode + spec: + containers: + - env: + - name: BAR + valueFrom: + configMapKeyRef: + key: BAR + name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env + - name: CLUSTER_NAME + value: test + - name: FOO + valueFrom: + configMapKeyRef: + key: FOO + name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env + image: bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8 + name: namenode + ports: + - containerPort: 50070 + hostPort: 50070 + protocol: TCP + - containerPort: 8020 + hostPort: 8020 + protocol: TCP + resources: {} + restartPolicy: Always +status: {} + diff --git a/script/test/fixtures/env/output-os.yaml b/script/test/fixtures/env/output-os.yaml new file mode 100644 index 000000000..2bfb05650 --- /dev/null +++ b/script/test/fixtures/env/output-os.yaml @@ -0,0 +1,202 @@ +--- +apiVersion: v1 +kind: Service +metadata: + creationTimestamp: null + labels: + io.kompose.service: namenode + name: namenode +spec: + ports: + - name: "50070" + port: 50070 + targetPort: 50070 + - name: "8020" + port: 8020 + targetPort: 8020 + selector: + io.kompose.service: namenode +status: + loadBalancer: {} + +--- +apiVersion: v1 +data: + BAR: FOO + FOO: BAR +kind: ConfigMap +metadata: + creationTimestamp: null + labels: + io.kompose.service: another-namenode-Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env + name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env + +--- +apiVersion: apps.openshift.io/v1 +kind: DeploymentConfig +metadata: + creationTimestamp: null + labels: + io.kompose.service: another-namenode + name: another-namenode +spec: + replicas: 1 + selector: + io.kompose.service: another-namenode + strategy: + resources: {} + template: + metadata: + creationTimestamp: null + labels: + io.kompose.network/env-default: "true" + io.kompose.service: another-namenode + spec: + containers: + - env: + - name: BAR + valueFrom: + configMapKeyRef: + key: BAR + name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env + - name: FOO + valueFrom: + configMapKeyRef: + key: FOO + name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env + image: ' ' + name: another-namenode + resources: {} + restartPolicy: Always + test: false + triggers: + - type: ConfigChange + - imageChangeParams: + automatic: true + containerNames: + - another-namenode + from: + kind: ImageStreamTag + name: another-namenode:2.0.0-hadoop2.7.4-java8 + type: ImageChange +status: + availableReplicas: 0 + latestVersion: 0 + observedGeneration: 0 + replicas: 0 + unavailableReplicas: 0 + updatedReplicas: 0 + +--- +apiVersion: image.openshift.io/v1 +kind: ImageStream +metadata: + creationTimestamp: null + labels: + io.kompose.service: another-namenode + name: another-namenode +spec: + lookupPolicy: + local: false + tags: + - annotations: null + from: + kind: DockerImage + name: bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8 + generation: null + importPolicy: {} + name: 2.0.0-hadoop2.7.4-java8 + referencePolicy: + type: "" +status: + dockerImageRepository: "" + +--- +apiVersion: apps.openshift.io/v1 +kind: DeploymentConfig +metadata: + creationTimestamp: null + labels: + io.kompose.service: namenode + name: namenode +spec: + replicas: 1 + selector: + io.kompose.service: namenode + strategy: + resources: {} + template: + metadata: + creationTimestamp: null + labels: + io.kompose.network/env-default: "true" + io.kompose.service: namenode + spec: + containers: + - env: + - name: BAR + valueFrom: + configMapKeyRef: + key: BAR + name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env + - name: CLUSTER_NAME + value: test + - name: FOO + valueFrom: + configMapKeyRef: + key: FOO + name: Users-ahmedgrati-projects-kompose-script-test-fixtures-env-hadoop-hive-namenode-env + image: ' ' + name: namenode + ports: + - containerPort: 50070 + hostPort: 50070 + protocol: TCP + - containerPort: 8020 + hostPort: 8020 + protocol: TCP + resources: {} + restartPolicy: Always + test: false + triggers: + - type: ConfigChange + - imageChangeParams: + automatic: true + containerNames: + - namenode + from: + kind: ImageStreamTag + name: namenode:2.0.0-hadoop2.7.4-java8 + type: ImageChange +status: + availableReplicas: 0 + latestVersion: 0 + observedGeneration: 0 + replicas: 0 + unavailableReplicas: 0 + updatedReplicas: 0 + +--- +apiVersion: image.openshift.io/v1 +kind: ImageStream +metadata: + creationTimestamp: null + labels: + io.kompose.service: namenode + name: namenode +spec: + lookupPolicy: + local: false + tags: + - annotations: null + from: + kind: DockerImage + name: bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8 + generation: null + importPolicy: {} + name: 2.0.0-hadoop2.7.4-java8 + referencePolicy: + type: "" +status: + dockerImageRepository: "" +