Remove non-existing fields

xiaojiey · Nov 6, 2019 · 8a4779a · 8a4779a
1 parent 77684ba
commit 8a4779a
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 35 deletions.
diff --git 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
@@ -67,7 +67,6 @@
                     "spec": {
                         "containers": [
                             {
-                                "capabilities": {},
                                 "env": [
                                     {
                                         "name": "OPENSHIFT_ENABLE_OAUTH",
@@ -294,4 +293,4 @@
             "value": "jenkins:2"
         }
     ]
-}
+}
diff --git 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
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
@@ -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
@@ -67,7 +67,6 @@
                     "spec": {
                         "containers": [
                             {
-                                "capabilities": {},
                                 "env": [
                                     {
                                         "name": "OPENSHIFT_ENABLE_OAUTH",
@@ -294,4 +293,4 @@
             "value": "jenkins:2"
         }
     ]
-}
+}
diff --git 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"
     }
   ]
-}
+}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -10,7 +10,6 @@
     "kind": "DockerImage",
     "apiVersion": "1.0",
     "Id": "",
-    "Created": null,
     "ContainerConfig": {},
     "Config": {}
   },