refactor

Author: PatrickLaabs

Makefile

@@ -231,7 +231,7 @@ CAPI_KIND_CLUSTER_NAME ?= capi-test
 # It is set by Prow GIT_TAG, a git-based tag of the form vYYYYMMDD-hash, e.g., v20210120-v0.3.10-308-gc61521971
 
 # Next release is: v1.0.0-preview
-TAG ?= v1.0.0-preview.47
+TAG ?= v1.0.0-preview.71
 ARCH ?= $(shell go env GOARCH)
 ALL_ARCH = amd64 arm arm64
 

config/default/manager_image_patch.yaml

@@ -7,5 +7,5 @@ spec:
   template:
     spec:
       containers:
-      - image: ghcr.io/patricklaabs/cluster-api-addon-provider-cdk8s/cluster-api-cdk8s-controller:v1.0.0-preview.47
+      - image: ghcr.io/patricklaabs/cluster-api-addon-provider-cdk8s/cluster-api-cdk8s-controller:v1.0.0-preview.71
         name: manager

config/default/manager_image_patch.yaml-e

@@ -7,5 +7,5 @@ spec:
   template:
     spec:
       containers:
-      - image: ghcr.io/patricklaabs/cluster-api-addon-provider-cdk8s/cluster-api-cdk8s-controller:v1.0.0-preview.47
+      - image: ghcr.io/patricklaabs/cluster-api-addon-provider-cdk8s/cluster-api-cdk8s-controller:v1.0.0-preview.71
         name: manager

controllers/cdk8sappproxy/applier/applier.go

@@ -18,128 +18,20 @@ package cdk8sappproxy
 
 import (
 	"context"
-	"strings"
-
 	addonsv1alpha1 "github.com/PatrickLaabs/cluster-api-addon-provider-cdk8s/api/v1alpha1"
 	"github.com/pkg/errors"
-	corev1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/client-go/dynamic"
-	"k8s.io/client-go/tools/clientcmd"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	"sigs.k8s.io/cluster-api/util/conditions"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
-func (r *Reconciler) checkIfResourceExists(ctx context.Context, dynClient dynamic.Interface, gvr schema.GroupVersionResource, namespace string, name string) (bool, error) {
-	resourceGetter := dynClient.Resource(gvr)
-	if namespace != "" {
-		_, err := resourceGetter.Namespace(namespace).Get(ctx, name, metav1.GetOptions{})
-		if err != nil {
-			if apierrors.IsNotFound(err) {
-				return false, nil
-			}
-
-			return false, errors.Wrapf(err, "failed to get namespaced resource %s/%s with GVR %s", namespace, name, gvr.String())
-		}
-	} else {
-		_, err := resourceGetter.Get(ctx, name, metav1.GetOptions{})
-		if err != nil {
-			if apierrors.IsNotFound(err) {
-				return false, nil
-			}
-
-			return false, errors.Wrapf(err, "failed to get cluster-scoped resource %s with GVR %s", name, gvr.String())
-		}
-	}
-
-	return true, nil
-}
-
-func (r *Reconciler) getDynamicClientForCluster(ctx context.Context, secretNamespace, clusterName string) (dynamicClient dynamic.Interface, err error) {
-	logger := log.FromContext(ctx).WithValues("secretNamespace", secretNamespace, "clusterName", clusterName)
-	kubeconfigSecretName := clusterName + "-kubeconfig"
-
-	kubeconfigSecret := &corev1.Secret{}
-	if err = r.Get(ctx, client.ObjectKey{Namespace: secretNamespace, Name: kubeconfigSecretName}, kubeconfigSecret); err != nil {
-		logger.Error(err, "Failed to get Kubeconfig secret")
-
-		return nil, errors.Wrapf(err, "failed to get kubeconfig secret %s/%s", secretNamespace, kubeconfigSecretName)
-	}
-	kubeconfigData, ok := kubeconfigSecret.Data["value"]
-	if !ok || len(kubeconfigData) == 0 {
-		newErr := errors.Errorf("kubeconfig secret %s/%s does not contain 'value' data", secretNamespace, kubeconfigSecretName)
-		logger.Error(newErr, "Invalid Kubeconfig secret")
-
-		return nil, newErr
-	}
-	logger.Info("Successfully retrieved Kubeconfig data")
-	restConfig, err := clientcmd.RESTConfigFromKubeConfig(kubeconfigData)
-	if err != nil {
-		logger.Error(err, "Failed to create REST config from Kubeconfig")
-
-		return dynamicClient, errors.Wrapf(err, "failed to create REST config from kubeconfig for cluster %s", clusterName)
-	}
-	dynamicClient, err = dynamic.NewForConfig(restConfig)
-	if err != nil {
-		logger.Error(err, "Failed to create dynamic client")
-
-		return dynamicClient, errors.Wrapf(err, "failed to create dynamic client for cluster %s", clusterName)
-	}
-	logger.Info("Successfully created dynamic client")
-
-	return dynamicClient, err
-}
-
-// Consolidated error handling.
-func (r *Reconciler) updateStatusWithError(ctx context.Context, cdk8sAppProxy *addonsv1alpha1.Cdk8sAppProxy, reason, message string, err error, removeFinalizer bool) error {
-	logger := log.FromContext(ctx).WithValues("cdk8sappproxy", types.NamespacedName{Name: cdk8sAppProxy.Name, Namespace: cdk8sAppProxy.Namespace})
-
-	if err != nil {
-		logger.Error(err, message, "reason", reason)
-		conditions.MarkFalse(cdk8sAppProxy, addonsv1alpha1.DeploymentProgressingCondition, reason, clusterv1.ConditionSeverityError, "%s: %v", message, err)
-	} else {
-		logger.Info(message, "reason", reason)
-	}
-
-	if removeFinalizer {
-		controllerutil.RemoveFinalizer(cdk8sAppProxy, Finalizer)
-		if updateErr := r.Update(ctx, cdk8sAppProxy); updateErr != nil {
-			logger.Error(updateErr, "Failed to remove finalizer after error")
-
-			return updateErr
-		}
-		logger.Info("Removed finalizer after error/condition")
-	} else {
-		if statusUpdateErr := r.Status().Update(ctx, cdk8sAppProxy); statusUpdateErr != nil {
-			logger.Error(statusUpdateErr, "Failed to update status after error")
-		}
-	}
-
-	return err
-}
-
-// TODO: This is a naive pluralization and might not work for all kinds.
-// A more robust solution would use discovery client or a predefined map.
-func getPluralFromKind(kind string) string {
-	lowerKind := strings.ToLower(kind)
-	if strings.HasSuffix(lowerKind, "s") {
-		return lowerKind + "es"
-	}
-	if strings.HasSuffix(lowerKind, "y") {
-		return strings.TrimSuffix(lowerKind, "y") + "ies"
-	}
-
-	return lowerKind + "s"
-}
+const (
+	Finalizer = "cdk8sappproxy.addons.cluster.x-k8s.io/finalizer"
+)
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {