Skip to content

Commit

Permalink
restructure
Browse files Browse the repository at this point in the history
  • Loading branch information
bearium committed Nov 6, 2019
1 parent e42aac7 commit 691dff3
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion api/target/kusttarget.go
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ func (kt *KustTarget) AccumulateTarget() (
if err != nil {
return nil, err
}
// append unresolved vars to kustomize vars in hope of finding refrence in current resource
// append unresolved vars to kustomize vars in hope of finding reference in current resource
kt.kustomization.Vars = append(kt.kustomization.Vars, ra.Vars()...)
ra.DeleteVars()

Expand Down
32 changes: 16 additions & 16 deletions api/target/variableref_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package target_test

import (
"strings"
"strings"
"testing"

"sigs.k8s.io/kustomize/api/testutils/kusttest"
Expand Down Expand Up @@ -132,11 +132,11 @@ resources:
- ../base1
- ../base2
`)
m, err := th.MakeKustTarget().MakeCustomizedResMap()
if err != nil {
m, err := th.MakeKustTarget().MakeCustomizedResMap()
if err != nil {
t.Fatalf("Err: %v", err)
}
th.AssertActualEqualsExpected(m,`
}
th.AssertActualEqualsExpected(m, `
apiVersion: v1
kind: Pod
metadata:
Expand Down Expand Up @@ -233,7 +233,7 @@ spec:
value: "$(POD_NAME)"
`)

th.WriteK("/app/overlay", `
th.WriteK("/app/overlay", `
resources:
- ../base1
- ../base2
Expand All @@ -246,11 +246,11 @@ vars:
fieldref:
fieldpath: metadata.test
`)
m, err := th.MakeKustTarget().MakeCustomizedResMap()
if err != nil {
m, err := th.MakeKustTarget().MakeCustomizedResMap()
if err != nil {
t.Fatalf("Err: %v", err)
}
th.AssertActualEqualsExpected(m,`
}
th.AssertActualEqualsExpected(m, `
apiVersion: v1
kind: Pod
metadata:
Expand Down Expand Up @@ -367,11 +367,11 @@ spec:
`)
_, err := th.MakeKustTarget().MakeCustomizedResMap()
if err == nil {
t.Fatalf("should have an error")
t.Fatalf("should have an error")
}
if !strings.Contains(err.Error(), "var 'POD_NAME1' already encountered") {
if !strings.Contains(err.Error(), "var 'POD_NAME1' already encountered") {
t.Fatalf("unexpected err: %v", err)
}
}
}

func TestVarPropagatesUp(t *testing.T) {
Expand Down Expand Up @@ -568,11 +568,11 @@ resources:
- ../o1
- ../o2
`)
m, err := th.MakeKustTarget().MakeCustomizedResMap()
if err != nil {
m, err := th.MakeKustTarget().MakeCustomizedResMap()
if err != nil {
t.Fatalf("Err: %v", err)
}
th.AssertActualEqualsExpected(m, `
th.AssertActualEqualsExpected(m, `
apiVersion: v1
kind: Pod
metadata:
Expand Down

0 comments on commit 691dff3

Please sign in to comment.