Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #12162 from mattfarina/fix-merge-values-ugh
Fix multiple bugs in values handling
- Loading branch information
Showing
38 changed files
with
1,098 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
--- | ||
# Source: issue-9027/charts/subchart/templates/values.yaml | ||
global: | ||
hash: | ||
key3: 13 | ||
key4: 4 | ||
key5: 5 | ||
key6: 6 | ||
hash: | ||
key3: 13 | ||
key4: 4 | ||
key5: 5 | ||
key6: 6 | ||
--- | ||
# Source: issue-9027/templates/values.yaml | ||
global: | ||
hash: | ||
key1: null | ||
key2: null | ||
key3: 13 | ||
subchart: | ||
global: | ||
hash: | ||
key3: 13 | ||
key4: 4 | ||
key5: 5 | ||
key6: 6 | ||
hash: | ||
key3: 13 | ||
key4: 4 | ||
key5: 5 | ||
key6: 6 |
122 changes: 122 additions & 0 deletions
122
cmd/helm/testdata/output/template-subchart-cm-set-file.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,122 @@ | ||
--- | ||
# Source: subchart/templates/subdir/serviceaccount.yaml | ||
apiVersion: v1 | ||
kind: ServiceAccount | ||
metadata: | ||
name: subchart-sa | ||
--- | ||
# Source: subchart/templates/subdir/configmap.yaml | ||
apiVersion: v1 | ||
kind: ConfigMap | ||
metadata: | ||
name: subchart-cm | ||
data: | ||
value: qux | ||
--- | ||
# Source: subchart/templates/subdir/role.yaml | ||
apiVersion: rbac.authorization.k8s.io/v1 | ||
kind: Role | ||
metadata: | ||
name: subchart-role | ||
rules: | ||
- apiGroups: [""] | ||
resources: ["pods"] | ||
verbs: ["get","list","watch"] | ||
--- | ||
# Source: subchart/templates/subdir/rolebinding.yaml | ||
apiVersion: rbac.authorization.k8s.io/v1 | ||
kind: RoleBinding | ||
metadata: | ||
name: subchart-binding | ||
roleRef: | ||
apiGroup: rbac.authorization.k8s.io | ||
kind: Role | ||
name: subchart-role | ||
subjects: | ||
- kind: ServiceAccount | ||
name: subchart-sa | ||
namespace: default | ||
--- | ||
# Source: subchart/charts/subcharta/templates/service.yaml | ||
apiVersion: v1 | ||
kind: Service | ||
metadata: | ||
name: subcharta | ||
labels: | ||
helm.sh/chart: "subcharta-0.1.0" | ||
spec: | ||
type: ClusterIP | ||
ports: | ||
- port: 80 | ||
targetPort: 80 | ||
protocol: TCP | ||
name: apache | ||
selector: | ||
app.kubernetes.io/name: subcharta | ||
--- | ||
# Source: subchart/charts/subchartb/templates/service.yaml | ||
apiVersion: v1 | ||
kind: Service | ||
metadata: | ||
name: subchartb | ||
labels: | ||
helm.sh/chart: "subchartb-0.1.0" | ||
spec: | ||
type: ClusterIP | ||
ports: | ||
- port: 80 | ||
targetPort: 80 | ||
protocol: TCP | ||
name: nginx | ||
selector: | ||
app.kubernetes.io/name: subchartb | ||
--- | ||
# Source: subchart/templates/service.yaml | ||
apiVersion: v1 | ||
kind: Service | ||
metadata: | ||
name: subchart | ||
labels: | ||
helm.sh/chart: "subchart-0.1.0" | ||
app.kubernetes.io/instance: "release-name" | ||
kube-version/major: "1" | ||
kube-version/minor: "20" | ||
kube-version/version: "v1.20.0" | ||
spec: | ||
type: ClusterIP | ||
ports: | ||
- port: 80 | ||
targetPort: 80 | ||
protocol: TCP | ||
name: nginx | ||
selector: | ||
app.kubernetes.io/name: subchart | ||
--- | ||
# Source: subchart/templates/tests/test-config.yaml | ||
apiVersion: v1 | ||
kind: ConfigMap | ||
metadata: | ||
name: "release-name-testconfig" | ||
annotations: | ||
"helm.sh/hook": test | ||
data: | ||
message: Hello World | ||
--- | ||
# Source: subchart/templates/tests/test-nothing.yaml | ||
apiVersion: v1 | ||
kind: Pod | ||
metadata: | ||
name: "release-name-test" | ||
annotations: | ||
"helm.sh/hook": test | ||
spec: | ||
containers: | ||
- name: test | ||
image: "alpine:latest" | ||
envFrom: | ||
- configMapRef: | ||
name: "release-name-testconfig" | ||
command: | ||
- echo | ||
- "$message" | ||
restartPolicy: Never |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,122 @@ | ||
--- | ||
# Source: subchart/templates/subdir/serviceaccount.yaml | ||
apiVersion: v1 | ||
kind: ServiceAccount | ||
metadata: | ||
name: subchart-sa | ||
--- | ||
# Source: subchart/templates/subdir/configmap.yaml | ||
apiVersion: v1 | ||
kind: ConfigMap | ||
metadata: | ||
name: subchart-cm | ||
data: | ||
value: baz | ||
--- | ||
# Source: subchart/templates/subdir/role.yaml | ||
apiVersion: rbac.authorization.k8s.io/v1 | ||
kind: Role | ||
metadata: | ||
name: subchart-role | ||
rules: | ||
- apiGroups: [""] | ||
resources: ["pods"] | ||
verbs: ["get","list","watch"] | ||
--- | ||
# Source: subchart/templates/subdir/rolebinding.yaml | ||
apiVersion: rbac.authorization.k8s.io/v1 | ||
kind: RoleBinding | ||
metadata: | ||
name: subchart-binding | ||
roleRef: | ||
apiGroup: rbac.authorization.k8s.io | ||
kind: Role | ||
name: subchart-role | ||
subjects: | ||
- kind: ServiceAccount | ||
name: subchart-sa | ||
namespace: default | ||
--- | ||
# Source: subchart/charts/subcharta/templates/service.yaml | ||
apiVersion: v1 | ||
kind: Service | ||
metadata: | ||
name: subcharta | ||
labels: | ||
helm.sh/chart: "subcharta-0.1.0" | ||
spec: | ||
type: ClusterIP | ||
ports: | ||
- port: 80 | ||
targetPort: 80 | ||
protocol: TCP | ||
name: apache | ||
selector: | ||
app.kubernetes.io/name: subcharta | ||
--- | ||
# Source: subchart/charts/subchartb/templates/service.yaml | ||
apiVersion: v1 | ||
kind: Service | ||
metadata: | ||
name: subchartb | ||
labels: | ||
helm.sh/chart: "subchartb-0.1.0" | ||
spec: | ||
type: ClusterIP | ||
ports: | ||
- port: 80 | ||
targetPort: 80 | ||
protocol: TCP | ||
name: nginx | ||
selector: | ||
app.kubernetes.io/name: subchartb | ||
--- | ||
# Source: subchart/templates/service.yaml | ||
apiVersion: v1 | ||
kind: Service | ||
metadata: | ||
name: subchart | ||
labels: | ||
helm.sh/chart: "subchart-0.1.0" | ||
app.kubernetes.io/instance: "release-name" | ||
kube-version/major: "1" | ||
kube-version/minor: "20" | ||
kube-version/version: "v1.20.0" | ||
spec: | ||
type: ClusterIP | ||
ports: | ||
- port: 80 | ||
targetPort: 80 | ||
protocol: TCP | ||
name: nginx | ||
selector: | ||
app.kubernetes.io/name: subchart | ||
--- | ||
# Source: subchart/templates/tests/test-config.yaml | ||
apiVersion: v1 | ||
kind: ConfigMap | ||
metadata: | ||
name: "release-name-testconfig" | ||
annotations: | ||
"helm.sh/hook": test | ||
data: | ||
message: Hello World | ||
--- | ||
# Source: subchart/templates/tests/test-nothing.yaml | ||
apiVersion: v1 | ||
kind: Pod | ||
metadata: | ||
name: "release-name-test" | ||
annotations: | ||
"helm.sh/hook": test | ||
spec: | ||
containers: | ||
- name: test | ||
image: "alpine:latest" | ||
envFrom: | ||
- configMapRef: | ||
name: "release-name-testconfig" | ||
command: | ||
- echo | ||
- "$message" | ||
restartPolicy: Never |
Oops, something went wrong.