Merge pull request #20504 from deads2k/controller-01-config

 move build controller configapi to configapi

Author: openshift-merge-robot

hack/lib/constants.sh

@@ -350,19 +350,21 @@ function os::build::check_binaries() {
   # enforce that certain binaries don't accidentally grow too large
   # IMPORTANT: contact Clayton or another master team member before altering this code
   if [[ -f "${OS_OUTPUT_BINPATH}/${platform}/oc" ]]; then
-    ocsize=$($duexe --apparent-size -m "${OS_OUTPUT_BINPATH}/${platform}/oc" | cut -f 1)
-    if [[ "${ocsize}" -gt "118" ]]; then
-      os::log::fatal "oc binary has grown substantially to ${ocsize}. You must have approval before bumping this limit."
+    size=$($duexe --apparent-size -m "${OS_OUTPUT_BINPATH}/${platform}/oc" | cut -f 1)
+    if [[ "${size}" -gt "118" ]]; then
+      os::log::fatal "oc binary has grown substantially to ${size}. You must have approval before bumping this limit."
     fi
   fi
   if [[ -f "${OS_OUTPUT_BINPATH}/${platform}/openshift-node-config" ]]; then
-    if [[ "$($duexe --apparent-size -m "${OS_OUTPUT_BINPATH}/${platform}/openshift-node-config" | cut -f 1)" -gt "22" ]]; then
-      os::log::fatal "openshift-node-config binary has grown substantially. You must have approval before bumping this limit."
+    size=$($duexe --apparent-size -m "${OS_OUTPUT_BINPATH}/${platform}/openshift-node-config" | cut -f 1)
+    if [[ "${size}" -gt "30" ]]; then
+      os::log::fatal "openshift-node-config binary has grown substantially to ${size}. You must have approval before bumping this limit."
     fi
   fi
   if [[ -f "${OS_OUTPUT_BINPATH}/${platform}/pod" ]]; then
-    if [[ "$($duexe --apparent-size -m "${OS_OUTPUT_BINPATH}/${platform}/pod" | cut -f 1)" -gt "2" ]]; then
-      os::log::fatal "pod binary has grown substantially. You must have approval before bumping this limit."
+    size=$($duexe --apparent-size -m "${OS_OUTPUT_BINPATH}/${platform}/pod" | cut -f 1)
+    if [[ "${size}" -gt "2" ]]; then
+      os::log::fatal "pod binary has grown substantially to ${size}. You must have approval before bumping this limit."
     fi
   fi
 }

hack/update-generated-conversions.sh

@@ -10,7 +10,6 @@ function codegen::join() { local IFS="$1"; shift; echo "$*"; }
 
 # enumerate group versions
 ALL_FQ_APIS=(
-    github.com/openshift/origin/pkg/build/controller/build/apis/defaults/v1
     github.com/openshift/origin/pkg/apps/apis/apps/v1
     github.com/openshift/origin/pkg/authorization/apis/authorization/v1
     github.com/openshift/origin/pkg/build/apis/build/v1

hack/update-generated-deep-copies.sh

@@ -11,10 +11,6 @@ function codegen::join() { local IFS="$1"; shift; echo "$*"; }
 
 # enumerate group versions
 ALL_FQ_APIS=(
-    github.com/openshift/origin/pkg/build/controller/build/apis/defaults
-    github.com/openshift/origin/pkg/build/controller/build/apis/defaults/v1
-    github.com/openshift/origin/pkg/build/controller/build/apis/overrides
-    github.com/openshift/origin/pkg/build/controller/build/apis/overrides/v1
     github.com/openshift/origin/pkg/cmd/server/apis/config
     github.com/openshift/origin/pkg/cmd/server/apis/config/v1
     github.com/openshift/origin/pkg/cmd/server/apis/config/v1/testing