From 54c442a0874ed34249eb6b6360f5406418470db3 Mon Sep 17 00:00:00 2001 From: Natasha Sarkar Date: Wed, 30 Jun 2021 10:05:34 -0700 Subject: [PATCH] fix affected cmd/config tests --- cmd/config/internal/commands/cmdwrap_test.go | 6 +++--- cmd/config/internal/commands/merge3_test.go | 12 ++++-------- cmd/config/internal/commands/source_test.go | 13 +++---------- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/cmd/config/internal/commands/cmdwrap_test.go b/cmd/config/internal/commands/cmdwrap_test.go index 988b644fb7..fb4ead8dd2 100644 --- a/cmd/config/internal/commands/cmdwrap_test.go +++ b/cmd/config/internal/commands/cmdwrap_test.go @@ -117,8 +117,8 @@ items: name: test app: nginx ports: + # This i the port. - name: http - # This i the port. port: 8080 targetPort: 8080 ` @@ -169,8 +169,8 @@ items: name: test app: nginx ports: + # This i the port. - name: http - # This i the port. port: 8080 targetPort: 8080 ` @@ -269,8 +269,8 @@ items: name: test app: nginx ports: + # This i the port. - name: http - # This i the port. port: 8080 targetPort: 8080 ` diff --git a/cmd/config/internal/commands/merge3_test.go b/cmd/config/internal/commands/merge3_test.go index 171aec4d7e..c23176f5be 100644 --- a/cmd/config/internal/commands/merge3_test.go +++ b/cmd/config/internal/commands/merge3_test.go @@ -53,8 +53,7 @@ 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 `), 0600) @@ -104,8 +103,7 @@ 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 `), 0600) @@ -152,8 +150,7 @@ 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 `), 0600) @@ -201,8 +198,7 @@ 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 `), 0600) diff --git a/cmd/config/internal/commands/source_test.go b/cmd/config/internal/commands/source_test.go index 717b22c4a7..1fcad88d4e 100644 --- a/cmd/config/internal/commands/source_test.go +++ b/cmd/config/internal/commands/source_test.go @@ -194,13 +194,8 @@ func TestSourceCommandJSON(t *testing.T) { if !assert.Equal(t, `apiVersion: config.kubernetes.io/v1alpha1 kind: ResourceList items: -- {"kind": "Deployment", "metadata": {"labels": {"app": "nginx2"}, "name": "foo", - "annotations": {"app": "nginx2", config.kubernetes.io/index: '0', config.kubernetes.io/path: 'f1.json'}}, - "spec": {"replicas": 1}} -- {"apiVersion": "v1", "kind": "Abstraction", "metadata": {"name": "foo", "annotations": { - "config.kubernetes.io/function": "container:\n image: gcr.io/example/reconciler:v1\n", - "config.kubernetes.io/local-config": "true", config.kubernetes.io/index: '0', - config.kubernetes.io/path: 'f2.json'}}, "spec": {"replicas": 3}} +- {"kind": "Deployment", "metadata": {"labels": {"app": "nginx2"}, "name": "foo", "annotations": {"app": "nginx2", config.kubernetes.io/index: '0', config.kubernetes.io/path: 'f1.json'}}, "spec": {"replicas": 1}} +- {"apiVersion": "v1", "kind": "Abstraction", "metadata": {"name": "foo", "annotations": {"config.kubernetes.io/function": "container:\n image: gcr.io/example/reconciler:v1\n", "config.kubernetes.io/local-config": "true", config.kubernetes.io/index: '0', config.kubernetes.io/path: 'f2.json'}}, "spec": {"replicas": 3}} `, b.String()) { return } @@ -307,9 +302,7 @@ func TestSourceCommandJSON_Stdin(t *testing.T) { if !assert.Equal(t, `apiVersion: config.kubernetes.io/v1alpha1 kind: ResourceList items: -- {"kind": "Deployment", "metadata": {"labels": {"app": "nginx2"}, "name": "foo", - "annotations": {"app": "nginx2", config.kubernetes.io/index: '0'}}, "spec": { - "replicas": 1}} +- {"kind": "Deployment", "metadata": {"labels": {"app": "nginx2"}, "name": "foo", "annotations": {"app": "nginx2", config.kubernetes.io/index: '0'}}, "spec": {"replicas": 1}} `, out.String()) { return }