deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

fix: enable compose environment variables interpolation (#1642)

Browse Source 
Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>
This commit is contained in:
AhmedGrati 2023-06-30 16:29:26 +01:00 committed by GitHub
parent 77f5aba9ee
commit 71c3164907
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 64 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/loader/compose/compose.go
View File

@ -156,7 +156,7 @@ func (c *Compose) LoadFile(files []string) (kobject.KomposeObject, error) {
return kobject.KomposeObject{}, err
}
projectOptions, err := cli.NewProjectOptions(files, cli.WithOsEnv, cli.WithWorkingDirectory(workingDir), cli.WithInterpolation(false))
projectOptions, err := cli.NewProjectOptions(files, cli.WithOsEnv, cli.WithWorkingDirectory(workingDir), cli.WithInterpolation(true))
if err != nil {
return kobject.KomposeObject{}, errors.Wrap(err, "Unable to create compose options")
}

9
script/test/cmd/tests_new.sh
View File

@ -249,6 +249,11 @@ os_output="$KOMPOSE_ROOT/script/test/fixtures/fsgroup/output-os.yaml"
convert::expect_success_and_warning "$k8s_cmd" "$k8s_output"
# Test support for compose.yaml file
k8s_cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/compose-file-support convert --stdout --with-kompose-annotation=false"
k8s_cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/compose-file-support/docker-compose.yaml convert --stdout --with-kompose-annotation=false"
k8s_output="$KOMPOSE_ROOT/script/test/fixtures/compose-file-support/output-k8s.yaml"
convert::expect_success "$os_cmd" "$os_output"
convert::expect_success "$k8s_cmd" "$k8s_output"
# Test support for compose env interpolation
k8s_cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/compose-env-interpolation/docker-compose.yaml convert --stdout --with-kompose-annotation=false"
k8s_output="$KOMPOSE_ROOT/script/test/fixtures/compose-env-interpolation/output-k8s.yaml"
convert::expect_success "$k8s_cmd" "$k8s_output"

7
script/test/fixtures/compose-env-interpolation/docker-compose.yaml vendored Normal file
View File

@ -0,0 +1,7 @@
version: '3.8'
services:
foo:
labels:
kompose.image-pull-policy: "${IMAGE_PULL_POLICY:-IfNotPresent}"
build: .

49
script/test/fixtures/compose-env-interpolation/output-k8s.yaml vendored Normal file
View File

@ -0,0 +1,49 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.image-pull-policy: IfNotPresent
creationTimestamp: null
labels:
io.kompose.service: foo
name: foo
spec:
replicas: 1
selector:
matchLabels:
io.kompose.service: foo
strategy: {}
template:
metadata:
annotations:
kompose.image-pull-policy: IfNotPresent
creationTimestamp: null
labels:
io.kompose.network/compose-env-interpolation-default: "true"
io.kompose.service: foo
spec:
containers:
- image: foo
imagePullPolicy: IfNotPresent
name: foo
resources: {}
restartPolicy: Always
status: {}
---
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
creationTimestamp: null
name: compose-env-interpolation-default
spec:
ingress:
- from:
- podSelector:
matchLabels:
io.kompose.network/compose-env-interpolation-default: "true"
podSelector:
matchLabels:
io.kompose.network/compose-env-interpolation-default: "true"