openshift · openshift-merge-robot · Sep 10, 2018 · Sep 6, 2018 · Sep 6, 2018 · Sep 10, 2018
diff --git a/ci-operator/README.md b/ci-operator/README.md
@@ -10,7 +10,7 @@ Conventions
 
 Under this directory, we have three main directories:
 
-*  `config/$org/$repo/$branch.json`
+*  `config/$org/$repo/$branch.yaml`
    Contains your ci-operator definition which describes how the images and tests
    in your repo works. These files are copied into config maps on the CI cluster
    and referenced by Prow jobs. If you are building branches within a fork of a
@@ -176,7 +176,7 @@ complexity and duplication, which should be cleared in the future.
         valueFrom:
           configMapKeyRef:
             name: ci-operator-openshift-descheduler
-            key: release-3.10.json
+            key: release-3.10.yaml
       # the actual test command (the variable name and format is specific to
       # the template being used (cluster-launch-src.yaml, in this case), see
       # the definition for more details)

diff --git a/.../config/kubernetes/autoscaler/master.json → .../config/kubernetes/autoscaler/master.yaml b/.../config/kubernetes/autoscaler/master.json → .../config/kubernetes/autoscaler/master.yaml
diff --git a/...g/kubernetes/autoscaler/release-3.10.json → ...g/kubernetes/autoscaler/release-3.10.yaml b/...g/kubernetes/autoscaler/release-3.10.json → ...g/kubernetes/autoscaler/release-3.10.yaml
diff --git a/...g/kubernetes/autoscaler/release-3.11.json → ...g/kubernetes/autoscaler/release-3.11.yaml b/...g/kubernetes/autoscaler/release-3.11.json → ...g/kubernetes/autoscaler/release-3.11.yaml
diff --git a/...g/kubernetes/cluster-capacity/master.json → ...g/kubernetes/cluster-capacity/master.yaml b/...g/kubernetes/cluster-capacity/master.json → ...g/kubernetes/cluster-capacity/master.yaml
diff --git a/...rnetes/cluster-capacity/release-3.10.json → ...rnetes/cluster-capacity/release-3.10.yaml b/...rnetes/cluster-capacity/release-3.10.json → ...rnetes/cluster-capacity/release-3.10.yaml
diff --git a/...rnetes/cluster-capacity/release-3.11.json → ...rnetes/cluster-capacity/release-3.11.yaml b/...rnetes/cluster-capacity/release-3.11.json → ...rnetes/cluster-capacity/release-3.11.yaml
diff --git a/...tor/config/kubernetes/coredns/master.json → ...tor/config/kubernetes/coredns/master.yaml b/...tor/config/kubernetes/coredns/master.json → ...tor/config/kubernetes/coredns/master.yaml
diff --git a/...nfig/kubernetes/coredns/release-3.10.json → ...nfig/kubernetes/coredns/release-3.10.yaml b/...nfig/kubernetes/coredns/release-3.10.json → ...nfig/kubernetes/coredns/release-3.10.yaml
diff --git a/...nfig/kubernetes/coredns/release-3.11.json → ...nfig/kubernetes/coredns/release-3.11.yaml b/...nfig/kubernetes/coredns/release-3.11.json → ...nfig/kubernetes/coredns/release-3.11.yaml
diff --git a/...config/kubernetes/descheduler/master.json → ...config/kubernetes/descheduler/master.yaml b/...config/kubernetes/descheduler/master.json → ...config/kubernetes/descheduler/master.yaml
diff --git a/.../kubernetes/descheduler/release-3.10.json → .../kubernetes/descheduler/release-3.10.yaml b/.../kubernetes/descheduler/release-3.10.json → .../kubernetes/descheduler/release-3.10.yaml
diff --git a/.../kubernetes/descheduler/release-3.11.json → .../kubernetes/descheduler/release-3.11.yaml b/.../kubernetes/descheduler/release-3.11.json → .../kubernetes/descheduler/release-3.11.yaml
diff --git a/...fig/kubernetes/metrics-server/master.json → ...fig/kubernetes/metrics-server/master.yaml b/...fig/kubernetes/metrics-server/master.json → ...fig/kubernetes/metrics-server/master.yaml
diff --git a/...bernetes/metrics-server/release-3.10.json → ...bernetes/metrics-server/release-3.10.yaml b/...bernetes/metrics-server/release-3.10.json → ...bernetes/metrics-server/release-3.10.yaml
diff --git a/...bernetes/metrics-server/release-3.11.json → ...bernetes/metrics-server/release-3.11.yaml b/...bernetes/metrics-server/release-3.11.json → ...bernetes/metrics-server/release-3.11.yaml
diff --git a/ci-operator/config/openshift/api/master.json → ci-operator/config/openshift/api/master.yaml b/ci-operator/config/openshift/api/master.json → ci-operator/config/openshift/api/master.yaml
diff --git a/...or/config/openshift/api/release-3.11.json → ...or/config/openshift/api/release-3.11.yaml b/...or/config/openshift/api/release-3.11.json → ...or/config/openshift/api/release-3.11.yaml
diff --git a/...r/config/openshift/azure-misc/master.json → ...r/config/openshift/azure-misc/master.yaml b/...r/config/openshift/azure-misc/master.json → ...r/config/openshift/azure-misc/master.yaml
diff --git a/...openshift/ci-operator-prowgen/master.json → ...openshift/ci-operator-prowgen/master.yaml b/...openshift/ci-operator-prowgen/master.json → ...openshift/ci-operator-prowgen/master.yaml
diff --git a/.../config/openshift/ci-operator/master.json → .../config/openshift/ci-operator/master.yaml b/.../config/openshift/ci-operator/master.json → .../config/openshift/ci-operator/master.yaml
diff --git a/...hift/cluster-api-provider-aws/master.json → ...hift/cluster-api-provider-aws/master.yaml b/...hift/cluster-api-provider-aws/master.json → ...hift/cluster-api-provider-aws/master.yaml
diff --git a/...luster-api-provider-aws/release-3.11.json → ...luster-api-provider-aws/release-3.11.yaml b/...luster-api-provider-aws/release-3.11.json → ...luster-api-provider-aws/release-3.11.yaml
diff --git a/.../cluster-api-provider-libvirt/master.json → .../cluster-api-provider-libvirt/master.yaml b/.../cluster-api-provider-libvirt/master.json → .../cluster-api-provider-libvirt/master.yaml
diff --git a/...er-api-provider-libvirt/release-3.11.json → ...er-api-provider-libvirt/release-3.11.yaml b/...er-api-provider-libvirt/release-3.11.json → ...er-api-provider-libvirt/release-3.11.yaml
diff --git a/...penshift/cluster-dns-operator/master.json → ...penshift/cluster-dns-operator/master.yaml b/...penshift/cluster-dns-operator/master.json → ...penshift/cluster-dns-operator/master.yaml
diff --git a/...hift/cluster-ingress-operator/master.json → ...hift/cluster-ingress-operator/master.yaml b/...hift/cluster-ingress-operator/master.json → ...hift/cluster-ingress-operator/master.yaml
diff --git a/...t/cluster-monitoring-operator/master.json → ...t/cluster-monitoring-operator/master.yaml b/...t/cluster-monitoring-operator/master.json → ...t/cluster-monitoring-operator/master.yaml
diff --git a/...ter-monitoring-operator/release-3.11.json → ...ter-monitoring-operator/release-3.11.yaml b/...ter-monitoring-operator/release-3.11.json → ...ter-monitoring-operator/release-3.11.yaml
diff --git a/...ig/openshift/cluster-operator/master.json → ...ig/openshift/cluster-operator/master.yaml b/...ig/openshift/cluster-operator/master.json → ...ig/openshift/cluster-operator/master.yaml
diff --git a/...fig/openshift/cluster-operator/tools.json → ...fig/openshift/cluster-operator/tools.yaml b/...fig/openshift/cluster-operator/tools.json → ...fig/openshift/cluster-operator/tools.yaml
diff --git a/...hift/cluster-samples-operator/master.json → ...hift/cluster-samples-operator/master.yaml b/...hift/cluster-samples-operator/master.json → ...hift/cluster-samples-operator/master.yaml
diff --git a/...hift/cluster-version-operator/master.json → ...hift/cluster-version-operator/master.yaml b/...hift/cluster-version-operator/master.json → ...hift/cluster-version-operator/master.yaml
diff --git a/...luster-version-operator/release-3.11.json → ...luster-version-operator/release-3.11.yaml b/...luster-version-operator/release-3.11.json → ...luster-version-operator/release-3.11.yaml
diff --git a/...ig/openshift/configmap-reload/master.json → ...ig/openshift/configmap-reload/master.yaml b/...ig/openshift/configmap-reload/master.json → ...ig/openshift/configmap-reload/master.yaml
diff --git a/...nshift/configmap-reload/release-3.11.json → ...nshift/configmap-reload/release-3.11.yaml b/...nshift/configmap-reload/release-3.11.json → ...nshift/configmap-reload/release-3.11.yaml
diff --git a/...ator/config/openshift/console/master.json → ...ator/config/openshift/console/master.yaml b/...ator/config/openshift/console/master.json → ...ator/config/openshift/console/master.yaml
diff --git a/...onfig/openshift/console/release-3.10.json → ...onfig/openshift/console/release-3.10.yaml b/...onfig/openshift/console/release-3.10.json → ...onfig/openshift/console/release-3.10.yaml
diff --git a/...onfig/openshift/console/release-3.11.json → ...onfig/openshift/console/release-3.11.yaml b/...onfig/openshift/console/release-3.11.json → ...onfig/openshift/console/release-3.11.yaml
diff --git a/...nfig/openshift/image-registry/master.json → ...nfig/openshift/image-registry/master.yaml b/...nfig/openshift/image-registry/master.json → ...nfig/openshift/image-registry/master.yaml
diff --git a/...penshift/image-registry/release-3.10.json → ...penshift/image-registry/release-3.10.yaml b/...penshift/image-registry/release-3.10.json → ...penshift/image-registry/release-3.10.yaml
diff --git a/...penshift/image-registry/release-3.11.json → ...penshift/image-registry/release-3.11.yaml b/...penshift/image-registry/release-3.11.json → ...penshift/image-registry/release-3.11.yaml
diff --git a/...config/openshift/imagebuilder/master.json → ...config/openshift/imagebuilder/master.yaml b/...config/openshift/imagebuilder/master.json → ...config/openshift/imagebuilder/master.yaml
diff --git a/...or/config/openshift/installer/master.json → ...or/config/openshift/installer/master.yaml b/...or/config/openshift/installer/master.json → ...or/config/openshift/installer/master.yaml
diff --git a/...fig/openshift/installer/release-3.11.json → ...fig/openshift/installer/release-3.11.yaml b/...fig/openshift/installer/release-3.11.json → ...fig/openshift/installer/release-3.11.yaml
diff --git a/...ator/config/openshift/jenkins/master.json → ...ator/config/openshift/jenkins/master.yaml b/...ator/config/openshift/jenkins/master.json → ...ator/config/openshift/jenkins/master.yaml
diff --git a/...fig/openshift/jenkins/openshift-3.10.json → ...fig/openshift/jenkins/openshift-3.10.yaml b/...fig/openshift/jenkins/openshift-3.10.json → ...fig/openshift/jenkins/openshift-3.10.yaml
diff --git a/...fig/openshift/kube-rbac-proxy/master.json → ...fig/openshift/kube-rbac-proxy/master.yaml b/...fig/openshift/kube-rbac-proxy/master.json → ...fig/openshift/kube-rbac-proxy/master.yaml
diff --git a/...enshift/kube-rbac-proxy/release-3.11.json → ...enshift/kube-rbac-proxy/release-3.11.yaml b/...enshift/kube-rbac-proxy/release-3.11.json → ...enshift/kube-rbac-proxy/release-3.11.yaml
diff --git a/.../openshift/kube-state-metrics/master.json → .../openshift/kube-state-metrics/master.yaml b/.../openshift/kube-state-metrics/master.json → .../openshift/kube-state-metrics/master.yaml
diff --git a/...hift/kube-state-metrics/release-3.11.json → ...hift/kube-state-metrics/release-3.11.yaml b/...hift/kube-state-metrics/release-3.11.json → ...hift/kube-state-metrics/release-3.11.yaml
diff --git a/...penshift/machine-api-operator/master.json → ...penshift/machine-api-operator/master.yaml b/...penshift/machine-api-operator/master.json → ...penshift/machine-api-operator/master.yaml
diff --git a/...ft/machine-api-operator/release-3.11.json → ...ft/machine-api-operator/release-3.11.yaml b/...ft/machine-api-operator/release-3.11.json → ...ft/machine-api-operator/release-3.11.yaml
diff --git a/...shift/machine-config-operator/master.json → ...shift/machine-config-operator/master.yaml b/...shift/machine-config-operator/master.json → ...shift/machine-config-operator/master.yaml
diff --git a/...machine-config-operator/release-3.11.json → ...machine-config-operator/release-3.11.yaml b/...machine-config-operator/release-3.11.json → ...machine-config-operator/release-3.11.yaml
diff --git a/...g/openshift/openshift-ansible/master.json → ...g/openshift/openshift-ansible/master.yaml b/...g/openshift/openshift-ansible/master.json → ...g/openshift/openshift-ansible/master.yaml
diff --git a/...shift/openshift-ansible/release-3.10.json → ...shift/openshift-ansible/release-3.10.yaml b/...shift/openshift-ansible/release-3.10.json → ...shift/openshift-ansible/release-3.10.yaml
diff --git a/...shift/openshift-ansible/release-3.11.json → ...shift/openshift-ansible/release-3.11.yaml b/...shift/openshift-ansible/release-3.11.json → ...shift/openshift-ansible/release-3.11.yaml
diff --git a/...fig/openshift/openshift-azure/master.json → ...fig/openshift/openshift-azure/master.yaml b/...fig/openshift/openshift-azure/master.json → ...fig/openshift/openshift-azure/master.yaml
diff --git a/...ift/origin-aggregated-logging/master.json → ...ift/origin-aggregated-logging/master.yaml b/...ift/origin-aggregated-logging/master.json → ...ift/origin-aggregated-logging/master.yaml
diff --git a/...igin-aggregated-logging/release-3.11.json → ...igin-aggregated-logging/release-3.11.yaml b/...igin-aggregated-logging/release-3.11.json → ...igin-aggregated-logging/release-3.11.yaml
diff --git a/...nfig/openshift/origin-metrics/master.json → ...nfig/openshift/origin-metrics/master.yaml b/...nfig/openshift/origin-metrics/master.json → ...nfig/openshift/origin-metrics/master.yaml
diff --git a/...penshift/origin-metrics/release-3.11.json → ...penshift/origin-metrics/release-3.11.yaml b/...penshift/origin-metrics/release-3.11.json → ...penshift/origin-metrics/release-3.11.yaml
diff --git a/...ift/origin-web-console-server/master.json → ...ift/origin-web-console-server/master.yaml b/...ift/origin-web-console-server/master.json → ...ift/origin-web-console-server/master.yaml
diff --git a/...igin-web-console-server/release-3.10.json → ...igin-web-console-server/release-3.10.yaml b/...igin-web-console-server/release-3.10.json → ...igin-web-console-server/release-3.10.yaml
diff --git a/...igin-web-console-server/release-3.11.json → ...igin-web-console-server/release-3.11.yaml b/...igin-web-console-server/release-3.11.json → ...igin-web-console-server/release-3.11.yaml
diff --git a/.../openshift/origin-web-console/master.json → .../openshift/origin-web-console/master.yaml b/.../openshift/origin-web-console/master.json → .../openshift/origin-web-console/master.yaml
diff --git a/...hift/origin-web-console/release-3.10.json → ...hift/origin-web-console/release-3.10.yaml b/...hift/origin-web-console/release-3.10.json → ...hift/origin-web-console/release-3.10.yaml
diff --git a/...rator/config/openshift/origin/master.json → ...rator/config/openshift/origin/master.yaml b/...rator/config/openshift/origin/master.json → ...rator/config/openshift/origin/master.yaml
diff --git a/...config/openshift/origin/release-3.10.json → ...config/openshift/origin/release-3.10.yaml b/...config/openshift/origin/release-3.10.json → ...config/openshift/origin/release-3.10.yaml
diff --git a/...config/openshift/origin/release-3.11.json → ...config/openshift/origin/release-3.11.yaml b/...config/openshift/origin/release-3.11.json → ...config/openshift/origin/release-3.11.yaml
diff --git a/...openshift/prometheus-operator/master.json → ...openshift/prometheus-operator/master.yaml b/...openshift/prometheus-operator/master.json → ...openshift/prometheus-operator/master.yaml
diff --git a/...ift/prometheus-operator/release-3.11.json → ...ift/prometheus-operator/release-3.11.yaml b/...ift/prometheus-operator/release-3.11.json → ...ift/prometheus-operator/release-3.11.yaml
diff --git a/...fig/openshift/service-catalog/master.json → ...fig/openshift/service-catalog/master.yaml b/...fig/openshift/service-catalog/master.json → ...fig/openshift/service-catalog/master.yaml
diff --git a/...enshift/service-catalog/release-3.11.json → ...enshift/service-catalog/release-3.11.yaml b/...enshift/service-catalog/release-3.11.json → ...enshift/service-catalog/release-3.11.yaml
diff --git a/...t/service-serving-cert-signer/master.json → ...t/service-serving-cert-signer/master.yaml b/...t/service-serving-cert-signer/master.json → ...t/service-serving-cert-signer/master.yaml
diff --git a/...ice-serving-cert-signer/release-3.11.json → ...ice-serving-cert-signer/release-3.11.yaml b/...ice-serving-cert-signer/release-3.11.json → ...ice-serving-cert-signer/release-3.11.yaml
diff --git a/...or/config/openshift/telemeter/master.json → ...or/config/openshift/telemeter/master.yaml b/...or/config/openshift/telemeter/master.json → ...or/config/openshift/telemeter/master.yaml
diff --git a/...fig/openshift/telemeter/release-3.11.json → ...fig/openshift/telemeter/release-3.11.yaml b/...fig/openshift/telemeter/release-3.11.json → ...fig/openshift/telemeter/release-3.11.yaml
diff --git a/...onfig/tnozicka/openshift-acme/master.json → ...onfig/tnozicka/openshift-acme/master.yaml b/...onfig/tnozicka/openshift-acme/master.json → ...onfig/tnozicka/openshift-acme/master.yaml
diff --git a/ci-operator/jobs/openshift/api/openshift-api-presubmits.yaml b/ci-operator/jobs/openshift/api/openshift-api-presubmits.yaml
@@ -20,7 +20,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-api
         image: ci-operator:latest
         name: test

diff --git a/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-postsubmits-release-3.11.yaml b/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-postsubmits-release-3.11.yaml
@@ -17,7 +17,7 @@ postsubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: release-3.11.json
+              key: release-3.11.yaml
               name: ci-operator-openshift-azure-misc
         image: ci-operator:latest
         name: test

diff --git a/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-postsubmits.yaml b/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-postsubmits.yaml
@@ -17,7 +17,7 @@ postsubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-azure-misc
         image: ci-operator:latest
         name: test

diff --git a/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-presubmits-release-3.11.yaml b/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-presubmits-release-3.11.yaml
@@ -22,7 +22,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: release-3.11.json
+              key: release-3.11.yaml
               name: ci-operator-openshift-azure-misc
         image: ci-operator:latest
         name: test

diff --git a/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-presubmits.yaml b/ci-operator/jobs/openshift/azure-misc/openshift-azure-misc-presubmits.yaml
@@ -22,7 +22,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-azure-misc
         image: ci-operator:latest
         name: test

diff --git a/...perator/jobs/openshift/ci-operator-prowgen/openshift-ci-operator-prowgen-postsubmits.yaml b/...perator/jobs/openshift/ci-operator-prowgen/openshift-ci-operator-prowgen-postsubmits.yaml
@@ -18,7 +18,7 @@ postsubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-ci-operator-prowgen
         image: ci-operator:latest
         name: ""

diff --git a/ci-operator/jobs/openshift/ci-operator-prowgen/openshift-ci-operator-prowgen-presubmits.yaml b/ci-operator/jobs/openshift/ci-operator-prowgen/openshift-ci-operator-prowgen-presubmits.yaml
@@ -20,7 +20,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-ci-operator-prowgen
         image: ci-operator:latest
         name: ""
@@ -51,7 +51,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-ci-operator-prowgen
         image: ci-operator:latest
         name: ""
@@ -82,7 +82,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-ci-operator-prowgen
         image: ci-operator:latest
         name: ""

diff --git a/ci-operator/jobs/openshift/ci-operator/openshift-ci-operator-postsubmits.yaml b/ci-operator/jobs/openshift/ci-operator/openshift-ci-operator-postsubmits.yaml
@@ -18,7 +18,7 @@ postsubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-ci-operator
         image: ci-operator:latest
         name: ""

diff --git a/ci-operator/jobs/openshift/ci-operator/openshift-ci-operator-presubmits.yaml b/ci-operator/jobs/openshift/ci-operator/openshift-ci-operator-presubmits.yaml
@@ -20,7 +20,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-ci-operator
         image: ci-operator:latest
         name: ""
@@ -51,7 +51,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-ci-operator
         image: ci-operator:latest
         name: ""
@@ -82,7 +82,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-ci-operator
         image: ci-operator:latest
         name: ""

diff --git a/...cluster-api-provider-aws/openshift-cluster-api-provider-aws-postsubmits-release-3.11.yaml b/...cluster-api-provider-aws/openshift-cluster-api-provider-aws-postsubmits-release-3.11.yaml
@@ -20,7 +20,7 @@ postsubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: release-3.11.json
+              key: release-3.11.yaml
               name: ci-operator-openshift-cluster-api-provider-aws
         image: ci-operator:latest
         name: test

diff --git a/...bs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-postsubmits.yaml b/...bs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-postsubmits.yaml
@@ -20,7 +20,7 @@ postsubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-cluster-api-provider-aws
         image: ci-operator:latest
         name: test

diff --git a/.../cluster-api-provider-aws/openshift-cluster-api-provider-aws-presubmits-release-3.11.yaml b/.../cluster-api-provider-aws/openshift-cluster-api-provider-aws-presubmits-release-3.11.yaml
@@ -20,7 +20,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: release-3.11.json
+              key: release-3.11.yaml
               name: ci-operator-openshift-cluster-api-provider-aws
         image: ci-operator:latest
         name: test
@@ -51,7 +51,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: release-3.11.json
+              key: release-3.11.yaml
               name: ci-operator-openshift-cluster-api-provider-aws
         image: ci-operator:latest
         name: test

diff --git a/...obs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-presubmits.yaml b/...obs/openshift/cluster-api-provider-aws/openshift-cluster-api-provider-aws-presubmits.yaml
@@ -20,7 +20,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-cluster-api-provider-aws
         image: ci-operator:latest
         name: test
@@ -51,7 +51,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-cluster-api-provider-aws
         image: ci-operator:latest
         name: test

diff --git a/...-api-provider-libvirt/openshift-cluster-api-provider-libvirt-presubmits-release-3.11.yaml b/...-api-provider-libvirt/openshift-cluster-api-provider-libvirt-presubmits-release-3.11.yaml
@@ -20,7 +20,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: release-3.11.json
+              key: release-3.11.yaml
               name: ci-operator-openshift-cluster-api-provider-libvirt
         image: ci-operator:latest
         name: test

diff --git a/...shift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-presubmits.yaml b/...shift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-presubmits.yaml
@@ -20,7 +20,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-cluster-api-provider-libvirt
         image: ci-operator:latest
         name: test

diff --git a/.../jobs/openshift/cluster-capacity/openshift-cluster-capacity-postsubmits-release-3.11.yaml b/.../jobs/openshift/cluster-capacity/openshift-cluster-capacity-postsubmits-release-3.11.yaml
@@ -20,7 +20,7 @@ postsubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: release-3.11.json
+              key: release-3.11.yaml
               name: ci-operator-kubernetes-cluster-capacity
         image: ci-operator:latest
         name: test

diff --git a/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-postsubmits.yaml
@@ -20,7 +20,7 @@ postsubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-kubernetes-cluster-capacity
         image: ci-operator:latest
         name: test
@@ -50,7 +50,7 @@ postsubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: release-3.10.json
+              key: release-3.10.yaml
               name: ci-operator-kubernetes-cluster-capacity
         image: ci-operator:latest
         name: test

diff --git a/...r/jobs/openshift/cluster-capacity/openshift-cluster-capacity-presubmits-release-3.11.yaml b/...r/jobs/openshift/cluster-capacity/openshift-cluster-capacity-presubmits-release-3.11.yaml
@@ -21,7 +21,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: release-3.11.json
+              key: release-3.11.yaml
               name: ci-operator-kubernetes-cluster-capacity
         image: ci-operator:latest
         name: test

diff --git a/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-presubmits.yaml b/ci-operator/jobs/openshift/cluster-capacity/openshift-cluster-capacity-presubmits.yaml
@@ -21,7 +21,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-kubernetes-cluster-capacity
         image: ci-operator:latest
         name: test
@@ -53,7 +53,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: release-3.10.json
+              key: release-3.10.yaml
               name: ci-operator-kubernetes-cluster-capacity
         image: ci-operator:latest
         name: test

diff --git a/...rator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-postsubmits.yaml b/...rator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-postsubmits.yaml
@@ -17,7 +17,7 @@ postsubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-cluster-dns-operator
         image: ci-operator:latest
         name: ""
@@ -47,7 +47,7 @@ postsubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-cluster-dns-operator
         image: ci-operator:latest
         name: ""

diff --git a/...erator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-presubmits.yaml b/...erator/jobs/openshift/cluster-dns-operator/openshift-cluster-dns-operator-presubmits.yaml
@@ -20,7 +20,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-cluster-dns-operator
         image: ci-operator:latest
         name: ""
@@ -51,7 +51,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-cluster-dns-operator
         image: ci-operator:latest
         name: ""

diff --git a/...bs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-postsubmits.yaml b/...bs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-postsubmits.yaml
@@ -17,7 +17,7 @@ postsubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-cluster-ingress-operator
         image: ci-operator:latest
         name: ""
@@ -47,7 +47,7 @@ postsubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-cluster-ingress-operator
         image: ci-operator:latest
         name: ""

diff --git a/...obs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-presubmits.yaml b/...obs/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-presubmits.yaml
@@ -20,7 +20,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-cluster-ingress-operator
         image: ci-operator:latest
         name: ""
@@ -52,7 +52,7 @@ presubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-cluster-ingress-operator
         image: ci-operator:latest
         name: ""

diff --git a/...r-monitoring-operator/openshift-cluster-monitoring-operator-postsubmits-release-3.11.yaml b/...r-monitoring-operator/openshift-cluster-monitoring-operator-postsubmits-release-3.11.yaml
@@ -20,7 +20,7 @@ postsubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: release-3.11.json
+              key: release-3.11.yaml
               name: ci-operator-openshift-cluster-monitoring-operator
         image: ci-operator:latest
         name: test

diff --git a/...nshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-postsubmits.yaml b/...nshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-postsubmits.yaml
@@ -20,7 +20,7 @@ postsubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-cluster-monitoring-operator
         image: ci-operator:latest
         name: test

diff --git a/ci-operator/jobs/openshift/cluster-operator/openshift-cluster-operator-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-operator/openshift-cluster-operator-postsubmits.yaml
@@ -17,7 +17,7 @@ postsubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-cluster-operator
         image: ci-operator:latest
         name: ""
@@ -44,7 +44,7 @@ postsubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-cluster-operator
         image: ci-operator:latest
         name: ""
@@ -74,7 +74,7 @@ postsubmits:
         - name: CONFIG_SPEC
           valueFrom:
             configMapKeyRef:
-              key: master.json
+              key: master.yaml
               name: ci-operator-openshift-cluster-operator
         image: ci-operator:latest
         name: ""