Merge pull request #15891 from jim-minter/tsb-loglevel

Automatic merge from submit-queue (batch tested with PRs 15861, 15865, 15873, 15848, 15891)

oc cluster up: pass server loglevel to template service broker

@gabemontero @deads2k fyi

Author: openshift-merge-robot

examples/templateservicebroker/templateservicebroker-template.yaml

@@ -11,6 +11,8 @@ parameters:
   value: openshift-template-service-broker
 - name: KUBE_SYSTEM
   value: kube-system
+- name: LOGLEVEL
+  value: "0"
 objects:
 
 # to create the tsb server
@@ -41,6 +43,7 @@ objects:
           - "--tls-cert-file=/var/serving-cert/tls.crt"
           - "--tls-private-key-file=/var/serving-cert/tls.key"
           - "--template-namespace=${TSB_TEMPLATE_NAMESPACE}"
+          - "--loglevel=${LOGLEVEL}"
           ports:
           - containerPort: 8443
           volumeMounts:

pkg/oc/bootstrap/bindata.go

@@ -23,7 +23,7 @@ const (
 )
 
 // InstallServiceCatalog checks whether the template service broker is installed and installs it if not already installed
-func (h *Helper) InstallTemplateServiceBroker(f *clientcmd.Factory, imageFormat string) error {
+func (h *Helper) InstallTemplateServiceBroker(f *clientcmd.Factory, imageFormat string, serverLogLevel int) error {
 	osClient, kubeClient, err := f.Clients()
 	if err != nil {
 		return errors.NewError("cannot obtain API clients").WithCause(err).WithDetails(h.OriginLog())
@@ -45,7 +45,8 @@ func (h *Helper) InstallTemplateServiceBroker(f *clientcmd.Factory, imageFormat
 	imageTemplate.Latest = false
 
 	if err = instantiateTemplate(osClient, clientcmd.ResourceMapper(f), tsbNamespace, tsbTemplateName, tsbNamespace, map[string]string{
-		"IMAGE": imageTemplate.ExpandOrDie(""),
+		"IMAGE":    imageTemplate.ExpandOrDie(""),
+		"LOGLEVEL": fmt.Sprint(serverLogLevel),
 	}, true); err != nil {
 		return errors.NewError("cannot instantiate logger accounts").WithCause(err)
 	}

pkg/oc/bootstrap/docker/openshift/templateservicebroker.go

@@ -1066,7 +1066,7 @@ func (c *ClientStartConfig) InstallTemplateServiceBroker(out io.Writer) error {
 	}
 	// TODO we want to use this eventually, but until we have our own image for TSB, we have to hardcode this origin
 	//return c.OpenShiftHelper().InstallTemplateServiceBroker(f, c.imageFormat())
-	return c.OpenShiftHelper().InstallTemplateServiceBroker(f, c.Image)
+	return c.OpenShiftHelper().InstallTemplateServiceBroker(f, c.Image, c.ServerLogLevel)
 }
 
 // Login logs into the new server and sets up a default user and project