Merge pull request #43946 from rolfedh/BZ#2058433-bis

BZ#2058433: ADDITIONAL Fix webhook build API endpoint

Author: JStickler

modules/images-imagestream-configure.adoc

@@ -16,16 +16,11 @@ kind: ImageStream
 metadata:
   annotations:
     openshift.io/generated-by: OpenShiftNewApp
-  creationTimestamp: 2017-09-01T13:40:00Z
-  generation: 1
   labels:
     app: ruby-sample-build
     template: application-template-stibuild
   name: origin-ruby-sample <1>
   namespace: test
-  resourceVersion: "633"
-  selflink: /oapi/v1/namespaces/test/imagestreams/origin-ruby-sample
-  uid: ee2b9405-c68c-11e5-8a99-525400f25e34
 spec: {}
 status:
   dockerImageRepository: 172.30.56.218:5000/test/origin-ruby-sample <2>

modules/security-container-content-external-scanning.adoc

@@ -236,7 +236,7 @@ annotation. Be sure to replace the values for `<token>`, `<openshift_server>`,
 $ curl -X PATCH \
   -H "Authorization: Bearer <token>" \
   -H "Content-Type: application/merge-patch+json" \
-  https://<openshift_server>:8443/oapi/v1/images/<image_id> \
+  https://<openshift_server>:6443/apis/image.openshift.io/v1/images/<image_id> \
   --data '{ <image_annotation> }'
 ----
 

modules/service-accounts-using-credentials-inside-a-container.adoc

@@ -26,15 +26,13 @@ by the token:
 +
 ----
 $ curl --cacert /var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
-    "https://openshift.default.svc.cluster.local/oapi/v1/users/~" \
+    "https://openshift.default.svc.cluster.local/apis/user.openshift.io/v1/users/~" \
     -H "Authorization: Bearer $TOKEN"
 
 kind: "User"
 apiVersion: "user.openshift.io/v1"
 metadata:
   name: "system:serviceaccount:top-secret:robot"
-  selflink: "/oapi/v1/users/system:serviceaccount:top-secret:robot"
-  creationTimestamp: null
 identities: null
 groups:
   - "system:serviceaccounts"