From 8a4779a57e52234773545cf8e3560ef49b1592ac Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Wed, 6 Nov 2019 20:50:26 +0100 Subject: [PATCH] Remove non-existing fields --- examples/hello-openshift/hello-pod.json | 1 - .../jenkins/jenkins-ephemeral-template.json | 3 +-- test/extended/builds/valuefrom.go | 2 +- test/extended/testdata/bindata.go | 23 +++++-------------- .../testdata/hello-openshift/hello-pod.json | 1 - .../jenkins/jenkins-ephemeral-template.json | 3 +-- .../cmd/testdata/templates/guestbook.json | 5 +--- .../cmd/test/cmd/testdata/test-image.json | 1 - test/extended/testdata/image/test-image.json | 1 - .../testdata/oauthserver/oauth-network.yaml | 1 - .../testdata/templates/guestbook.json | 3 --- test/integration/testdata/test-image.json | 1 - 12 files changed, 10 insertions(+), 35 deletions(-) diff --git a/examples/hello-openshift/hello-pod.json b/examples/hello-openshift/hello-pod.json index 00e157543d52..ad40533746c7 100644 --- a/examples/hello-openshift/hello-pod.json +++ b/examples/hello-openshift/hello-pod.json @@ -28,7 +28,6 @@ ], "terminationMessagePath": "/dev/termination-log", "imagePullPolicy": "IfNotPresent", - "capabilities": {}, "securityContext": { "capabilities": {}, "privileged": false diff --git a/examples/jenkins/jenkins-ephemeral-template.json b/examples/jenkins/jenkins-ephemeral-template.json index 3ad22ad4d808..8348c8754254 100644 --- a/examples/jenkins/jenkins-ephemeral-template.json +++ b/examples/jenkins/jenkins-ephemeral-template.json @@ -67,7 +67,6 @@ "spec": { "containers": [ { - "capabilities": {}, "env": [ { "name": "OPENSHIFT_ENABLE_OAUTH", @@ -294,4 +293,4 @@ "value": "jenkins:2" } ] -} \ No newline at end of file +} diff --git a/test/extended/builds/valuefrom.go b/test/extended/builds/valuefrom.go index 9368a61c403d..163533835719 100644 --- a/test/extended/builds/valuefrom.go +++ b/test/extended/builds/valuefrom.go @@ -42,7 +42,7 @@ var _ = g.Describe("[Feature:Builds][Conformance][valueFrom] process valueFrom i o.Expect(err).NotTo(o.HaveOccurred()) g.By("creating test image stream") - err = oc.Run("create").Args("-f", testImageStreamFixture).Execute() + err = oc.Run("create").Args("-f", testImageStreamFixture, "--validate=false").Execute() o.Expect(err).NotTo(o.HaveOccurred()) g.By("creating test secret") diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index 2f299e6e35ba..8f33a58a8a9a 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -15270,7 +15270,6 @@ var _examplesHelloOpenshiftHelloPodJson = []byte(`{ ], "terminationMessagePath": "/dev/termination-log", "imagePullPolicy": "IfNotPresent", - "capabilities": {}, "securityContext": { "capabilities": {}, "privileged": false @@ -15761,7 +15760,6 @@ var _examplesJenkinsJenkinsEphemeralTemplateJson = []byte(`{ "spec": { "containers": [ { - "capabilities": {}, "env": [ { "name": "OPENSHIFT_ENABLE_OAUTH", @@ -15988,7 +15986,8 @@ var _examplesJenkinsJenkinsEphemeralTemplateJson = []byte(`{ "value": "jenkins:2" } ] -}`) +} +`) func examplesJenkinsJenkinsEphemeralTemplateJsonBytes() ([]byte, error) { return _examplesJenkinsJenkinsEphemeralTemplateJson, nil @@ -39983,7 +39982,6 @@ var _testExtendedTestdataCmdTestCmdTestdataHelloOpenshiftHelloPodJson = []byte(` ], "terminationMessagePath": "/dev/termination-log", "imagePullPolicy": "IfNotPresent", - "capabilities": {}, "securityContext": { "capabilities": {}, "privileged": false @@ -41825,7 +41823,6 @@ var _testExtendedTestdataCmdTestCmdTestdataJenkinsJenkinsEphemeralTemplateJson = "spec": { "containers": [ { - "capabilities": {}, "env": [ { "name": "OPENSHIFT_ENABLE_OAUTH", @@ -42052,7 +42049,8 @@ var _testExtendedTestdataCmdTestCmdTestdataJenkinsJenkinsEphemeralTemplateJson = "value": "jenkins:2" } ] -}`) +} +`) func testExtendedTestdataCmdTestCmdTestdataJenkinsJenkinsEphemeralTemplateJsonBytes() ([]byte, error) { return _testExtendedTestdataCmdTestCmdTestdataJenkinsJenkinsEphemeralTemplateJson, nil @@ -45263,7 +45261,6 @@ var _testExtendedTestdataCmdTestCmdTestdataTemplatesGuestbookJson = []byte(`{ "resources": {}, "terminationMessagePath": "/dev/termination-log", "imagePullPolicy": "IfNotPresent", - "capabilities": {}, "securityContext": { "capabilities": {}, "privileged": false @@ -45327,7 +45324,6 @@ var _testExtendedTestdataCmdTestCmdTestdataTemplatesGuestbookJson = []byte(`{ "resources": {}, "terminationMessagePath": "/dev/termination-log", "imagePullPolicy": "IfNotPresent", - "capabilities": {}, "securityContext": { "capabilities": {}, "privileged": false @@ -45387,7 +45383,6 @@ var _testExtendedTestdataCmdTestCmdTestdataTemplatesGuestbookJson = []byte(`{ "resources": {}, "terminationMessagePath": "/dev/termination-log", "imagePullPolicy": "IfNotPresent", - "capabilities": {}, "securityContext": { "capabilities": {}, "privileged": false @@ -45430,7 +45425,8 @@ var _testExtendedTestdataCmdTestCmdTestdataTemplatesGuestbookJson = []byte(`{ "value": "redis-slave" } ] -}`) +} +`) func testExtendedTestdataCmdTestCmdTestdataTemplatesGuestbookJsonBytes() ([]byte, error) { return _testExtendedTestdataCmdTestCmdTestdataTemplatesGuestbookJson, nil @@ -46231,7 +46227,6 @@ var _testExtendedTestdataCmdTestCmdTestdataTestImageJson = []byte(`{ "kind": "DockerImage", "apiVersion": "1.0", "Id": "", - "Created": null, "ContainerConfig": {}, "Config": {} }, @@ -49925,7 +49920,6 @@ var _testExtendedTestdataImageTestImageJson = []byte(`{ "kind": "DockerImage", "apiVersion": "1.0", "Id": "", - "Created": null, "ContainerConfig": {}, "Config": {} }, @@ -53035,7 +53029,6 @@ spec: selector: app: test-oauth-server type: ClusterIP - serviceAffinitiy: None --- apiVersion: route.openshift.io/v1 @@ -55484,7 +55477,6 @@ var _testExtendedTestdataTemplatesGuestbookJson = []byte(`{ "resources": {}, "terminationMessagePath": "/dev/termination-log", "imagePullPolicy": "IfNotPresent", - "capabilities": {}, "securityContext": { "capabilities": {}, "privileged": false @@ -55548,7 +55540,6 @@ var _testExtendedTestdataTemplatesGuestbookJson = []byte(`{ "resources": {}, "terminationMessagePath": "/dev/termination-log", "imagePullPolicy": "IfNotPresent", - "capabilities": {}, "securityContext": { "capabilities": {}, "privileged": false @@ -55608,7 +55599,6 @@ var _testExtendedTestdataTemplatesGuestbookJson = []byte(`{ "resources": {}, "terminationMessagePath": "/dev/termination-log", "imagePullPolicy": "IfNotPresent", - "capabilities": {}, "securityContext": { "capabilities": {}, "privileged": false @@ -57374,7 +57364,6 @@ var _testIntegrationTestdataTestImageJson = []byte(`{ "kind": "DockerImage", "apiVersion": "1.0", "Id": "", - "Created": null, "ContainerConfig": {}, "Config": {} }, diff --git a/test/extended/testdata/cmd/test/cmd/testdata/hello-openshift/hello-pod.json b/test/extended/testdata/cmd/test/cmd/testdata/hello-openshift/hello-pod.json index 00e157543d52..ad40533746c7 100644 --- a/test/extended/testdata/cmd/test/cmd/testdata/hello-openshift/hello-pod.json +++ b/test/extended/testdata/cmd/test/cmd/testdata/hello-openshift/hello-pod.json @@ -28,7 +28,6 @@ ], "terminationMessagePath": "/dev/termination-log", "imagePullPolicy": "IfNotPresent", - "capabilities": {}, "securityContext": { "capabilities": {}, "privileged": false diff --git a/test/extended/testdata/cmd/test/cmd/testdata/jenkins/jenkins-ephemeral-template.json b/test/extended/testdata/cmd/test/cmd/testdata/jenkins/jenkins-ephemeral-template.json index 3ad22ad4d808..8348c8754254 100644 --- a/test/extended/testdata/cmd/test/cmd/testdata/jenkins/jenkins-ephemeral-template.json +++ b/test/extended/testdata/cmd/test/cmd/testdata/jenkins/jenkins-ephemeral-template.json @@ -67,7 +67,6 @@ "spec": { "containers": [ { - "capabilities": {}, "env": [ { "name": "OPENSHIFT_ENABLE_OAUTH", @@ -294,4 +293,4 @@ "value": "jenkins:2" } ] -} \ No newline at end of file +} diff --git a/test/extended/testdata/cmd/test/cmd/testdata/templates/guestbook.json b/test/extended/testdata/cmd/test/cmd/testdata/templates/guestbook.json index 146ecc87a22a..ba4a7c589702 100644 --- a/test/extended/testdata/cmd/test/cmd/testdata/templates/guestbook.json +++ b/test/extended/testdata/cmd/test/cmd/testdata/templates/guestbook.json @@ -135,7 +135,6 @@ "resources": {}, "terminationMessagePath": "/dev/termination-log", "imagePullPolicy": "IfNotPresent", - "capabilities": {}, "securityContext": { "capabilities": {}, "privileged": false @@ -199,7 +198,6 @@ "resources": {}, "terminationMessagePath": "/dev/termination-log", "imagePullPolicy": "IfNotPresent", - "capabilities": {}, "securityContext": { "capabilities": {}, "privileged": false @@ -259,7 +257,6 @@ "resources": {}, "terminationMessagePath": "/dev/termination-log", "imagePullPolicy": "IfNotPresent", - "capabilities": {}, "securityContext": { "capabilities": {}, "privileged": false @@ -302,4 +299,4 @@ "value": "redis-slave" } ] -} \ No newline at end of file +} diff --git a/test/extended/testdata/cmd/test/cmd/testdata/test-image.json b/test/extended/testdata/cmd/test/cmd/testdata/test-image.json index e177bd7c45e3..e70d6e20d733 100644 --- a/test/extended/testdata/cmd/test/cmd/testdata/test-image.json +++ b/test/extended/testdata/cmd/test/cmd/testdata/test-image.json @@ -10,7 +10,6 @@ "kind": "DockerImage", "apiVersion": "1.0", "Id": "", - "Created": null, "ContainerConfig": {}, "Config": {} }, diff --git a/test/extended/testdata/image/test-image.json b/test/extended/testdata/image/test-image.json index e177bd7c45e3..e70d6e20d733 100644 --- a/test/extended/testdata/image/test-image.json +++ b/test/extended/testdata/image/test-image.json @@ -10,7 +10,6 @@ "kind": "DockerImage", "apiVersion": "1.0", "Id": "", - "Created": null, "ContainerConfig": {}, "Config": {} }, diff --git a/test/extended/testdata/oauthserver/oauth-network.yaml b/test/extended/testdata/oauthserver/oauth-network.yaml index edb00e7ec4b0..f89f90e4c083 100644 --- a/test/extended/testdata/oauthserver/oauth-network.yaml +++ b/test/extended/testdata/oauthserver/oauth-network.yaml @@ -15,7 +15,6 @@ spec: selector: app: test-oauth-server type: ClusterIP - serviceAffinitiy: None --- apiVersion: route.openshift.io/v1 diff --git a/test/extended/testdata/templates/guestbook.json b/test/extended/testdata/templates/guestbook.json index 9197eb6a29d0..ba4a7c589702 100644 --- a/test/extended/testdata/templates/guestbook.json +++ b/test/extended/testdata/templates/guestbook.json @@ -135,7 +135,6 @@ "resources": {}, "terminationMessagePath": "/dev/termination-log", "imagePullPolicy": "IfNotPresent", - "capabilities": {}, "securityContext": { "capabilities": {}, "privileged": false @@ -199,7 +198,6 @@ "resources": {}, "terminationMessagePath": "/dev/termination-log", "imagePullPolicy": "IfNotPresent", - "capabilities": {}, "securityContext": { "capabilities": {}, "privileged": false @@ -259,7 +257,6 @@ "resources": {}, "terminationMessagePath": "/dev/termination-log", "imagePullPolicy": "IfNotPresent", - "capabilities": {}, "securityContext": { "capabilities": {}, "privileged": false diff --git a/test/integration/testdata/test-image.json b/test/integration/testdata/test-image.json index e177bd7c45e3..e70d6e20d733 100644 --- a/test/integration/testdata/test-image.json +++ b/test/integration/testdata/test-image.json @@ -10,7 +10,6 @@ "kind": "DockerImage", "apiVersion": "1.0", "Id": "", - "Created": null, "ContainerConfig": {}, "Config": {} },