Convert Patterns Operator config functions to PatternReconciler methods

Author: sector2000

cmd/main.go

@@ -29,12 +29,10 @@ import (
 	// to ensure that exec-entrypoint and run can make use of them.
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
-	"k8s.io/apimachinery/pkg/api/errors"
 	k8sruntime "k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	ctrl "sigs.k8s.io/controller-runtime"
-	crclient "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
@@ -46,9 +44,6 @@ import (
 	"github.com/hybrid-cloud-patterns/patterns-operator/version"
 	consolev1 "github.com/openshift/api/console/v1"
 	operatorv1 "github.com/openshift/api/operator/v1"
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes"
 	//+kubebuilder:scaffold:imports
 )
 
@@ -85,12 +80,6 @@ func main() {
 
 	setupLog.Info("detected operator namespace", "namespace", controllers.DetectOperatorNamespace())
 
-	// Create initial config map for gitops
-	err := createPatternsOperatorConfigMap()
-	if err != nil {
-		setupLog.Error(err, "unable to create config map")
-	}
-
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme:                 scheme,
 		HealthProbeBindAddress: probeAddr,
@@ -162,44 +151,6 @@ func printVersion() {
 	setupLog.Info(fmt.Sprintf("Build Date: %s", version.BuildDate))
 }
 
-// Creates the patterns operator configmap
-// This will include configuration parameters that
-// will allow operator configuration
-func createPatternsOperatorConfigMap() error {
-	config, err := ctrl.GetConfig()
-	if err != nil {
-		return fmt.Errorf("failed to get config: %s", err)
-	}
-	clientset, err := kubernetes.NewForConfig(config)
-	if err != nil {
-		return fmt.Errorf("failed to call NewForConfig: %s", err)
-	}
-
-	configMap := corev1.ConfigMap{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "ConfigMap",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      controllers.OperatorConfigMap,
-			Namespace: controllers.DetectOperatorNamespace(),
-		},
-	}
-
-	_, err = clientset.CoreV1().ConfigMaps(controllers.DetectOperatorNamespace()).Get(context.Background(), controllers.OperatorConfigMap, metav1.GetOptions{})
-	if err != nil && errors.IsNotFound(err) {
-		// if the configmap does not exist we create an empty one
-		_, err = clientset.CoreV1().ConfigMaps(controllers.DetectOperatorNamespace()).Create(context.Background(), &configMap, metav1.CreateOptions{})
-		if err != nil {
-			return err
-		}
-	} else {
-		// if we had an error that is not IsNotFound we need to return it
-		return err
-	}
-	return nil
-}
-
 func registerComponentOrExit(mgr manager.Manager, f func(*k8sruntime.Scheme) error) {
 	// Setup Scheme for all resources
 	if err := f(mgr.GetScheme()); err != nil {

internal/controller/pattern_controller.go

@@ -34,6 +34,7 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/hybrid-cloud-patterns/patterns-operator/internal/controller/console"
 
+	corev1 "k8s.io/api/core/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -149,14 +150,19 @@ func (r *PatternReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		return reconcile.Result{}, err
 	}
 
+	// Set Patterns Operator config to defaults
 	patternsOperatorConfig := DefaultPatternsOperatorConfig
 
-	configCM, err := GetPatternsOperatorConfigMap()
-	// If we hit an error that is not related to the configmap not existing bubble it up
-	if err != nil && !kerrors.IsNotFound(err) {
+	// We try to get the configuration ConfigMap. The method getPatternsOperatorConfigMap returns nil, nil if the ConfigMap doesn't exist
+	configCM, err := r.getPatternsOperatorConfigMap()
+	if err != nil {
 		return r.actionPerformed(instance, "failed to get the configuration ConfigMap", err)
 	}
-	if configCM != nil {
+	if configCM == nil { // If the ConfigMap doesn't exist, we create it
+		if err = r.createPatternsOperatorConfigMap(instance); err != nil {
+			return r.actionPerformed(instance, "failed to create the configuration ConfigMap", err)
+		}
+	} else { // If the ConfigMap exists, we get the configuration from Data
 		patternsOperatorConfig = configCM.Data
 	}
 
@@ -398,8 +404,8 @@ func (r *PatternReconciler) reconcileGitOpsSubscription(qualifiedInstance *api.P
 		if err := controllerutil.RemoveOwnerReference(qualifiedInstance, currentSub, r.Scheme); err == nil {
 			changed = true
 		}
-		operatorConfigMap, cmErr := GetPatternsOperatorConfigMap()
-		if cmErr == nil {
+		operatorConfigMap, cmErr := r.getPatternsOperatorConfigMap()
+		if cmErr == nil && operatorConfigMap != nil {
 			if err := controllerutil.RemoveOwnerReference(operatorConfigMap, currentSub, r.Scheme); err == nil {
 				changed = true
 			}
@@ -1325,6 +1331,35 @@ func (r *PatternReconciler) getLocalGit(p *api.Pattern) (string, error) {
 	return "", nil
 }
 
+func (r *PatternReconciler) createPatternsOperatorConfigMap(p *api.Pattern) error {
+	configMap := corev1.ConfigMap{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "ConfigMap",
+			APIVersion: "v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      OperatorConfigMap,
+			Namespace: DetectOperatorNamespace(),
+		},
+	}
+	if _, err := r.fullClient.CoreV1().ConfigMaps(DetectOperatorNamespace()).Create(context.Background(), &configMap, metav1.CreateOptions{}); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (r *PatternReconciler) getPatternsOperatorConfigMap() (*corev1.ConfigMap, error) {
+	cm, err := r.fullClient.CoreV1().ConfigMaps(DetectOperatorNamespace()).Get(context.Background(), OperatorConfigMap, metav1.GetOptions{})
+	if err != nil {
+		if kerrors.IsNotFound(err) {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return cm, nil
+}
+
 func DropLocalGitPaths() error {
 	// If there is a completely new local folder, let's remove the old one
 	// User changed the target repo

internal/controller/utils.go

@@ -41,7 +41,6 @@ import (
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
-	ctrl "sigs.k8s.io/controller-runtime"
 
 	configv1 "github.com/openshift/api/config/v1"
 )
@@ -449,17 +448,3 @@ func IntOrZero(secret map[string][]byte, key string) (int64, error) {
 
 	return strconv.ParseInt(string(val), 10, 64)
 }
-
-// Gets the configmap for the Patterns Operator. (Used as an owner reference for the operator itself.)
-func GetPatternsOperatorConfigMap() (*corev1.ConfigMap, error) {
-	config, err := ctrl.GetConfig()
-	if err != nil {
-		return nil, fmt.Errorf("failed to get config: %s", err)
-	}
-	clientset, err := kubernetes.NewForConfig(config)
-	if err != nil {
-		return nil, fmt.Errorf("failed to call NewForConfig: %s", err)
-	}
-
-	return clientset.CoreV1().ConfigMaps(DetectOperatorNamespace()).Get(context.Background(), OperatorConfigMap, metav1.GetOptions{})
-}