Merge pull request #19837 from deads2k/lib-06-bump

 use library-go methods for webconsole operator

Author: openshift-merge-robot

api/protobuf-spec/github_com_openshift_api_operator_v1alpha1.proto

@@ -33,6 +33,16 @@ objects:
     subresources:
       status: {}
 
+- apiVersion: v1
+  kind: ConfigMap
+  metadata:
+    namespace: openshift-core-operators
+    name: openshift-web-console-operator-config
+  data:
+    operator-config.yaml: |
+      apiVersion: operator.openshift.io/v1alpha1
+      kind: GenericOperatorConfig
+
 - apiVersion: apps/v1
   kind: Deployment
   metadata:
@@ -58,8 +68,22 @@ objects:
           imagePullPolicy: ${OPENSHIFT_PULL_POLICY}
           command: ["hypershift", "experimental", "openshift-webconsole-operator"]
           args:
+          - "--config=/var/run/configmaps/config/operator-config.yaml"
           - "-v=${LOGLEVEL}"
+          volumeMounts:
+          - mountPath: /var/run/configmaps/config
+            name: config
         nodeSelector: "${{NODE_SELECTOR}}"
+        volumes:
+        - name: serving-cert
+          secret:
+            defaultMode: 400
+            secretName: openshift-web-console-operator-serving-cert
+            optional: true
+        - name: config
+          configMap:
+            defaultMode: 440
+            name: openshift-web-console-operator-config
 
 - apiVersion: v1
   kind: ServiceAccount

api/protobuf-spec/github_com_openshift_api_servicecertsigner_v1alpha1.proto

@@ -19,7 +19,7 @@ func NewExperimentalCommand(out, errout io.Writer) *cobra.Command {
 		},
 	}
 
-	cmd.AddCommand(webconsole_operator.NewWebConsoleOperatorCommand(webconsole_operator.RecommendedWebConsoleOperatorName, out, errout))
+	cmd.AddCommand(webconsole_operator.NewWebConsoleOperatorCommand(webconsole_operator.RecommendedWebConsoleOperatorName))
 
 	return cmd
 }

glide.lock

@@ -1,24 +1,14 @@
 package webconsole_operator
 
 import (
-	"fmt"
 	"io"
 
-	"github.com/golang/glog"
 	"github.com/spf13/cobra"
-	"k8s.io/kubernetes/pkg/client/leaderelectionconfig"
 
-	"k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/util/uuid"
-	"k8s.io/client-go/kubernetes"
-	v1core "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/leaderelection"
-	"k8s.io/client-go/tools/leaderelection/resourcelock"
-	"k8s.io/client-go/tools/record"
-	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
-	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
+
+	"github.com/openshift/library-go/pkg/controller/controllercmd"
+	"github.com/openshift/origin/pkg/version"
 )
 
 const (
@@ -32,69 +22,12 @@ type WebConsoleOperatorCommandOptions struct {
 var longDescription = templates.LongDesc(`
 	Install the OpenShift webconsole`)
 
-func NewWebConsoleOperatorCommand(name string, out, errout io.Writer) *cobra.Command {
-	options := &WebConsoleOperatorCommandOptions{Output: out}
-
-	cmd := &cobra.Command{
-		Use:   name,
-		Short: "Install the OpenShift webconsole",
-		Long:  longDescription,
-		RunE: func(c *cobra.Command, args []string) error {
-			kcmdutil.CheckErr(options.Validate())
-
-			return options.RunWebConsoleOperator()
-		},
-	}
+func NewWebConsoleOperatorCommand(name string) *cobra.Command {
+	cmd := controllercmd.
+		NewControllerCommandConfig("openshift-web-console-operator", version.Get(), RunWebConsoleOperator).
+		NewCommand()
+	cmd.Use = name
+	cmd.Short = "Install and operate the OpenShift webconsole"
 
 	return cmd
 }
-
-func (o *WebConsoleOperatorCommandOptions) Validate() error {
-	return nil
-}
-
-func (o *WebConsoleOperatorCommandOptions) RunWebConsoleOperator() error {
-	clientConfig, err := rest.InClusterConfig()
-	if err != nil {
-		return err
-	}
-	kubeClient, err := kubernetes.NewForConfig(clientConfig)
-	if err != nil {
-		return err
-	}
-
-	operator := &WebConsoleOperatorStarter{
-		ClientConfig: clientConfig,
-	}
-
-	eventBroadcaster := record.NewBroadcaster()
-	eventBroadcaster.StartLogging(glog.Infof)
-	eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: v1core.New(kubeClient.CoreV1().RESTClient()).Events("")})
-	eventRecorder := eventBroadcaster.NewRecorder(legacyscheme.Scheme, v1.EventSource{Component: "openshift-webconsole"})
-	rl, err := resourcelock.New(
-		resourcelock.ConfigMapsResourceLock,
-		"openshift-core-operators",
-		RecommendedWebConsoleOperatorName,
-		kubeClient.CoreV1(),
-		resourcelock.ResourceLockConfig{
-			Identity:      string(uuid.NewUUID()),
-			EventRecorder: eventRecorder,
-		})
-	if err != nil {
-		return err
-	}
-	leaderelection.RunOrDie(leaderelection.LeaderElectionConfig{
-		Lock:          rl,
-		LeaseDuration: leaderelectionconfig.DefaultLeaseDuration,
-		RenewDeadline: leaderelectionconfig.DefaultRenewDeadline,
-		RetryPeriod:   leaderelectionconfig.DefaultRetryPeriod,
-		Callbacks: leaderelection.LeaderCallbacks{
-			OnStartedLeading: operator.Run,
-			OnStoppedLeading: func() {
-				glog.Fatalf("leaderelection lost")
-			},
-		},
-	})
-
-	return fmt.Errorf("exiting")
-}

install/openshift-web-console-operator/install.yaml

@@ -6,8 +6,8 @@ import (
 
 	configv1 "github.com/openshift/api/config/v1"
 	webconsoleconfigv1 "github.com/openshift/api/webconsole/v1"
+	"github.com/openshift/library-go/pkg/operator/resource/resourcemerge"
 	webconsolev1alpha1 "github.com/openshift/origin/pkg/cmd/openshift-operators/apis/webconsole/v1alpha1"
-	"github.com/openshift/origin/pkg/cmd/openshift-operators/util/resourcemerge"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 )