mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-05-17 18:25:26 +00:00
Annotate decisions on issue 3304 in api.
This commit is contained in:
@@ -124,6 +124,7 @@ func TestRefVarTransformer(t *testing.T) {
|
||||
"slice": []interface{}{5}, // noticeably *not* a []string
|
||||
}}).ResMap(),
|
||||
},
|
||||
// TODO(#3304): DECISION - kyaml better; not a bug.
|
||||
errMessage: konfig.IfApiMachineryElseKyaml(
|
||||
`obj '{"apiVersion": "v1", "data": {"slice": [5]}, "kind": "ConfigMap", "metadata": {"name": "cm1"}}
|
||||
' at path 'data/slice': invalid value type expect a string`,
|
||||
|
||||
@@ -214,12 +214,16 @@ metadata:
|
||||
type: Opaque
|
||||
`
|
||||
th.AssertActualEqualsExpected(
|
||||
m, opts.IfApiMachineryElseKyaml(
|
||||
fmt.Sprintf(expFmt,
|
||||
m,
|
||||
// TODO(#3304): DECISION - kyaml better; not a bug.
|
||||
opts.IfApiMachineryElseKyaml(
|
||||
fmt.Sprintf(
|
||||
expFmt,
|
||||
`CmdyYXZpdGF0aW9uYWwKZWxlY3Ryb21hZ25ldGljCnN0cm9uZyBudWNsZWFyCndlYWsgbnVjbGVhcgo=`,
|
||||
`CkxpZmUgaXMgc2hvcnQuCkJ1dCB0aGUgeWVhcnMgYXJlIGxvbmcuCk5vdCB3aGlsZSB0aGUgZXZpbCBkYXlzIGNvbWUgbm90Lgo=`,
|
||||
`ftht6hfgmb`),
|
||||
fmt.Sprintf(expFmt, `|
|
||||
fmt.Sprintf(
|
||||
expFmt, `|
|
||||
CmdyYXZpdGF0aW9uYWwKZWxlY3Ryb21hZ25ldGljCnN0cm9uZyBudWNsZWFyCndlYWsgbn
|
||||
VjbGVhcgo=`, `|
|
||||
CkxpZmUgaXMgc2hvcnQuCkJ1dCB0aGUgeWVhcnMgYXJlIGxvbmcuCk5vdCB3aGlsZSB0aG
|
||||
|
||||
@@ -318,8 +318,9 @@ spec:
|
||||
volumes:%s
|
||||
name: nginx-persistent-storage
|
||||
`
|
||||
// TODO(#3394)
|
||||
th.AssertActualEqualsExpected(
|
||||
// TODO(#3394)
|
||||
// TODO(#3304): DECISION - still a bug, emptyDir should be deleted.
|
||||
m, opts.IfApiMachineryElseKyaml(
|
||||
fmt.Sprintf(expFmt, `
|
||||
- gcePersistentDisk:
|
||||
|
||||
@@ -121,7 +121,14 @@ spec:
|
||||
// minAvailable are mutually exclusive, and both can hold
|
||||
// either an integer, i.e. 10, or string that has to be
|
||||
// an int followed by a percent sign, e.g. 10%.
|
||||
th.AssertActualEqualsExpected(m, opts.IfApiMachineryElseKyaml(
|
||||
fmt.Sprintf(expFmt, `"1"`, `"1"`),
|
||||
fmt.Sprintf(expFmt, `1`, `1`)))
|
||||
// In the former case - bare integer - they should NOT be quoted
|
||||
// as the api server will reject it. In the latter case with
|
||||
// the percent sign, quotes can be added and the API server will
|
||||
// accept it, but they don't have to be added.
|
||||
th.AssertActualEqualsExpected(
|
||||
m,
|
||||
// TODO(#3304): DECISION - kyaml better; not a bug.
|
||||
opts.IfApiMachineryElseKyaml(
|
||||
fmt.Sprintf(expFmt, `"1"`, `"1"`),
|
||||
fmt.Sprintf(expFmt, `1`, `1`)))
|
||||
}
|
||||
|
||||
@@ -361,6 +361,86 @@ resources:
|
||||
}
|
||||
}
|
||||
|
||||
func TestSimpleServicePortVarReplace(t *testing.T) {
|
||||
th := kusttest_test.MakeHarness(t)
|
||||
th.WriteK(".", `
|
||||
resources:
|
||||
- service.yaml
|
||||
- statefulset.yaml
|
||||
vars:
|
||||
- name: THE_PORT
|
||||
objref:
|
||||
kind: StatefulSet
|
||||
name: cockroachdb
|
||||
apiVersion: apps/v1beta1
|
||||
fieldref:
|
||||
fieldpath: spec.template.spec.containers[0].ports[1].containerPort
|
||||
`)
|
||||
th.WriteF("service.yaml", `
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: myService
|
||||
spec:
|
||||
ports:
|
||||
- port: $(THE_PORT)
|
||||
targetPort: $(THE_PORT)
|
||||
name: grpc
|
||||
`)
|
||||
th.WriteF("statefulset.yaml", `
|
||||
apiVersion: apps/v1beta1
|
||||
kind: StatefulSet
|
||||
metadata:
|
||||
name: cockroachdb
|
||||
spec:
|
||||
template:
|
||||
spec:
|
||||
containers:
|
||||
- name: cockroachdb
|
||||
image: cockroachdb/cockroach:v1.1.5
|
||||
ports:
|
||||
- containerPort: 26257
|
||||
name: grpc
|
||||
- containerPort: 8888
|
||||
name: http
|
||||
`)
|
||||
opts := th.MakeDefaultOptions()
|
||||
m := th.Run(".", opts)
|
||||
expFmt := `
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: myService
|
||||
spec:
|
||||
ports:
|
||||
- name: grpc
|
||||
port: %s
|
||||
targetPort: %s
|
||||
---
|
||||
apiVersion: apps/v1beta1
|
||||
kind: StatefulSet
|
||||
metadata:
|
||||
name: cockroachdb
|
||||
spec:
|
||||
template:
|
||||
spec:
|
||||
containers:
|
||||
- image: cockroachdb/cockroach:v1.1.5
|
||||
name: cockroachdb
|
||||
ports:
|
||||
- containerPort: 26257
|
||||
name: grpc
|
||||
- containerPort: 8888
|
||||
name: http
|
||||
`
|
||||
th.AssertActualEqualsExpected(m,
|
||||
// TODO(#3304): DECISION - quotes bad here, this is a bug.
|
||||
opts.IfApiMachineryElseKyaml(
|
||||
fmt.Sprintf(expFmt, `8888`, `8888`),
|
||||
fmt.Sprintf(expFmt, `"8888"`, `"8888"`),
|
||||
))
|
||||
}
|
||||
|
||||
// TODO(#3449): varref has some quote issues
|
||||
// https://github.com/kubernetes-sigs/kustomize/issues/3449
|
||||
func TestVarRefBig(t *testing.T) {
|
||||
@@ -928,6 +1008,7 @@ metadata:
|
||||
name: dev-base-test-config-map-6b85g79g7g
|
||||
`
|
||||
th.AssertActualEqualsExpected(m,
|
||||
// TODO(#3304): DECISION - quotes bad here, this still a bug.
|
||||
opts.IfApiMachineryElseKyaml(
|
||||
fmt.Sprintf(expFmt, `8080`, `8080`, `8080`, `8080`),
|
||||
fmt.Sprintf(expFmt, `"8080"`, `"8080"`, `"8080"`, `"8080"`),
|
||||
|
||||
@@ -392,6 +392,7 @@ spec:
|
||||
yml, err = rm.AsYaml()
|
||||
assert.NoError(t, err)
|
||||
|
||||
// TODO(#3304): DECISION - kyaml better; not a bug.
|
||||
assert.Equal(t, konfig.IfApiMachineryElseKyaml(`apiVersion: example.com/v1
|
||||
kind: Foo
|
||||
metadata:
|
||||
|
||||
@@ -351,6 +351,7 @@ kind: List
|
||||
// yaml, json, Resource, RNode, Unstructured etc.
|
||||
// These conversions can be removed after closing
|
||||
// https://github.com/kubernetes-sigs/kustomize/issues/2506
|
||||
// TODO(#3304): DECISION - still a bug.
|
||||
expectedErr: konfig.FlagEnableKyamlDefaultValue,
|
||||
},
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user