Switch openshift/kubernetes master to golang 1.15

ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml

@@ -23,18 +23,14 @@ base_images:
     name: "4.6"
     namespace: ocp
     tag: oc-rpms
-  ocp_builder_golang-1.13:
+  ocp_builder_golang-1.15:
     name: builder
     namespace: ocp
-    tag: golang-1.13
-  ocp_builder_golang-1.14:
+    tag: golang-1.15
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
     name: builder
     namespace: ocp
-    tag: golang-1.14
-  ocp_builder_rhel-8-golang-openshift-4.6:
-    name: builder
-    namespace: ocp
-    tag: rhel-8-golang-openshift-4.6
+    tag: rhel-8-golang-1.15-openshift-4.6
   tools:
     name: "4.6"
     namespace: ocp
@@ -44,25 +40,22 @@ build_root:
   image_stream_tag:
     name: release
     namespace: openshift
-    tag: golang-1.14
+    tag: golang-1.15
 canonical_go_repository: k8s.io/kubernetes
 images:
 - dockerfile_path: openshift-hack/images/hyperkube/Dockerfile.rhel
   from: base
   inputs:
-    ocp_builder_golang-1.14:
-      as:
-      - registry.svc.ci.openshift.org/ocp/builder:golang-1.14
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: hyperkube
 - dockerfile_path: openshift-hack/images/tests/Dockerfile.rhel
   from: tools
   inputs:
-    ocp_builder_golang-1.14:
+    ocp_builder_golang-1.15:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:golang-1.14
+      - registry.svc.ci.openshift.org/ocp/builder:golang-1.15
   to: kubernetes-tests
 - context_dir: openshift-hack/images/os/
   from: base