Fix api tests that accomodated bad label and anno quoting.

This commit is contained in:
monopole
2021-01-15 17:36:39 -08:00
parent cb59e0ef5f
commit cb42142161
4 changed files with 30 additions and 40 deletions

View File

@@ -1,7 +1,6 @@
package krusty_test
import (
"fmt"
"os/exec"
"testing"
@@ -129,9 +128,8 @@ stringData:
bootcmd:
- mkdir /mnt/vda
`)
opts := th.MakeOptionsPluginsEnabled()
m := th.Run("/app", opts)
expFmt := `
m := th.Run("/app", th.MakeOptionsPluginsEnabled())
th.AssertActualEqualsExpected(m, `
apiVersion: v1
kind: Secret
metadata:
@@ -154,7 +152,7 @@ metadata:
name: demo
name: demo-budget
spec:
minAvailable: 67%%
minAvailable: 67%
selector:
matchLabels:
app: cockroachdb
@@ -187,7 +185,9 @@ metadata:
annotations:
config.kubernetes.io/path: config/demo_service.yaml
prometheus.io/path: _status/vars
%s
prometheus.io/port: "8080"
prometheus.io/scrape: "true"
service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
labels:
app: cockroachdb
name: demo
@@ -244,7 +244,7 @@ spec:
- /bin/bash
- -ecx
- |
# The use of qualified ` + "`hostname -f`" + ` is crucial:
# The use of qualified `+"`hostname -f`"+` is crucial:
# Other nodes aren't able to look up the unqualified hostname.
CRARGS=("start" "--logtostderr" "--insecure" "--host" "$(hostname -f)" "--http-host" "0.0.0.0")
# We only want to initialize a new cluster (by omitting the join flag)
@@ -302,14 +302,7 @@ spec:
resources:
requests:
storage: 1Gi
`
th.AssertActualEqualsExpected(m, opts.IfApiMachineryElseKyaml(
fmt.Sprintf(expFmt, ` prometheus.io/port: "8080"
prometheus.io/scrape: "true"
service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"`),
fmt.Sprintf(expFmt, ` prometheus.io/port: 8080
prometheus.io/scrape: true
service.alpha.kubernetes.io/tolerate-unready-endpoints: true`)))
`)
}
func TestFnContainerTransformer(t *testing.T) {