wip: rewrite reconciliation loop, migrate to go modules and use grafa…

…na client

cmd/manager/main.go

@@ -7,12 +7,15 @@ import (
 	"github.com/integr8ly/grafana-operator/pkg/apis"
 	"github.com/integr8ly/grafana-operator/pkg/controller"
 	"github.com/integr8ly/grafana-operator/pkg/controller/common"
+	config2 "github.com/integr8ly/grafana-operator/pkg/controller/config"
 	"github.com/integr8ly/grafana-operator/pkg/controller/grafanadashboard"
 	"github.com/integr8ly/grafana-operator/version"
+	routev1 "github.com/openshift/api/route/v1"
 	"github.com/operator-framework/operator-sdk/pkg/k8sutil"
 	"github.com/operator-framework/operator-sdk/pkg/leader"
 	"github.com/operator-framework/operator-sdk/pkg/ready"
 	sdkVersion "github.com/operator-framework/operator-sdk/version"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	"k8s.io/client-go/rest"
 	"os"
@@ -29,7 +32,6 @@ var flagImage string
 var flagImageTag string
 var flagPluginsInitContainerImage string
 var flagPluginsInitContainerTag string
-var flagPodLabelValue string
 var flagNamespaces string
 var scanAll bool
 
@@ -46,16 +48,18 @@ func init() {
 	flagset.StringVar(&flagImageTag, "grafana-image-tag", "", "Overrides the default Grafana image tag")
 	flagset.StringVar(&flagPluginsInitContainerImage, "grafana-plugins-init-container-image", "", "Overrides the default Grafana Plugins Init Container image")
 	flagset.StringVar(&flagPluginsInitContainerTag, "grafana-plugins-init-container-tag", "", "Overrides the default Grafana Plugins Init Container tag")
-	flagset.StringVar(&flagPodLabelValue, "pod-label-value", common.PodLabelDefaultValue, "Overrides the default value of the app label")
 	flagset.StringVar(&flagNamespaces, "namespaces", "", "Namespaces to scope the interaction of the Grafana operator. Mutually exclusive with --scan-all")
 	flagset.BoolVar(&scanAll, "scan-all", false, "Scans all namespaces for dashboards")
 	flagset.Parse(os.Args[1:])
 }
 
 // Starts a separate controller for the dashboard reconciliation in the background
-func startDashboardController(ns string, cfg *rest.Config, signalHandler <-chan struct{}) {
+func startDashboardController(ns string, cfg *rest.Config, signalHandler <-chan struct{}, autodetectChannel chan schema.GroupVersionKind) {
 	// Create a new Cmd to provide shared dependencies and start components
-	dashboardMgr, err := manager.New(cfg, manager.Options{Namespace: ns})
+	dashboardMgr, err := manager.New(cfg, manager.Options{
+		MetricsBindAddress: "0",
+		Namespace:          ns,
+	})
 	if err != nil {
 		log.Error(err, "")
 		os.Exit(1)
@@ -68,7 +72,7 @@ func startDashboardController(ns string, cfg *rest.Config, signalHandler <-chan
 	}
 
 	// Use a separate manager for the dashboard controller
-	grafanadashboard.Add(dashboardMgr)
+	grafanadashboard.Add(dashboardMgr, autodetectChannel)
 
 	go func() {
 		if err := dashboardMgr.Start(signalHandler); err != nil {
@@ -115,14 +119,13 @@ func main() {
 	}
 
 	// Controller configuration
-	controllerConfig := common.GetControllerConfig()
-	controllerConfig.AddConfigItem(common.ConfigGrafanaImage, flagImage)
-	controllerConfig.AddConfigItem(common.ConfigGrafanaImageTag, flagImageTag)
-	controllerConfig.AddConfigItem(common.ConfigPluginsInitContainerImage, flagPluginsInitContainerImage)
-	controllerConfig.AddConfigItem(common.ConfigPluginsInitContainerTag, flagPluginsInitContainerTag)
-	controllerConfig.AddConfigItem(common.ConfigPodLabelValue, flagPodLabelValue)
-	controllerConfig.AddConfigItem(common.ConfigOperatorNamespace, namespace)
-	controllerConfig.AddConfigItem(common.ConfigDashboardLabelSelector, "")
+	controllerConfig := config2.GetControllerConfig()
+	controllerConfig.AddConfigItem(config2.ConfigGrafanaImage, flagImage)
+	controllerConfig.AddConfigItem(config2.ConfigGrafanaImageTag, flagImageTag)
+	controllerConfig.AddConfigItem(config2.ConfigPluginsInitContainerImage, flagPluginsInitContainerImage)
+	controllerConfig.AddConfigItem(config2.ConfigPluginsInitContainerTag, flagPluginsInitContainerTag)
+	controllerConfig.AddConfigItem(config2.ConfigOperatorNamespace, namespace)
+	controllerConfig.AddConfigItem(config2.ConfigDashboardLabelSelector, "")
 
 	// Get the namespaces to scan for dashboards
 	// It's either the same namespace as the controller's or it's all namespaces if the
@@ -169,34 +172,40 @@ func main() {
 
 	log.Info("Registering Components.")
 
+	// Starting the resource auto-detection for the grafana controller
+	autodetect, err := common.NewAutoDetect(mgr)
+	if err != nil {
+		log.Error(err, "failed to start the background process to auto-detect the operator capabilities")
+	} else {
+		autodetect.Start()
+		defer autodetect.Stop()
+	}
+
 	// Setup Scheme for all resources
 	if err := apis.AddToScheme(mgr.GetScheme()); err != nil {
 		log.Error(err, "")
 		os.Exit(1)
 	}
 
+	// Setup Scheme for OpenShift routes
+	if err := routev1.AddToScheme(mgr.GetScheme()); err != nil {
+		log.Error(err, "")
+		os.Exit(1)
+	}
+
 	// Setup all Controllers
-	if err := controller.AddToManager(mgr); err != nil {
+	if err := controller.AddToManager(mgr, autodetect.SubscriptionChannel); err != nil {
 		log.Error(err, "")
 		os.Exit(1)
 	}
 
 	log.Info("Starting the Cmd.")
 
-	// Starting the resource auto-detection for the grafana controller
-	autodetect, err := common.NewAutoDetect(mgr)
-	if err != nil {
-		log.Error(err, "failed to start the background process to auto-detect the operator capabilities")
-	} else {
-		autodetect.Start()
-		defer autodetect.Stop()
-	}
-
 	signalHandler := signals.SetupSignalHandler()
 
 	// Start one dashboard controller per watch namespace
 	for _, ns := range dashboardNamespaces {
-		startDashboardController(ns, cfg, signalHandler)
+		startDashboardController(ns, cfg, signalHandler, autodetect.SubscriptionChannel)
 	}
 
 	if err := mgr.Start(signalHandler); err != nil {

deploy/crds/Grafana.yaml

@@ -10,6 +10,8 @@ spec:
     plural: grafanas
     singular: grafana
   scope: Namespaced
+  subresources:
+    status: {}
   version: v1alpha1
   validation:
     openAPIV3Schema:
@@ -86,6 +88,15 @@ spec:
                 type:
                   type: string
                   description: Service type (NodePort, ClusterIP or LoadBalancer)
+            deployment:
+              type: object
+              properties:
+                annotations:
+                  type: object
+                  description: Additional annotations for the service
+                labels:
+                  type: object
+                  description: Additional labels for the service
             dashboardLabelSelectors:
               type: array
               items:

deploy/crds/GrafanaDashboard.yaml

@@ -10,17 +10,12 @@ spec:
     plural: grafanadashboards
     singular: grafanadashboard
   scope: Namespaced
+  subresources:
+    status: {}
   version: v1alpha1
   validation:
     openAPIV3Schema:
       properties:
-        status:
-          properties:
-            messages:
-              type: array
-              items:
-                description: Dashboard Status Message
-                type: object
         spec:
           properties:
             name:

deploy/crds/GrafanaDataSource.yaml

@@ -10,6 +10,8 @@ spec:
     plural: grafanadatasources
     singular: grafanadatasource
   scope: Namespaced
+  subresources:
+    status: {}
   version: v1alpha1
   validation:
     openAPIV3Schema:
@@ -31,5 +33,3 @@ spec:
               items:
                 description: Grafana Datasource Object
                 type: object
-        status:
-          type: object

go.mod

@@ -0,0 +1,54 @@
+module github.com/integr8ly/grafana-operator
+
+go 1.13
+
+require (
+	cloud.google.com/go v0.35.1 // indirect
+	github.com/blang/semver v3.5.1+incompatible
+	github.com/ghodss/yaml v1.0.1-0.20180820084758-c7ce16629ff4
+	github.com/go-ini/ini v1.42.0
+	github.com/go-logr/logr v0.1.0
+	github.com/go-openapi/spec v0.19.0
+	github.com/go-openapi/swag v0.18.0 // indirect
+	github.com/google/uuid v1.1.0 // indirect
+	github.com/grafana-tools/sdk v0.0.0-20191103185352-c717bbeb00ed
+	github.com/openshift/api v3.9.1-0.20190424152011-77b8897ec79a+incompatible
+	github.com/operator-framework/operator-sdk v0.12.0
+	github.com/prometheus/client_golang v1.1.0 // indirect
+	github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect
+	github.com/prometheus/common v0.7.0 // indirect
+	github.com/prometheus/procfs v0.0.7 // indirect
+	golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 // indirect
+	gopkg.in/ini.v1 v1.51.0 // indirect
+	k8s.io/api v0.0.0
+	k8s.io/apimachinery v0.0.0
+	k8s.io/client-go v11.0.0+incompatible
+	k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d
+	sigs.k8s.io/controller-runtime v0.3.0
+)
+
+// Pinned to kubernetes-1.15.4
+replace (
+	k8s.io/api => k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918200908-1e17798da8c1
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918202139-0b14c719ca62
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918203125-ae665f80358a
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918202959-c340507a5d48
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20190918200425-ed2f0867c778
+	k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190817025403-3ae76f584e79
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918203248-97c07dcbb623
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918201136-c3a845f1fbb2
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918202837-c54ce30c680e
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918202429-08c8357f8e2d
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190918202713-c34a54b3ec8e
+	k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190918202550-958285cf3eef
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918203421-225f0541b3ea
+	k8s.io/metrics => k8s.io/metrics v0.0.0-20190918202012-3c1ca76f5bda
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918201353-5cc279503896
+)
+
+// replace gopkg.in/fsnotify.v1 v1.4.7 => github.com/fsnotify/fsnotify v1.4.7