Implement operator logic

cmd/manager/main.go

@@ -9,25 +9,30 @@ import (
 
 	"github.com/openshift-kni/performance-addon-operators/pkg/apis"
 	"github.com/openshift-kni/performance-addon-operators/pkg/controller"
+	"github.com/openshift-kni/performance-addon-operators/pkg/controller/performanceprofile/components"
 	"github.com/openshift-kni/performance-addon-operators/version"
 
+	configv1 "github.com/openshift/api/config/v1"
+	tunedv1 "github.com/openshift/cluster-node-tuning-operator/pkg/apis/tuned/v1"
+	mcov1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
 	"github.com/operator-framework/operator-sdk/pkg/k8sutil"
 	kubemetrics "github.com/operator-framework/operator-sdk/pkg/kube-metrics"
-	"github.com/operator-framework/operator-sdk/pkg/log/zap"
 	"github.com/operator-framework/operator-sdk/pkg/metrics"
 	"github.com/operator-framework/operator-sdk/pkg/restmapper"
 	sdkVersion "github.com/operator-framework/operator-sdk/version"
 	"github.com/spf13/pflag"
 
 	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
+	"k8s.io/klog"
 
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	"k8s.io/client-go/rest"
 
+	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
 )
@@ -38,53 +43,50 @@ var (
 	metricsPort         int32 = 8383
 	operatorMetricsPort int32 = 8686
 )
-var log = logf.Log.WithName("cmd")
 
 func printVersion() {
-	log.Info(fmt.Sprintf("Operator Version: %s", version.Version))
-	log.Info(fmt.Sprintf("Go Version: %s", runtime.Version()))
-	log.Info(fmt.Sprintf("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH))
-	log.Info(fmt.Sprintf("Version of operator-sdk: %v", sdkVersion.Version))
+	klog.Infof("Operator Version: %s", version.Version)
+	klog.Infof("Go Version: %s", runtime.Version())
+	klog.Infof("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH)
+	klog.Infof("Version of operator-sdk: %v", sdkVersion.Version)
 }
 
 func main() {
-	// Add the zap logger flag set to the CLI. The flag set must
-	// be added before calling pflag.Parse().
-	pflag.CommandLine.AddFlagSet(zap.FlagSet())
+	// Add klog flags
+	klog.InitFlags(nil)
 
 	// Add flags registered by imported packages (e.g. glog and
 	// controller-runtime)
 	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
 
 	pflag.Parse()
 
-	// Use a zap logr.Logger implementation. If none of the zap
-	// flags are configured (or if the zap flag set is not being
-	// used), this defaults to a production zap logger.
-	//
-	// The logger instantiated here can be changed to any logger
-	// implementing the logr.Logger interface. This logger will
-	// be propagated through the whole operator, generating
-	// uniform and structured logs.
-	logf.SetLogger(zap.Logger())
-
 	printVersion()
 
 	namespace, err := k8sutil.GetWatchNamespace()
 	if err != nil {
-		log.Error(err, "Failed to get watch namespace")
+		klog.Error(err.Error())
 		os.Exit(1)
 	}
 
+	// we have two namespaces that we need to watch
+	// 1. tuned namespace - for tuned resources
+	// 2. None namespace - for cluster wide resources
+	namespaces := []string{
+		components.NamespaceNodeTuningOperator,
+		metav1.NamespaceNone,
+	}
+
 	// Get a config to talk to the apiserver
 	cfg, err := config.GetConfig()
 	if err != nil {
-		log.Error(err, "")
+		klog.Error(err.Error())
 		os.Exit(1)
 	}
 
 	// Create a new Cmd to provide shared dependencies and start components
 	mgr, err := manager.New(cfg, manager.Options{
+		NewCache:                cache.MultiNamespacedCacheBuilder(namespaces),
 		LeaderElection:          true,
 		LeaderElectionID:        "performance-addon-operators",
 		LeaderElectionNamespace: namespace,
@@ -93,26 +95,41 @@ func main() {
 		MetricsBindAddress:      fmt.Sprintf("%s:%d", metricsHost, metricsPort),
 	})
 	if err != nil {
-		log.Error(err, "")
+		klog.Error(err.Error())
 		os.Exit(1)
 	}
 
-	log.Info("Registering Components.")
+	klog.Info("Registering Components.")
 
 	// Setup Scheme for all resources
 	if err := apis.AddToScheme(mgr.GetScheme()); err != nil {
-		log.Error(err, "")
+		klog.Error(err.Error())
+		os.Exit(1)
+	}
+
+	if err := configv1.AddToScheme(mgr.GetScheme()); err != nil {
+		klog.Error(err.Error())
+		os.Exit(1)
+	}
+
+	if err := mcov1.AddToScheme(mgr.GetScheme()); err != nil {
+		klog.Error(err.Error())
+		os.Exit(1)
+	}
+
+	if err := tunedv1.AddToScheme(mgr.GetScheme()); err != nil {
+		klog.Error(err.Error())
 		os.Exit(1)
 	}
 
 	// Setup all Controllers
 	if err := controller.AddToManager(mgr); err != nil {
-		log.Error(err, "")
+		klog.Error(err.Error())
 		os.Exit(1)
 	}
 
 	if err = serveCRMetrics(cfg); err != nil {
-		log.Info("Could not generate and serve custom resource metrics", "error", err.Error())
+		klog.Errorf("Could not generate and serve custom resource metrics: %v", err)
 	}
 
 	// Add to the below struct any other metrics ports you want to expose.
@@ -123,27 +140,27 @@ func main() {
 	// Create Service object to expose the metrics port(s).
 	service, err := metrics.CreateMetricsService(context.TODO(), cfg, servicePorts)
 	if err != nil {
-		log.Info("Could not create metrics Service", "error", err.Error())
+		klog.Errorf("Could not create metrics Service: %v", err)
 	}
 
 	// CreateServiceMonitors will automatically create the prometheus-operator ServiceMonitor resources
 	// necessary to configure Prometheus to scrape metrics from this operator.
 	services := []*v1.Service{service}
 	_, err = metrics.CreateServiceMonitors(cfg, namespace, services)
 	if err != nil {
-		log.Info("Could not create ServiceMonitor object", "error", err.Error())
+		klog.Errorf("Could not create ServiceMonitor object: %v", err)
 		// If this operator is deployed to a cluster without the prometheus-operator running, it will return
 		// ErrServiceMonitorNotPresent, which can be used to safely skip ServiceMonitor creation.
 		if err == metrics.ErrServiceMonitorNotPresent {
-			log.Info("Install prometheus-operator in your cluster to create ServiceMonitor objects", "error", err.Error())
+			klog.Errorf("Install prometheus-operator in your cluster to create ServiceMonitor objects: %v", err)
 		}
 	}
 
-	log.Info("Starting the Cmd.")
+	klog.Info("Starting the Cmd.")
 
 	// Start the Cmd
 	if err := mgr.Start(signals.SetupSignalHandler()); err != nil {
-		log.Error(err, "Manager exited non-zero")
+		klog.Errorf("Manager exited with non-zero code: %v", err)
 		os.Exit(1)
 	}
 }
@@ -157,13 +174,9 @@ func serveCRMetrics(cfg *rest.Config) error {
 	if err != nil {
 		return err
 	}
-	// Get the namespace the operator is currently deployed in.
-	operatorNs, err := k8sutil.GetOperatorNamespace()
-	if err != nil {
-		return err
-	}
+
 	// To generate metrics in other namespaces, add the values below.
-	ns := []string{operatorNs}
+	ns := []string{metav1.NamespaceNone}
 	// Generate and serve custom resource specific metrics.
 	err = kubemetrics.GenerateAndServeCRMetrics(cfg, ns, filteredGVK, metricsHost, operatorMetricsPort)
 	if err != nil {

deploy/crds/performance.openshift.io_performanceprofiles_crd.yaml

@@ -9,7 +9,7 @@ spec:
     listKind: PerformanceProfileList
     plural: performanceprofiles
     singular: performanceprofile
-  scope: Namespaced
+  scope: Cluster
   subresources:
     status: {}
   validation:

deploy/crds/performance.openshift.io_v1alpha1_performanceprofile_cr.yaml

@@ -3,5 +3,16 @@ kind: PerformanceProfile
 metadata:
   name: example-performanceprofile
 spec:
-  # Add fields here
-  size: 3
+  cpu:
+    isolated: "2-3"
+    nonIsolated: "0"
+    reserved: "0-1"
+  hugepages:
+    defaultHugepagesSize: "1G"
+    pages:
+    - size: "1G"
+      count: 2
+  realTimeKernel:
+    repoURL: "http://download-node-02.eng.bos.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.1.1/compose/RT/x86_64/os"
+  nodeSelector:
+    node-role.kubernetes.io/performance: ""

deploy/olm-catalog/performance-addon-operators/0.0.1/performance-addon-operators.v0.0.1.clusterserviceversion.yaml

@@ -2,25 +2,84 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: ClusterServiceVersion
 metadata:
   annotations:
-    alm-examples: '[]'
+    alm-examples: |-
+      [
+        {
+          "apiVersion": "performance.openshift.io/v1alpha1",
+          "kind": "PerformanceProfile",
+          "metadata": {
+            "name": "example-performanceprofile"
+          },
+          "spec": {
+            "cpu": {
+              "isolated": "2-3",
+              "nonIsolated": "0",
+              "reserved": "0-1"
+            },
+            "hugepages": {
+              "defaultHugepagesSize": "1G",
+              "pages": [
+                {
+                  "count": 2,
+                  "size": "1G"
+                }
+              ]
+            },
+            "nodeSelector": {
+              "node-role.kubernetes.io/performance": ""
+            },
+            "realTimeKernel": {
+              "repoURL": "http://download-node-02.eng.bos.redhat.com/rhel-8/nightly/RHEL-8/latest-RHEL-8.1.1/compose/RT/x86_64/os"
+            }
+          }
+        }
+      ]
     capabilities: Basic Install
   name: performance-addon-operators.v0.0.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
     owned:
-    - description: CPUPerformanceProfile is the Schema for the cpuperformanceprofiles
-        API
-      displayName: placeholder
-      kind: CPUPerformanceProfile
-      name: cpuperformanceprofiles.performance.openshift.io
+    - description: PerformanceProfile is the Schema for the performanceprofiles API.
+      kind: PerformanceProfile
+      name: performanceprofiles.performance.openshift.io
       version: v1alpha1
       displayName: placeholder
   description: Placeholder description
   displayName: Performance Addon Operators
   install:
     spec:
+      clusterPermissions:
+      - rules:
+        - apiGroups:
+          - performance.openshift.io
+          resources:
+          - performanceprofiles
+          - performanceprofiles/finalizers
+          verbs:
+          - '*'
+        - apiGroups:
+          - config.openshift.io
+          resources:
+          - featuregates
+          verbs:
+          - '*'
+        - apiGroups:
+          - machineconfiguration.openshift.io
+          resources:
+          - machineconfigs
+          - machineconfigpools
+          - kubeletconfigs
+          verbs:
+          - '*'
+        - apiGroups:
+          - tuned.openshift.io
+          resources:
+          - tuneds
+          verbs:
+          - '*'
+        serviceAccountName: performance-operator
       deployments:
       - name: performance-operator
         spec:
@@ -61,11 +120,8 @@ spec:
           - pods
           - services
           - services/finalizers
-          - endpoints
-          - persistentvolumeclaims
-          - events
           - configmaps
-          - secrets
+          - events
           verbs:
           - '*'
         - apiGroups:
@@ -77,13 +133,6 @@ spec:
           - statefulsets
           verbs:
           - '*'
-        - apiGroups:
-          - monitoring.coreos.com
-          resources:
-          - servicemonitors
-          verbs:
-          - get
-          - create
         - apiGroups:
           - apps
           resourceNames:
@@ -93,31 +142,11 @@ spec:
           verbs:
           - update
         - apiGroups:
-          - ""
-          resources:
-          - pods
-          verbs:
-          - get
-        - apiGroups:
-          - apps
+          - monitoring.coreos.com
           resources:
-          - replicasets
-          - deployments
+          - servicemonitors
           verbs:
-          - get
-        - apiGroups:
-          - performance.openshift.io
-          resources:
           - '*'
-          - performanceprofiles
-          verbs:
-          - create
-          - delete
-          - get
-          - list
-          - patch
-          - update
-          - watch
         serviceAccountName: performance-operator
     strategy: deployment
   installModes: