use library-go functionality for logs and template processing

vrushalid · May 29, 2019 · 638d69f · 638d69f
1 parent dafe8b2
commit 638d69f
Show file tree

Hide file tree

Showing 16 changed files with 11 additions and 359 deletions.
diff --git a/hack/import-restrictions.json b/hack/import-restrictions.json
@@ -550,7 +550,6 @@
       "github.com/openshift/origin/pkg/security/securitycontextconstraints/util",
       "github.com/openshift/origin/pkg/template/apis/template",
       "github.com/openshift/origin/pkg/template/apis/template/validation",
-      "github.com/openshift/origin/pkg/template/generator",
       "github.com/openshift/origin/pkg/template/templateprocessing",
       "github.com/openshift/origin/pkg/unidling/api",
       "github.com/openshift/origin/pkg/unidling/util",

diff --git a/pkg/cmd/openshift-apiserver/server.go b/pkg/cmd/openshift-apiserver/server.go
@@ -1,6 +1,7 @@
 package openshift_apiserver
 
 import (
+	"github.com/openshift/library-go/pkg/serviceability"
 	"k8s.io/klog"
 
 	genericapiserver "k8s.io/apiserver/pkg/server"
@@ -10,8 +11,6 @@ import (
 
 	openshiftcontrolplanev1 "github.com/openshift/api/openshiftcontrolplane/v1"
 	"github.com/openshift/origin/pkg/cmd/openshift-apiserver/openshiftapiserver"
-	"github.com/openshift/origin/pkg/cmd/util"
-
 	_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration
 	_ "k8s.io/kubernetes/pkg/util/reflector/prometheus" // for reflector metric registration
 	_ "k8s.io/kubernetes/pkg/util/workqueue/prometheus" // for workqueue metric registration
@@ -21,7 +20,7 @@ import (
 var featureKeepRemovedNetworkingAPI = true
 
 func RunOpenShiftAPIServer(serverConfig *openshiftcontrolplanev1.OpenShiftAPIServerConfig, stopCh <-chan struct{}) error {
-	util.InitLogrus()
+	serviceability.InitLogrusFromKlog()
 	// Allow privileged containers
 	capabilities.Initialize(capabilities.Capabilities{
 		AllowPrivileged: true,

diff --git a/pkg/cmd/openshift-controller-manager/controller_manager.go b/pkg/cmd/openshift-controller-manager/controller_manager.go
@@ -7,6 +7,8 @@ import (
 	"os"
 	"time"
 
+	"github.com/openshift/library-go/pkg/serviceability"
+
 	"k8s.io/klog"
 
 	"k8s.io/api/core/v1"
@@ -21,7 +23,6 @@ import (
 
 	openshiftcontrolplanev1 "github.com/openshift/api/openshiftcontrolplane/v1"
 	origincontrollers "github.com/openshift/origin/pkg/cmd/openshift-controller-manager/controller"
-	"github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/variable"
 	"github.com/openshift/origin/pkg/version"
 
@@ -30,7 +31,7 @@ import (
 )
 
 func RunOpenShiftControllerManager(config *openshiftcontrolplanev1.OpenShiftControllerManagerConfig, clientConfig *rest.Config) error {
-	util.InitLogrus()
+	serviceability.InitLogrusFromKlog()
 	kubeClient, err := kubernetes.NewForConfig(clientConfig)
 	if err != nil {
 		return err

diff --git a/pkg/cmd/openshift-network-controller/network_controller.go b/pkg/cmd/openshift-network-controller/network_controller.go
@@ -16,16 +16,16 @@ import (
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 
 	openshiftcontrolplanev1 "github.com/openshift/api/openshiftcontrolplane/v1"
+	"github.com/openshift/library-go/pkg/serviceability"
 	"github.com/openshift/origin/pkg/cmd/openshift-controller-manager"
 	origincontrollers "github.com/openshift/origin/pkg/cmd/openshift-controller-manager/controller"
-	"github.com/openshift/origin/pkg/cmd/util"
 
 	// for metrics
 	_ "k8s.io/kubernetes/pkg/client/metrics/prometheus"
 )
 
 func RunOpenShiftNetworkController(config *openshiftcontrolplanev1.OpenShiftControllerManagerConfig, clientConfig *rest.Config) error {
-	util.InitLogrus()
+	serviceability.InitLogrusFromKlog()
 	kubeClient, err := kubernetes.NewForConfig(clientConfig)
 	if err != nil {
 		return err

diff --git a/pkg/cmd/util/log.go b/pkg/cmd/util/log.go
diff --git a/pkg/oc/cli/process/process.go b/pkg/oc/cli/process/process.go
@@ -30,14 +30,14 @@ import (
 	octemplateapi "github.com/openshift/api/template"
 	templatev1 "github.com/openshift/api/template/v1"
 	templatev1client "github.com/openshift/client-go/template/clientset/versioned/typed/template/v1"
+	"github.com/openshift/library-go/pkg/template/generator"
 	cmdutil "github.com/openshift/oc/pkg/helpers/cmd"
 	"github.com/openshift/origin/pkg/oc/lib/describe"
 	"github.com/openshift/origin/pkg/oc/lib/newapp/app"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
 	templateapiv1 "github.com/openshift/origin/pkg/template/apis/template/v1"
 	templatevalidation "github.com/openshift/origin/pkg/template/apis/template/validation"
 	templateclientv1 "github.com/openshift/origin/pkg/template/client/v1"
-	"github.com/openshift/origin/pkg/template/generator"
 	"github.com/openshift/origin/pkg/template/templateprocessing"
 )
 

diff --git a/pkg/template/apiserver/registry/template/rest.go b/pkg/template/apiserver/registry/template/rest.go
@@ -14,9 +14,9 @@ import (
 	"k8s.io/apiserver/pkg/registry/rest"
 
 	"github.com/openshift/api/template"
+	"github.com/openshift/library-go/pkg/template/generator"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
 	templatevalidation "github.com/openshift/origin/pkg/template/apis/template/validation"
-	"github.com/openshift/origin/pkg/template/generator"
 	"github.com/openshift/origin/pkg/template/templateprocessing"
 )
 

diff --git a/pkg/template/generator/doc.go b/pkg/template/generator/doc.go
diff --git a/pkg/template/generator/examples/doc.go b/pkg/template/generator/examples/doc.go
diff --git a/pkg/template/generator/examples/remotevalue.go b/pkg/template/generator/examples/remotevalue.go
diff --git a/pkg/template/generator/examples/remotevalue_test.go b/pkg/template/generator/examples/remotevalue_test.go
diff --git a/pkg/template/generator/expressionvalue.go b/pkg/template/generator/expressionvalue.go