From 3ab0665c19008384708f1a3b88b4699fce76aebd Mon Sep 17 00:00:00 2001 From: Natasha Sarkar Date: Wed, 30 Jun 2021 10:05:23 -0700 Subject: [PATCH] fix affected kyaml tests --- kyaml/filesys/filesystem_test.go | 3 +++ kyaml/kio/byteio_writer.go | 1 - kyaml/kio/filters/fmtr_test.go | 2 +- .../dataset1-expected/java/java-deployment.resource.yaml | 3 +-- .../dataset1-localupdates/java/java-deployment.resource.yaml | 3 +-- .../dataset1-remoteupdates/java/java-deployment.resource.yaml | 3 +-- .../testdata/dataset1/java/java-deployment.resource.yaml | 3 +-- .../testdata/dataset1/rails/rails-deployment.resource.yaml | 3 +-- .../dataset1-expected/java/java-deployment-1.resource.yaml | 3 +-- .../dataset1-expected/java/java-deployment-2.resource.yaml | 3 +-- .../java/java-deployment-1.resource.yaml | 3 +-- .../java/java-deployment-2.resource.yaml | 3 +-- .../java/java-deployment-1.resource.yaml | 3 +-- .../java/java-deployment-2.resource.yaml | 3 +-- .../testdata2/dataset1/java/java-deployment-1.resource.yaml | 3 +-- .../testdata2/dataset1/java/java-deployment-2.resource.yaml | 3 +-- kyaml/kio/filters/testyaml/testyaml.go | 3 +-- kyaml/kio/pkgio_reader_test.go | 4 +--- 18 files changed, 19 insertions(+), 33 deletions(-) diff --git a/kyaml/filesys/filesystem_test.go b/kyaml/filesys/filesystem_test.go index fd8ab2506..9599e6c45 100644 --- a/kyaml/filesys/filesystem_test.go +++ b/kyaml/filesys/filesystem_test.go @@ -1,3 +1,6 @@ +// Copyright 2021 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + package filesys import ( diff --git a/kyaml/kio/byteio_writer.go b/kyaml/kio/byteio_writer.go index 00b241629..a208f52bb 100644 --- a/kyaml/kio/byteio_writer.go +++ b/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) diff --git a/kyaml/kio/filters/fmtr_test.go b/kyaml/kio/filters/fmtr_test.go index 156bbcf64..b1de46205 100644 --- a/kyaml/kio/filters/fmtr_test.go +++ b/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 diff --git a/kyaml/kio/filters/testdata/dataset1-expected/java/java-deployment.resource.yaml b/kyaml/kio/filters/testdata/dataset1-expected/java/java-deployment.resource.yaml index 7ca9554fa..919936367 100644 --- a/kyaml/kio/filters/testdata/dataset1-expected/java/java-deployment.resource.yaml +++ b/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 - -Djava.security.egd=file:/dev/./urandom + value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom imagePullPolicy: Always minReadySeconds: 20 diff --git a/kyaml/kio/filters/testdata/dataset1-localupdates/java/java-deployment.resource.yaml b/kyaml/kio/filters/testdata/dataset1-localupdates/java/java-deployment.resource.yaml index 9972cc023..e1b8b0bfc 100644 --- a/kyaml/kio/filters/testdata/dataset1-localupdates/java/java-deployment.resource.yaml +++ b/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 - -Djava.security.egd=file:/dev/./urandom + value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom imagePullPolicy: Always minReadySeconds: 20 diff --git a/kyaml/kio/filters/testdata/dataset1-remoteupdates/java/java-deployment.resource.yaml b/kyaml/kio/filters/testdata/dataset1-remoteupdates/java/java-deployment.resource.yaml index ef6c8f1d9..7769d0f62 100644 --- a/kyaml/kio/filters/testdata/dataset1-remoteupdates/java/java-deployment.resource.yaml +++ b/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 - -Djava.security.egd=file:/dev/./urandom + value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom imagePullPolicy: Always minReadySeconds: 5 diff --git a/kyaml/kio/filters/testdata/dataset1/java/java-deployment.resource.yaml b/kyaml/kio/filters/testdata/dataset1/java/java-deployment.resource.yaml index 53ffa5b4f..cf39a9c70 100644 --- a/kyaml/kio/filters/testdata/dataset1/java/java-deployment.resource.yaml +++ b/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 - -Djava.security.egd=file:/dev/./urandom + value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom imagePullPolicy: Always minReadySeconds: 5 diff --git a/kyaml/kio/filters/testdata/dataset1/rails/rails-deployment.resource.yaml b/kyaml/kio/filters/testdata/dataset1/rails/rails-deployment.resource.yaml index f6073ea52..d6e7a97c6 100644 --- a/kyaml/kio/filters/testdata/dataset1/rails/rails-deployment.resource.yaml +++ b/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 - -Djava.security.egd=file:/dev/./urandom + value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom imagePullPolicy: Always minReadySeconds: 5 diff --git a/kyaml/kio/filters/testdata2/dataset1-expected/java/java-deployment-1.resource.yaml b/kyaml/kio/filters/testdata2/dataset1-expected/java/java-deployment-1.resource.yaml index ea1d0f540..64ff7b24c 100644 --- a/kyaml/kio/filters/testdata2/dataset1-expected/java/java-deployment-1.resource.yaml +++ b/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 - -Djava.security.egd=file:/dev/./urandom + value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom imagePullPolicy: Always minReadySeconds: 15 diff --git a/kyaml/kio/filters/testdata2/dataset1-expected/java/java-deployment-2.resource.yaml b/kyaml/kio/filters/testdata2/dataset1-expected/java/java-deployment-2.resource.yaml index 6b13e7872..04b129bf1 100644 --- a/kyaml/kio/filters/testdata2/dataset1-expected/java/java-deployment-2.resource.yaml +++ b/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 - -Djava.security.egd=file:/dev/./urandom + value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom imagePullPolicy: Always minReadySeconds: 25 diff --git a/kyaml/kio/filters/testdata2/dataset1-localupdates/java/java-deployment-1.resource.yaml b/kyaml/kio/filters/testdata2/dataset1-localupdates/java/java-deployment-1.resource.yaml index 658a1ec80..629c96377 100644 --- a/kyaml/kio/filters/testdata2/dataset1-localupdates/java/java-deployment-1.resource.yaml +++ b/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 - -Djava.security.egd=file:/dev/./urandom + value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom imagePullPolicy: Always minReadySeconds: 15 diff --git a/kyaml/kio/filters/testdata2/dataset1-localupdates/java/java-deployment-2.resource.yaml b/kyaml/kio/filters/testdata2/dataset1-localupdates/java/java-deployment-2.resource.yaml index 64baafe94..039399f11 100644 --- a/kyaml/kio/filters/testdata2/dataset1-localupdates/java/java-deployment-2.resource.yaml +++ b/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 - -Djava.security.egd=file:/dev/./urandom + value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom imagePullPolicy: Always minReadySeconds: 25 diff --git a/kyaml/kio/filters/testdata2/dataset1-remoteupdates/java/java-deployment-1.resource.yaml b/kyaml/kio/filters/testdata2/dataset1-remoteupdates/java/java-deployment-1.resource.yaml index c8174a0b3..b539ae6b6 100644 --- a/kyaml/kio/filters/testdata2/dataset1-remoteupdates/java/java-deployment-1.resource.yaml +++ b/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 - -Djava.security.egd=file:/dev/./urandom + value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom imagePullPolicy: Always minReadySeconds: 5 diff --git a/kyaml/kio/filters/testdata2/dataset1-remoteupdates/java/java-deployment-2.resource.yaml b/kyaml/kio/filters/testdata2/dataset1-remoteupdates/java/java-deployment-2.resource.yaml index 9caeaaea1..779c1fec2 100644 --- a/kyaml/kio/filters/testdata2/dataset1-remoteupdates/java/java-deployment-2.resource.yaml +++ b/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 - -Djava.security.egd=file:/dev/./urandom + value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom imagePullPolicy: Always minReadySeconds: 10 diff --git a/kyaml/kio/filters/testdata2/dataset1/java/java-deployment-1.resource.yaml b/kyaml/kio/filters/testdata2/dataset1/java/java-deployment-1.resource.yaml index 53ffa5b4f..cf39a9c70 100644 --- a/kyaml/kio/filters/testdata2/dataset1/java/java-deployment-1.resource.yaml +++ b/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 - -Djava.security.egd=file:/dev/./urandom + value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom imagePullPolicy: Always minReadySeconds: 5 diff --git a/kyaml/kio/filters/testdata2/dataset1/java/java-deployment-2.resource.yaml b/kyaml/kio/filters/testdata2/dataset1/java/java-deployment-2.resource.yaml index 9c5cdc3aa..73a652ec6 100644 --- a/kyaml/kio/filters/testdata2/dataset1/java/java-deployment-2.resource.yaml +++ b/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 - -Djava.security.egd=file:/dev/./urandom + value: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Djava.security.egd=file:/dev/./urandom imagePullPolicy: Always minReadySeconds: 10 diff --git a/kyaml/kio/filters/testyaml/testyaml.go b/kyaml/kio/filters/testyaml/testyaml.go index 01644b311..f6462f983 100644 --- a/kyaml/kio/filters/testyaml/testyaml.go +++ b/kyaml/kio/filters/testyaml/testyaml.go @@ -98,8 +98,7 @@ status2: `) var FormattedFlowYAML1 = []byte( - `{"apiVersion": "example.com/v1beta1", "kind": "MyType", "spec": "a", "status": {"conditions": [ - 3, 1, 2]}} + `{"apiVersion": "example.com/v1beta1", "kind": "MyType", "spec": "a", "status": {"conditions": [3, 1, 2]}} `) var FormattedYaml3 = []byte(`apiVersion: v1 diff --git a/kyaml/kio/pkgio_reader_test.go b/kyaml/kio/pkgio_reader_test.go index 039c53f2b..1da5113ba 100644 --- a/kyaml/kio/pkgio_reader_test.go +++ b/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', - config.kubernetes.io/path: 'b_test.json'}}} + `{"e": "f", "g": {"h": ["i", "j"]}, metadata: {annotations: {config.kubernetes.io/index: '0', config.kubernetes.io/path: 'b_test.json'}}} `, } for i := range nodes {