mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-06-11 17:12:51 +00:00
Remove minecraft version check from chart plugin tests.
This commit is contained in:
@@ -196,6 +196,11 @@ func hint(a, b string) string {
|
|||||||
|
|
||||||
func (th *KustTestHarness) AssertActualEqualsExpected(
|
func (th *KustTestHarness) AssertActualEqualsExpected(
|
||||||
m resmap.ResMap, expected string) {
|
m resmap.ResMap, expected string) {
|
||||||
|
th.AssertActualEqualsExpectedWithTweak(m, nil, expected)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (th *KustTestHarness) AssertActualEqualsExpectedWithTweak(
|
||||||
|
m resmap.ResMap, tweaker func([]byte) []byte, expected string) {
|
||||||
if m == nil {
|
if m == nil {
|
||||||
th.t.Fatalf("Map should not be nil.")
|
th.t.Fatalf("Map should not be nil.")
|
||||||
}
|
}
|
||||||
@@ -208,6 +213,9 @@ func (th *KustTestHarness) AssertActualEqualsExpected(
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
th.t.Fatalf("Unexpected err: %v", err)
|
th.t.Fatalf("Unexpected err: %v", err)
|
||||||
}
|
}
|
||||||
|
if tweaker != nil {
|
||||||
|
actual = tweaker(actual)
|
||||||
|
}
|
||||||
if string(actual) != expected {
|
if string(actual) != expected {
|
||||||
th.reportDiffAndFail(actual, expected)
|
th.reportDiffAndFail(actual, expected)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,9 +8,10 @@
|
|||||||
package target_test
|
package target_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"regexp"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
kusttest_test "sigs.k8s.io/kustomize/v3/pkg/kusttest"
|
"sigs.k8s.io/kustomize/v3/pkg/kusttest"
|
||||||
"sigs.k8s.io/kustomize/v3/pkg/plugins/testenv"
|
"sigs.k8s.io/kustomize/v3/pkg/plugins/testenv"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -53,7 +54,11 @@ chartName: minecraft
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Err: %v", err)
|
t.Fatalf("Err: %v", err)
|
||||||
}
|
}
|
||||||
th.AssertActualEqualsExpected(m, `
|
chartName := regexp.MustCompile("chart: minecraft-[0-9.]+")
|
||||||
|
th.AssertActualEqualsExpectedWithTweak(m,
|
||||||
|
func(x []byte) []byte {
|
||||||
|
return chartName.ReplaceAll(x, []byte("chart: minecraft-SOMEVERSION"))
|
||||||
|
}, `
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
data:
|
data:
|
||||||
rcon-password: Q0hBTkdFTUUh
|
rcon-password: Q0hBTkdFTUUh
|
||||||
@@ -61,7 +66,7 @@ kind: Secret
|
|||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: release-name-minecraft
|
app: release-name-minecraft
|
||||||
chart: minecraft-1.1.2
|
chart: minecraft-SOMEVERSION
|
||||||
heritage: Tiller
|
heritage: Tiller
|
||||||
release: release-name
|
release: release-name
|
||||||
name: LOOOOOOOONG-release-name-minecraft
|
name: LOOOOOOOONG-release-name-minecraft
|
||||||
@@ -74,7 +79,7 @@ metadata:
|
|||||||
volume.alpha.kubernetes.io/storage-class: default
|
volume.alpha.kubernetes.io/storage-class: default
|
||||||
labels:
|
labels:
|
||||||
app: release-name-minecraft
|
app: release-name-minecraft
|
||||||
chart: minecraft-1.1.2
|
chart: minecraft-SOMEVERSION
|
||||||
heritage: Tiller
|
heritage: Tiller
|
||||||
release: release-name
|
release: release-name
|
||||||
name: LOOOOOOOONG-release-name-minecraft-datadir
|
name: LOOOOOOOONG-release-name-minecraft-datadir
|
||||||
@@ -90,7 +95,7 @@ kind: Service
|
|||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: release-name-minecraft
|
app: release-name-minecraft
|
||||||
chart: minecraft-1.1.2
|
chart: minecraft-SOMEVERSION
|
||||||
heritage: Tiller
|
heritage: Tiller
|
||||||
release: release-name
|
release: release-name
|
||||||
name: LOOOOOOOONG-release-name-minecraft
|
name: LOOOOOOOONG-release-name-minecraft
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
package main_test
|
package main_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"regexp"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"sigs.k8s.io/kustomize/v3/pkg/kusttest"
|
"sigs.k8s.io/kustomize/v3/pkg/kusttest"
|
||||||
@@ -34,7 +35,11 @@ metadata:
|
|||||||
name: notImportantHere
|
name: notImportantHere
|
||||||
chartName: minecraft`)
|
chartName: minecraft`)
|
||||||
|
|
||||||
th.AssertActualEqualsExpected(m, `
|
chartName := regexp.MustCompile("chart: minecraft-[0-9.]+")
|
||||||
|
th.AssertActualEqualsExpectedWithTweak(m,
|
||||||
|
func(x []byte) []byte {
|
||||||
|
return chartName.ReplaceAll(x, []byte("chart: minecraft-SOMEVERSION"))
|
||||||
|
}, `
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
data:
|
data:
|
||||||
rcon-password: Q0hBTkdFTUUh
|
rcon-password: Q0hBTkdFTUUh
|
||||||
@@ -42,7 +47,7 @@ kind: Secret
|
|||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: release-name-minecraft
|
app: release-name-minecraft
|
||||||
chart: minecraft-1.1.2
|
chart: minecraft-SOMEVERSION
|
||||||
heritage: Tiller
|
heritage: Tiller
|
||||||
release: release-name
|
release: release-name
|
||||||
name: release-name-minecraft
|
name: release-name-minecraft
|
||||||
@@ -55,7 +60,7 @@ metadata:
|
|||||||
volume.alpha.kubernetes.io/storage-class: default
|
volume.alpha.kubernetes.io/storage-class: default
|
||||||
labels:
|
labels:
|
||||||
app: release-name-minecraft
|
app: release-name-minecraft
|
||||||
chart: minecraft-1.1.2
|
chart: minecraft-SOMEVERSION
|
||||||
heritage: Tiller
|
heritage: Tiller
|
||||||
release: release-name
|
release: release-name
|
||||||
name: release-name-minecraft-datadir
|
name: release-name-minecraft-datadir
|
||||||
@@ -71,7 +76,7 @@ kind: Service
|
|||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: release-name-minecraft
|
app: release-name-minecraft
|
||||||
chart: minecraft-1.1.2
|
chart: minecraft-SOMEVERSION
|
||||||
heritage: Tiller
|
heritage: Tiller
|
||||||
release: release-name
|
release: release-name
|
||||||
name: release-name-minecraft
|
name: release-name-minecraft
|
||||||
|
|||||||
Reference in New Issue
Block a user