fix affected kyaml tests

kyaml/filesys/filesystem_test.go

@@ -1,3 +1,6 @@
+// Copyright 2021 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
 package filesys
 
 import (

kyaml/kio/byteio_writer.go

@@ -53,7 +53,6 @@ var _ Writer = ByteWriter{}
 func (w ByteWriter) Write(inputNodes []*yaml.RNode) error {
 	// Copy the nodes to prevent writer from mutating the original nodes.
 	nodes := copyRNodes(inputNodes)
-	yaml.DoSerializationHacksOnNodes(nodes)
 	if w.Sort {
 		if err := kioutil.SortNodes(nodes); err != nil {
 			return errors.Wrap(err)

kyaml/kio/filters/fmtr_test.go

@@ -416,9 +416,9 @@ spec:
         image: nginx:1.7.9
         ports:
         - containerPort: 80
+      # this is a container
       - name: b-nginx
         image: nginx:1.7.9
-        # this is a container
         ports:
         # this is a port
         - containerPort: 80

kyaml/kio/filters/testdata/dataset1-expected/java/java-deployment.resource.yaml

@@ -37,7 +37,6 @@ spec:
             name: app-config
         env:
         - name: JAVA_OPTS
-          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
+          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom
-            -Djava.security.egd=file:/dev/./urandom
         imagePullPolicy: Always
   minReadySeconds: 20

kyaml/kio/filters/testdata/dataset1-localupdates/java/java-deployment.resource.yaml

@@ -35,7 +35,6 @@ spec:
             name: app-config
         env:
         - name: JAVA_OPTS
-          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
+          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom
-            -Djava.security.egd=file:/dev/./urandom
         imagePullPolicy: Always
   minReadySeconds: 20

kyaml/kio/filters/testdata/dataset1-remoteupdates/java/java-deployment.resource.yaml

@@ -34,7 +34,6 @@ spec:
             name: app-config
         env:
         - name: JAVA_OPTS
-          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
+          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom
-            -Djava.security.egd=file:/dev/./urandom
         imagePullPolicy: Always
   minReadySeconds: 5

kyaml/kio/filters/testdata/dataset1/java/java-deployment.resource.yaml

@@ -32,7 +32,6 @@ spec:
             name: app-config
         env:
         - name: JAVA_OPTS
-          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
+          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom
-            -Djava.security.egd=file:/dev/./urandom
         imagePullPolicy: Always
   minReadySeconds: 5

kyaml/kio/filters/testdata/dataset1/rails/rails-deployment.resource.yaml

@@ -30,7 +30,6 @@ spec:
             name: rails-app-config
         env:
         - name: JAVA_OPTS
-          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
+          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom
-            -Djava.security.egd=file:/dev/./urandom
         imagePullPolicy: Always
   minReadySeconds: 5

kyaml/kio/filters/testdata2/dataset1-expected/java/java-deployment-1.resource.yaml

@@ -32,7 +32,6 @@ spec:
             name: app-config
         env:
         - name: JAVA_OPTS
-          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
+          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom
-            -Djava.security.egd=file:/dev/./urandom
         imagePullPolicy: Always
   minReadySeconds: 15

kyaml/kio/filters/testdata2/dataset1-expected/java/java-deployment-2.resource.yaml

@@ -32,7 +32,6 @@ spec:
             name: app-config
         env:
         - name: JAVA_OPTS
-          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
+          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom
-            -Djava.security.egd=file:/dev/./urandom
         imagePullPolicy: Always
   minReadySeconds: 25

kyaml/kio/filters/testdata2/dataset1-localupdates/java/java-deployment-1.resource.yaml

@@ -32,7 +32,6 @@ spec:
             name: app-config
         env:
         - name: JAVA_OPTS
-          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
+          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom
-            -Djava.security.egd=file:/dev/./urandom
         imagePullPolicy: Always
   minReadySeconds: 15

kyaml/kio/filters/testdata2/dataset1-localupdates/java/java-deployment-2.resource.yaml

@@ -32,7 +32,6 @@ spec:
             name: app-config
         env:
         - name: JAVA_OPTS
-          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
+          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom
-            -Djava.security.egd=file:/dev/./urandom
         imagePullPolicy: Always
   minReadySeconds: 25

kyaml/kio/filters/testdata2/dataset1-remoteupdates/java/java-deployment-1.resource.yaml

@@ -32,7 +32,6 @@ spec:
             name: app-config
         env:
         - name: JAVA_OPTS
-          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
+          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom
-            -Djava.security.egd=file:/dev/./urandom
         imagePullPolicy: Always
   minReadySeconds: 5

kyaml/kio/filters/testdata2/dataset1-remoteupdates/java/java-deployment-2.resource.yaml

@@ -32,7 +32,6 @@ spec:
             name: app-config
         env:
         - name: JAVA_OPTS
-          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
+          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom
-            -Djava.security.egd=file:/dev/./urandom
         imagePullPolicy: Always
   minReadySeconds: 10

kyaml/kio/filters/testdata2/dataset1/java/java-deployment-1.resource.yaml

@@ -32,7 +32,6 @@ spec:
             name: app-config
         env:
         - name: JAVA_OPTS
-          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
+          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom
-            -Djava.security.egd=file:/dev/./urandom
         imagePullPolicy: Always
   minReadySeconds: 5

kyaml/kio/filters/testdata2/dataset1/java/java-deployment-2.resource.yaml

@@ -32,7 +32,6 @@ spec:
             name: app-config
         env:
         - name: JAVA_OPTS
-          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
+          value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom
-            -Djava.security.egd=file:/dev/./urandom
         imagePullPolicy: Always
   minReadySeconds: 10

kyaml/kio/filters/testyaml/testyaml.go

@@ -98,8 +98,7 @@ status2:
 `)
 
 var FormattedFlowYAML1 = []byte(
-	`{"apiVersion": "example.com/v1beta1", "kind": "MyType", "spec": "a", "status": {"conditions": [
+	`{"apiVersion": "example.com/v1beta1", "kind": "MyType", "spec": "a", "status": {"conditions": [3, 1, 2]}}
-      3, 1, 2]}}
 `)
 
 var FormattedYaml3 = []byte(`apiVersion: v1

kyaml/kio/pkgio_reader_test.go

@@ -223,12 +223,10 @@ func TestLocalPackageReader_Read_JSON(t *testing.T) {
 		if !assert.Len(t, nodes, 2) {
 			t.FailNow()
 		}
-		// TODO: Fix https://github.com/go-yaml/yaml/issues/44 so these are printed correctly
 		expected := []string{
 			`{"a": "b", metadata: {annotations: {config.kubernetes.io/index: '0', config.kubernetes.io/path: 'a_test.json'}}}
 `,
-			`{"e": "f", "g": {"h": ["i", "j"]}, metadata: {annotations: {config.kubernetes.io/index: '0',
+			`{"e": "f", "g": {"h": ["i", "j"]}, metadata: {annotations: {config.kubernetes.io/index: '0', config.kubernetes.io/path: 'b_test.json'}}}
-      config.kubernetes.io/path: 'b_test.json'}}}
 `,
 		}
 		for i := range nodes {