Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion chartify.go
Original file line number Diff line number Diff line change
Expand Up @@ -624,10 +624,15 @@ func (r *Runner) ReadAdhocDependencies(u *ChartifyOpts) ([]Dependency, error) {
condName = name
}

condition := d.Condition
if condition == "" {
condition = fmt.Sprintf("%s.enabled", condName)
}

deps = append(deps, Dependency{
Name: name,
Repository: repoUrl,
Condition: fmt.Sprintf("%s.enabled", condName),
Condition: condition,
Alias: d.Alias,
Version: d.Version,
})
Expand Down
39 changes: 39 additions & 0 deletions chartify_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,45 @@ func TestReadAdhocDependencies(t *testing.T) {
},
})

run(testcase{
opts: ChartifyOpts{
AdhocChartDependencies: []ChartDependency{
{
Alias: "mydb",
Chart: "./testdata/charts/db",
Condition: "global.mydb.enabled",
},
},
},
wantDendency: []Dependency{
{
Repository: "file://./testdata/charts/db",
Name: "db",
Alias: "mydb",
Condition: "global.mydb.enabled",
},
},
})

run(testcase{
opts: ChartifyOpts{
AdhocChartDependencies: []ChartDependency{
{
Alias: "mydb",
Chart: "./testdata/charts/db",
},
},
},
wantDendency: []Dependency{
{
Repository: "file://./testdata/charts/db",
Name: "db",
Alias: "mydb",
Condition: "mydb.enabled",
},
},
})

run(testcase{
opts: ChartifyOpts{
AdhocChartDependencies: []ChartDependency{
Expand Down
42 changes: 42 additions & 0 deletions integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,48 @@ func TestIntegration(t *testing.T) {
},
})

// SAVE_SNAPSHOT=1 go1.25 test -run ^TestIntegration/adhoc_dependency_custom_condition$ ./
// See https://github.com/helmfile/chartify/pull/214
runTest(t, integrationTestCase{
description: "adhoc dependency custom condition",
release: "myapp",
chart: repo + "/db",
opts: ChartifyOpts{
AdhocChartDependencies: []ChartDependency{
{
Alias: "log",
Chart: repo + chartSuffix,
Version: "0.1.0",
Condition: "global.log.enabled",
},
},
SetFlags: []string{
"--set", "global.log.enabled=true",
},
},
})

// SAVE_SNAPSHOT=1 go1.25 test -run ^TestIntegration/adhoc_dependency_custom_condition_disabled$ ./
// See https://github.com/helmfile/chartify/pull/214
runTest(t, integrationTestCase{
description: "adhoc dependency custom condition disabled",
release: "myapp",
chart: repo + "/db",
opts: ChartifyOpts{
AdhocChartDependencies: []ChartDependency{
{
Alias: "log",
Chart: repo + chartSuffix,
Version: "0.1.0",
Condition: "global.log.enabled",
},
},
SetFlags: []string{
"--set", "global.log.enabled=false",
},
},
})

// SAVE_SNAPSHOT=1 go1.25 test -run ^TestIntegration/force_namespace$ ./
runTest(t, integrationTestCase{
description: "force namespace",
Expand Down
3 changes: 3 additions & 0 deletions requirements.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ type ChartDependency struct {
Alias string
Chart string
Version string
// Condition is written to the dependency's `condition` field.
// When empty, it defaults to `<alias or chart name>.enabled`.
Condition string
}

// UpdateRequirements updates either Chart.yaml's dependencies(helm 3) or requirements.yaml(helm 2)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
---
# Source: db/charts/log/templates/deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
name: myapp-log
labels:
helm.sh/chart: log-0.1.0
app.kubernetes.io/name: log
app.kubernetes.io/instance: myapp
app.kubernetes.io/version: "1.16.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/name: log
app.kubernetes.io/instance: myapp
template:
metadata:
labels:
app.kubernetes.io/name: log
app.kubernetes.io/instance: myapp
spec:
containers:
- name: log
image: "nginx:1.16.0"
---
# Source: db/templates/deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
name: myapp-db
labels:
helm.sh/chart: db-0.1.0
app.kubernetes.io/name: db
app.kubernetes.io/instance: myapp
app.kubernetes.io/version: "1.16.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/name: db
app.kubernetes.io/instance: myapp
template:
metadata:
labels:
app.kubernetes.io/name: db
app.kubernetes.io/instance: myapp
spec:
containers:
- name: db
image: "nginx:1.16.0"
---
# Source: db/charts/log/templates/tests/test-connection.yaml
apiVersion: v1
kind: Pod
metadata:
name: "myapp-log-test-connection"
labels:
helm.sh/chart: log-0.1.0
app.kubernetes.io/name: log
app.kubernetes.io/instance: myapp
app.kubernetes.io/version: "1.16.0"
app.kubernetes.io/managed-by: Helm
annotations:
"helm.sh/hook": test
spec:
containers:
- name: wget
image: busybox
command: ['wget']
args: ['myapp-log:80']
restartPolicy: Never
---
# Source: db/templates/tests/test-connection.yaml
apiVersion: v1
kind: Pod
metadata:
name: "myapp-db-test-connection"
labels:
helm.sh/chart: db-0.1.0
app.kubernetes.io/name: db
app.kubernetes.io/instance: myapp
app.kubernetes.io/version: "1.16.0"
app.kubernetes.io/managed-by: Helm
annotations:
"helm.sh/hook": test
spec:
containers:
- name: wget
image: busybox
command: ['wget']
args: ['myapp-db:80']
restartPolicy: Never
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
---
# Source: db/templates/deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
name: myapp-db
labels:
helm.sh/chart: db-0.1.0
app.kubernetes.io/name: db
app.kubernetes.io/instance: myapp
app.kubernetes.io/version: "1.16.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/name: db
app.kubernetes.io/instance: myapp
template:
metadata:
labels:
app.kubernetes.io/name: db
app.kubernetes.io/instance: myapp
spec:
containers:
- name: db
image: "nginx:1.16.0"
---
# Source: db/templates/tests/test-connection.yaml
apiVersion: v1
kind: Pod
metadata:
name: "myapp-db-test-connection"
labels:
helm.sh/chart: db-0.1.0
app.kubernetes.io/name: db
app.kubernetes.io/instance: myapp
app.kubernetes.io/version: "1.16.0"
app.kubernetes.io/managed-by: Helm
annotations:
"helm.sh/hook": test
spec:
containers:
- name: wget
image: busybox
command: ['wget']
args: ['myapp-db:80']
restartPolicy: Never
Loading