Remove base overrides from main branches

jupierce · Dec 7, 2023 · a227b70 · a227b70
1 parent 801f2ca
commit a227b70
Show file tree

Hide file tree

Showing 98 changed files with 12 additions and 134 deletions.
diff --git a/ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-main.yaml b/ci-operator/config/openshift/agent-installer-utils/openshift-agent-installer-utils-main.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:

diff --git a/...or/config/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-master.yaml b/...or/config/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/.../config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-master.yaml b/.../config/openshift/assisted-installer-agent/openshift-assisted-installer-agent-master.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: ./Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:

diff --git a/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-master.yaml b/ci-operator/config/openshift/assisted-installer/openshift-assisted-installer-master.yaml
@@ -19,14 +19,12 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: ./Dockerfile.assisted-installer.ocp
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
   to: agent-installer-orchestrator
 - dockerfile_path: ./Dockerfile.assisted-installer-controller.ocp
-  from: base
   inputs:
     ocp_4.15_cli:
       as:

diff --git a/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master.yaml b/ci-operator/config/openshift/assisted-service/openshift-assisted-service-master.yaml
@@ -19,7 +19,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: ./Dockerfile.assisted-service.ocp
-  from: base
   inputs:
     ocp_4.15_cli:
       as:

diff --git a/.../config/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-master.yaml b/.../config/openshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-master.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: github.com/aws/amazon-eks-pod-identity-webhook
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/...ator/config/openshift/azure-workload-identity/openshift-azure-workload-identity-main.yaml b/...ator/config/openshift/azure-workload-identity/openshift-azure-workload-identity-main.yaml
@@ -12,7 +12,6 @@ build_root:
 canonical_go_repository: github.com/azure/azure-workload-identity
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/ci-operator/config/openshift/bond-cni/openshift-bond-cni-master.yaml b/ci-operator/config/openshift/bond-cni/openshift-bond-cni-master.yaml
@@ -18,7 +18,6 @@ build_root:
     tag: golang-1.12
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/ci-operator/config/openshift/builder/openshift-builder-master.yaml b/ci-operator/config/openshift/builder/openshift-builder-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel8
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/...onfig/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master.yaml b/...onfig/openshift/cloud-credential-operator/openshift-cloud-credential-operator-master.yaml
@@ -11,8 +11,7 @@ binary_build_commands: make build-no-gen
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15

diff --git a/...ift/cloud-network-config-controller/openshift-cloud-network-config-controller-master.yaml b/...ift/cloud-network-config-controller/openshift-cloud-network-config-controller-master.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: openshift/cloud-network-config-controller
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/...openshift/cluster-api-provider-ibmcloud/openshift-cluster-api-provider-ibmcloud-main.yaml b/...openshift/cluster-api-provider-ibmcloud/openshift-cluster-api-provider-ibmcloud-main.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-api-provider-ibmcloud
 images:
 - dockerfile_path: openshift/Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:

diff --git a/...openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-master.yaml b/...openshift/cluster-api-provider-libvirt/openshift-cluster-api-provider-libvirt-master.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/...fig/openshift/cluster-api-provider-metal3/openshift-cluster-api-provider-metal3-main.yaml b/...fig/openshift/cluster-api-provider-metal3/openshift-cluster-api-provider-metal3-main.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:

diff --git a/...enshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml b/...enshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-api-provider-openstack
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/...fig/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-master.yaml b/...fig/openshift/cluster-api-provider-ovirt/openshift-cluster-api-provider-ovirt-master.yaml
@@ -20,7 +20,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:

diff --git a/...ift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml b/...ift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml
@@ -16,7 +16,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master.yaml b/ci-operator/config/openshift/cluster-bootstrap/openshift-cluster-bootstrap-master.yaml
@@ -19,8 +19,7 @@ binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15

diff --git a/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-master.yaml b/ci-operator/config/openshift/cluster-capacity/openshift-cluster-capacity-master.yaml
@@ -13,7 +13,6 @@ build_root:
 canonical_go_repository: sigs.k8s.io/cluster-capacity
 images:
 - dockerfile_path: images/cluster-capacity/Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-master.yaml b/ci-operator/config/openshift/cluster-dns-operator/openshift-cluster-dns-operator-master.yaml
@@ -10,8 +10,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15

diff --git a/...erator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml b/...erator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml
@@ -40,7 +40,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/.../config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml b/.../config/openshift/cluster-ingress-operator/openshift-cluster-ingress-operator-master.yaml
@@ -18,8 +18,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15

diff --git a/...ift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-master.yaml b/...ift/cluster-kube-apiserver-operator/openshift-cluster-kube-apiserver-operator-master.yaml
@@ -40,7 +40,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/...on-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-master.yaml b/...on-migrator-operator/openshift-cluster-kube-storage-version-migrator-operator-master.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/ci/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/...g/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-master.yaml b/...g/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-master.yaml
@@ -7,7 +7,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   to: cluster-monitoring-operator
 - dockerfile_literal: |
     FROM src

diff --git a/.../config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml b/.../config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml
@@ -28,7 +28,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-master.yaml b/ci-operator/config/openshift/cluster-nfd-operator/openshift-cluster-nfd-operator-master.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/...openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml b/...openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml
@@ -23,14 +23,12 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     openshift_release_golang-1.20:
       as:
       - registry.ci.openshift.org/openshift/release:golang-1.20
   to: cluster-node-tuning-operator-us-tuned
 - dockerfile_path: Dockerfile.rhel9
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:

diff --git a/...r-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-master.yaml b/...r-openshift-apiserver-operator/openshift-cluster-openshift-apiserver-operator-master.yaml
@@ -11,8 +11,7 @@ binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15

diff --git a/...ller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master.yaml b/...ller-manager-operator/openshift-cluster-openshift-controller-manager-operator-master.yaml
@@ -11,8 +11,7 @@ binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15

diff --git a/...ide-admission-operator/openshift-cluster-resource-override-admission-operator-master.yaml b/...ide-admission-operator/openshift-cluster-resource-override-admission-operator-master.yaml
@@ -16,14 +16,12 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/ci/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14
   to: cluster-resource-override-admission-operator
 - dockerfile_path: images/operator-registry/Dockerfile.registry.ci
-  from: base
   inputs:
     openshift_release_golang-1.15:
       as:

diff --git a/...ter-resource-override-admission/openshift-cluster-resource-override-admission-master.yaml b/...ter-resource-override-admission/openshift-cluster-resource-override-admission-master.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: images/ci/Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/.../config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master.yaml b/.../config/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master.yaml
@@ -10,8 +10,7 @@ base_images:
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15

diff --git a/...ig/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master__okd.yaml b/...ig/openshift/cluster-samples-operator/openshift-cluster-samples-operator-master__okd.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.okd
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.14:
       as:

diff --git a/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master.yaml b/ci-operator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master.yaml
@@ -7,7 +7,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel
-  from: base
   to: cluster-update-keys
 promotion:
   name: "4.15"

diff --git a/...rator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master__okd.yaml b/...rator/config/openshift/cluster-update-keys/openshift-cluster-update-keys-master__okd.yaml
@@ -7,7 +7,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   to: cluster-update-keys
 promotion:
   name: "4.15"

diff --git a/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-master.yaml b/ci-operator/config/openshift/configmap-reload/openshift-configmap-reload-master.yaml
@@ -11,7 +11,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.ocp
-  from: base
   inputs:
     ocp_builder_rhel-9-golang-1.20-openshift-4.15:
       as:

diff --git a/ci-operator/config/openshift/console-operator/openshift-console-operator-master.yaml b/ci-operator/config/openshift/console-operator/openshift-console-operator-master.yaml
@@ -12,7 +12,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/ci-operator/config/openshift/console/openshift-console-master.yaml b/ci-operator/config/openshift/console/openshift-console-master.yaml
@@ -19,7 +19,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-base-nodejs-openshift-4.15:
       as:

diff --git a/...g/openshift/containernetworking-plugins/openshift-containernetworking-plugins-master.yaml b/...g/openshift/containernetworking-plugins/openshift-containernetworking-plugins-master.yaml
@@ -15,7 +15,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml b/ci-operator/config/openshift/coredns/openshift-coredns-master.yaml
@@ -16,7 +16,6 @@ build_root:
 canonical_go_repository: github.com/coredns/coredns
 images:
 - dockerfile_path: Dockerfile.openshift.rhel7
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-master.yaml b/ci-operator/config/openshift/driver-toolkit/openshift-driver-toolkit-master.yaml
@@ -14,7 +14,6 @@ images:
   - name: RHEL_VERSION
     value: "9.2"
   dockerfile_path: Dockerfile
-  from: base
   to: driver-toolkit
 promotion:
   additional_images:

diff --git a/ci-operator/config/openshift/egress-router-cni/openshift-egress-router-cni-master.yaml b/ci-operator/config/openshift/egress-router-cni/openshift-egress-router-cni-master.yaml
@@ -16,7 +16,6 @@ build_root:
   from_repository: true
 images:
 - dockerfile_path: Dockerfile.openshift
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as:

diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml
@@ -23,14 +23,12 @@ binary_build_commands: make build
 build_root:
   from_repository: true
 images:
-- from: base
-  inputs:
+- inputs:
     openshift_release_golang-1.20:
       as:
       - registry.ci.openshift.org/openshift/release:golang-1.20
   to: hypershift-operator
 - dockerfile_path: Dockerfile.control-plane
-  from: base
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.15:
       as: