Merge pull request openshift#3535 from jupierce/loglevel

Change in BUILD_LOGLEVEL handling

Author: bmcelvee

dev_guide/builds.adoc

@@ -1697,9 +1697,11 @@ sourceStrategy:
 <1> Adjust this value to the desired log level.
 ====
 
-NOTE: A platform administrator can set verbosity for the entire {product-title}
-instance by passing the `--loglevel` option to the `openshift start` command.
-If both `--loglevel` and `BUILD_LOGLEVEL` are specified, `BUILD_LOGLEVEL` takes precedence.
+NOTE: A platform administrator can set the default build verbosity for the entire {product-title}
+instance by configuring env/BUILD_LOGLEVEL for the `BuildDefaults` admission controller. This
+default can be overridden by specifying BUILD_LOGLEVEL in a given BuildConfig. A still higher priority
+override can be specified on the command line for non-binary builds by passing --build-loglevel to
+`oc start-build`.
 
 Available log levels for Source builds are as follows:
 

install_config/build_defaults_overrides.adoc

@@ -128,20 +128,22 @@ admissionConfig:
           value: http://my.proxy:8080
         - name: HTTPS_PROXY <5>
           value: https://my.proxy:8443
-        - name: CUSTOM_VAR <6>
+        - name: BUILD_LOGLEVEL <6>
+          value: 4
+        - name: CUSTOM_VAR <7>
           value: custom_value
         imageLabels:
-        - name: url <7>
+        - name: url <8>
           value: https://containers.example.org
         - name: vendor
           value: ExampleCorp Ltd.
-        nodeSelector: <8>
+        nodeSelector: <9>
           key1: value1
           key2: value2
-        annotations: <9>
+        annotations: <10>
           key1: value1
           key2: value2
-        resources: <10>
+        resources: <11>
           requests:
             cpu: "100m"
             memory: "256Mi"
@@ -158,14 +160,15 @@ phases.
 <5> Default environment variable that sets the HTTPS proxy to use during the
 build. This may be used for downloading dependencies during the assemble and
 build phases.
-<6> Additional default environment variable that will be added to
+<6> Default environment variable that sets the build log level during the build.
+<7> Additional default environment variable that will be added to
 every build.
-<7> Labels to be applied to every image built. Users can override these in their `BuildConfig`.
-<8> Build pods will only run on nodes with the `key1=value2` and `key2=value2` labels.
+<8> Labels to be applied to every image built. Users can override these in their `BuildConfig`.
+<9> Build pods will only run on nodes with the `key1=value2` and `key2=value2` labels.
     Users can define a different set of `nodeSelectors` for their builds in which case these
     values will be ignored.
-<9> Build pods will have these annotations added to them.
-<10> Sets the default resources to the build pod if the `BuildConfig` does not have related resource defined.
+<10> Build pods will have these annotations added to them.
+<11> Sets the default resources to the build pod if the `BuildConfig` does not have related resource defined.
 
 ====