Update submodule, and use new linter version (#19)

robertgraeff · web-flow · commit 26438f03f578 · 2025-05-20T08:06:22.000+02:00
* update submodule to commit 80bf

* lint config

* fix lint findings
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,42 +1,46 @@
+version: "2"
 run:
-  timeout: 5m
   allow-parallel-runners: true
-
-issues:
-  # don't skip warning about doc comments
-  # don't exclude the default set of lint
-  exclude-use-default: false
-  # restore some of the defaults
-  # (fill in the rest as needed)
-  exclude-rules:
-    - path: "internal/*"
-      linters:
-        - dupl
 linters:
-  disable-all: true
+  default: none
   enable:
+    - copyloopvar
     - dupl
     - errcheck
-    - copyloopvar
     - ginkgolinter
     - goconst
     - gocyclo
-    - gofmt
-    - goimports
-    - gosimple
     - govet
     - ineffassign
     - misspell
     - nakedret
     - prealloc
     - revive
     - staticcheck
-    - typecheck
     - unconvert
     - unparam
     - unused
-
-linters-settings:
-  revive:
+  settings:
+    revive:
+      rules:
+        - name: comment-spacings
+  exclusions:
+    generated: lax
     rules:
-      - name: comment-spacings
+      - linters:
+          - dupl
+        path: internal/*
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/Taskfile.yaml b/Taskfile.yaml
@@ -14,4 +14,3 @@ includes:
       REPO_URL: 'https://github.com/openmcp-project/openmcp-operator'
       GENERATE_DOCS_INDEX: "true"
       CHART_COMPONENTS: "[]"
-      LINTER_VERSION: "v1.64.4"
diff --git a/hack/common b/hack/common
@@ -1 +1 @@
-Subproject commit 3fc4627445a29eec865f52a151ab5e17b570a2f6
+Subproject commit 80bfca5ddf3186e97df6b7d1acdea035f6ba4632
diff --git a/internal/controllers/provider/controller.go b/internal/controllers/provider/controller.go
@@ -40,7 +40,7 @@ type ProviderReconciler struct {
 }
 
 func (r *ProviderReconciler) ControllerName() string {
-	return strings.ToLower(r.GroupVersionKind.Kind)
+	return strings.ToLower(r.Kind)
 }
 
 func (r *ProviderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res ctrl.Result, err error) {
@@ -78,7 +78,7 @@ func (r *ProviderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (r
 // Therefore, the ProviderReconciler watches also jobs. The present method handles the job events and creates a reconcile request.
 func (r *ProviderReconciler) HandleJob(_ context.Context, job client.Object) []reconcile.Request {
 	providerKind, found := job.GetLabels()[install.ProviderKindLabel]
-	if !found || providerKind != r.GroupVersionKind.Kind {
+	if !found || providerKind != r.Kind {
 		return nil
 	}
 
diff --git a/internal/controllers/provider/install/installer.go b/internal/controllers/provider/install/installer.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/openmcp-project/controller-utils/pkg/logging"
 	"github.com/openmcp-project/controller-utils/pkg/readiness"
-	. "github.com/openmcp-project/controller-utils/pkg/resources"
+	"github.com/openmcp-project/controller-utils/pkg/resources"
 	v1 "k8s.io/api/batch/v1"
 	core "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -38,19 +38,19 @@ func (a *Installer) InstallInitJob(ctx context.Context) (completed bool, err err
 
 	values := NewValues(a.Provider, a.DeploymentSpec, a.Environment)
 
-	if err := CreateOrUpdateResource(ctx, a.PlatformClient, NewNamespaceMutator(values.Namespace(), nil, nil)); err != nil {
+	if err := resources.CreateOrUpdateResource(ctx, a.PlatformClient, resources.NewNamespaceMutator(values.Namespace(), nil, nil)); err != nil {
 		return false, err
 	}
 
-	if err = CreateOrUpdateResource(ctx, a.PlatformClient, newInitServiceAccountMutator(values)); err != nil {
+	if err = resources.CreateOrUpdateResource(ctx, a.PlatformClient, newInitServiceAccountMutator(values)); err != nil {
 		return false, err
 	}
 
-	if err = CreateOrUpdateResource(ctx, a.PlatformClient, newInitClusterRoleMutator(values)); err != nil {
+	if err = resources.CreateOrUpdateResource(ctx, a.PlatformClient, newInitClusterRoleMutator(values)); err != nil {
 		return false, err
 	}
 
-	if err = CreateOrUpdateResource(ctx, a.PlatformClient, newInitClusterRoleBindingMutator(values)); err != nil {
+	if err = resources.CreateOrUpdateResource(ctx, a.PlatformClient, newInitClusterRoleBindingMutator(values)); err != nil {
 		return false, err
 	}
 
@@ -61,7 +61,7 @@ func (a *Installer) InstallInitJob(ctx context.Context) (completed bool, err err
 	})
 	var job *v1.Job
 	found := true
-	job, err = GetResource(ctx, a.PlatformClient, j)
+	job, err = resources.GetResource(ctx, a.PlatformClient, j)
 	if err != nil {
 		if apierrors.IsNotFound(err) {
 			found = false
@@ -72,7 +72,7 @@ func (a *Installer) InstallInitJob(ctx context.Context) (completed bool, err err
 
 	if !found {
 		// Job does not exist, create it
-		if err := CreateOrUpdateResource(ctx, a.PlatformClient, j); err != nil {
+		if err := resources.CreateOrUpdateResource(ctx, a.PlatformClient, j); err != nil {
 			return false, fmt.Errorf("failed to create job %s/%s: %w", values.Namespace(), a.Provider.GetName(), err)
 		}
 		return false, nil
@@ -83,10 +83,10 @@ func (a *Installer) InstallInitJob(ctx context.Context) (completed bool, err err
 			return false, fmt.Errorf("failed to cleanup job pods %s/%s: %w", values.Namespace(), a.Provider.GetName(), err)
 		}
 
-		if err := DeleteResource(ctx, a.PlatformClient, j); err != nil {
+		if err := resources.DeleteResource(ctx, a.PlatformClient, j); err != nil {
 			return false, fmt.Errorf("failed to delete job %s/%s: %w", values.Namespace(), a.Provider.GetName(), err)
 		}
-		if err := CreateOrUpdateResource(ctx, a.PlatformClient, j); err != nil {
+		if err := resources.CreateOrUpdateResource(ctx, a.PlatformClient, j); err != nil {
 			return false, fmt.Errorf("failed to re-create job %s/%s: %w", values.Namespace(), a.Provider.GetName(), err)
 		}
 		return false, nil
@@ -101,15 +101,15 @@ func (a *Installer) InstallProvider(ctx context.Context) error {
 
 	values := NewValues(a.Provider, a.DeploymentSpec, a.Environment)
 
-	if err := CreateOrUpdateResource(ctx, a.PlatformClient, newProviderServiceAccountMutator(values)); err != nil {
+	if err := resources.CreateOrUpdateResource(ctx, a.PlatformClient, newProviderServiceAccountMutator(values)); err != nil {
 		return err
 	}
 
-	if err := CreateOrUpdateResource(ctx, a.PlatformClient, newProviderClusterRoleBindingMutator(values)); err != nil {
+	if err := resources.CreateOrUpdateResource(ctx, a.PlatformClient, newProviderClusterRoleBindingMutator(values)); err != nil {
 		return err
 	}
 
-	if err := CreateOrUpdateResource(ctx, a.PlatformClient, newDeploymentMutator(values)); err != nil {
+	if err := resources.CreateOrUpdateResource(ctx, a.PlatformClient, newDeploymentMutator(values)); err != nil {
 		return err
 	}
 
@@ -119,7 +119,7 @@ func (a *Installer) InstallProvider(ctx context.Context) error {
 func (a *Installer) CheckProviderReadiness(ctx context.Context) readiness.CheckResult {
 	values := NewValues(a.Provider, a.DeploymentSpec, a.Environment)
 
-	depl, err := GetResource(ctx, a.PlatformClient, newDeploymentMutator(values))
+	depl, err := resources.GetResource(ctx, a.PlatformClient, newDeploymentMutator(values))
 	if err != nil {
 		return readiness.NewFailedResult(err)
 	}
@@ -131,31 +131,31 @@ func (a *Installer) UninstallProvider(ctx context.Context) (deleted bool, err er
 
 	values := NewValues(a.Provider, a.DeploymentSpec, a.Environment)
 
-	if err := DeleteResource(ctx, a.PlatformClient, newDeploymentMutator(values)); err != nil {
+	if err := resources.DeleteResource(ctx, a.PlatformClient, newDeploymentMutator(values)); err != nil {
 		return false, err
 	}
 
-	if err := DeleteResource(ctx, a.PlatformClient, newProviderClusterRoleBindingMutator(values)); err != nil {
+	if err := resources.DeleteResource(ctx, a.PlatformClient, newProviderClusterRoleBindingMutator(values)); err != nil {
 		return false, err
 	}
 
-	if err := DeleteResource(ctx, a.PlatformClient, newProviderServiceAccountMutator(values)); err != nil {
+	if err := resources.DeleteResource(ctx, a.PlatformClient, newProviderServiceAccountMutator(values)); err != nil {
 		return false, err
 	}
 
-	if err := DeleteResource(ctx, a.PlatformClient, newJobMutator(values, a.DeploymentSpec, nil)); err != nil {
+	if err := resources.DeleteResource(ctx, a.PlatformClient, newJobMutator(values, a.DeploymentSpec, nil)); err != nil {
 		return false, err
 	}
 
-	if err := DeleteResource(ctx, a.PlatformClient, newInitClusterRoleBindingMutator(values)); err != nil {
+	if err := resources.DeleteResource(ctx, a.PlatformClient, newInitClusterRoleBindingMutator(values)); err != nil {
 		return false, err
 	}
 
-	if err := DeleteResource(ctx, a.PlatformClient, newInitClusterRoleMutator(values)); err != nil {
+	if err := resources.DeleteResource(ctx, a.PlatformClient, newInitClusterRoleMutator(values)); err != nil {
 		return false, err
 	}
 
-	if err := DeleteResource(ctx, a.PlatformClient, newInitServiceAccountMutator(values)); err != nil {
+	if err := resources.DeleteResource(ctx, a.PlatformClient, newInitServiceAccountMutator(values)); err != nil {
 		return false, err
 	}
 
@@ -194,7 +194,7 @@ func (a *Installer) isJobFailed(job *v1.Job) bool {
 }
 
 func (a *Installer) isGenerationUpToDate(ctx context.Context, job *v1.Job) bool {
-	genJob := job.ObjectMeta.Annotations[ProviderGenerationLabel]
+	genJob := job.Annotations[ProviderGenerationLabel]
 	if genJob == "" {
 		return false
 	}
diff --git a/internal/controllers/scheduler/controller.go b/internal/controllers/scheduler/controller.go
@@ -81,7 +81,7 @@ func (r *ClusterScheduler) reconcile(ctx context.Context, log logging.Logger, re
 			log.Info("Resource not found")
 			return ReconcileResult{}
 		}
-		return ReconcileResult{ReconcileError: errutils.WithReason(fmt.Errorf("unable to get resource '%s' from cluster: %w", req.NamespacedName.String(), err), cconst.ReasonPlatformClusterInteractionProblem)}
+		return ReconcileResult{ReconcileError: errutils.WithReason(fmt.Errorf("unable to get resource '%s' from cluster: %w", req.String(), err), cconst.ReasonPlatformClusterInteractionProblem)}
 	}
 
 	// handle operation annotation
@@ -125,7 +125,7 @@ func (r *ClusterScheduler) handleCreateOrUpdate(ctx context.Context, req reconci
 	if controllerutil.AddFinalizer(cr, clustersv1alpha1.ClusterRequestFinalizer) {
 		log.Info("Adding finalizer")
 		if err := r.PlatformCluster.Client().Patch(ctx, cr, client.MergeFrom(rr.OldObject)); err != nil {
-			rr.ReconcileError = errutils.WithReason(fmt.Errorf("error patching finalizer on resource '%s': %w", req.NamespacedName.String(), err), cconst.ReasonPlatformClusterInteractionProblem)
+			rr.ReconcileError = errutils.WithReason(fmt.Errorf("error patching finalizer on resource '%s': %w", req.String(), err), cconst.ReasonPlatformClusterInteractionProblem)
 			return rr
 		}
 	}
@@ -230,7 +230,7 @@ func (r *ClusterScheduler) handleCreateOrUpdate(ctx context.Context, req reconci
 		// create Cluster resource
 		if err := r.PlatformCluster.Client().Create(ctx, cluster); err != nil {
 			if apierrors.IsAlreadyExists(err) {
-				rr.ReconcileError = errutils.WithReason(fmt.Errorf("Cluster '%s/%s' already exists, this is not supposed to happen", cluster.Namespace, cluster.Name), cconst.ReasonInternalError)
+				rr.ReconcileError = errutils.WithReason(fmt.Errorf("cluster '%s/%s' already exists, this is not supposed to happen", cluster.Namespace, cluster.Name), cconst.ReasonInternalError)
 				return rr
 			}
 			rr.ReconcileError = errutils.WithReason(fmt.Errorf("error creating cluster '%s/%s': %w", cluster.Namespace, cluster.Name, err), cconst.ReasonPlatformClusterInteractionProblem)
@@ -304,7 +304,7 @@ func (r *ClusterScheduler) handleDelete(ctx context.Context, req reconcile.Reque
 	if controllerutil.RemoveFinalizer(cr, clustersv1alpha1.ClusterRequestFinalizer) {
 		log.Info("Removing finalizer")
 		if err := r.PlatformCluster.Client().Patch(ctx, cr, client.MergeFrom(rr.OldObject)); err != nil {
-			rr.ReconcileError = errutils.WithReason(fmt.Errorf("error removing finalizer from resource '%s': %w", req.NamespacedName.String(), err), cconst.ReasonPlatformClusterInteractionProblem)
+			rr.ReconcileError = errutils.WithReason(fmt.Errorf("error removing finalizer from resource '%s': %w", req.String(), err), cconst.ReasonPlatformClusterInteractionProblem)
 			return rr
 		}
 	}
diff --git a/internal/controllers/scheduler/controller_test.go b/internal/controllers/scheduler/controller_test.go
@@ -70,7 +70,7 @@ var _ = Describe("Scheduler", func() {
 			Expect(cluster.Name).To(Equal(req.Status.Cluster.Name))
 			Expect(cluster.Namespace).To(Equal(clusterNamespace))
 			Expect(cluster.Name).To(HavePrefix(fmt.Sprintf("%s-", req.Spec.Purpose)))
-			Expect(cluster.Namespace).To(Equal(sc.Config.PurposeMappings[req.Spec.Purpose].Template.ObjectMeta.Namespace))
+			Expect(cluster.Namespace).To(Equal(sc.Config.PurposeMappings[req.Spec.Purpose].Template.Namespace))
 			Expect(cluster.Spec.Tenancy).To(BeEquivalentTo(sc.Config.PurposeMappings[req.Spec.Purpose].Template.Spec.Tenancy))
 			Expect(cluster.Finalizers).To(ContainElements(req.FinalizerForCluster()))
 		})
@@ -126,7 +126,7 @@ var _ = Describe("Scheduler", func() {
 			Expect(cluster.Name).To(Equal(req.Status.Cluster.Name))
 			Expect(cluster.Namespace).To(Equal(clusterNamespace))
 			Expect(cluster.Name).To(HavePrefix(fmt.Sprintf("%s-", req.Spec.Purpose)))
-			Expect(cluster.Namespace).To(Equal(sc.Config.PurposeMappings[req.Spec.Purpose].Template.ObjectMeta.Namespace))
+			Expect(cluster.Namespace).To(Equal(sc.Config.PurposeMappings[req.Spec.Purpose].Template.Namespace))
 			Expect(cluster.Spec.Tenancy).To(BeEquivalentTo(sc.Config.PurposeMappings[req.Spec.Purpose].Template.Spec.Tenancy))
 			Expect(cluster.Finalizers).To(ContainElements(req.FinalizerForCluster()))
 		})
@@ -238,7 +238,7 @@ var _ = Describe("Scheduler", func() {
 			Expect(cluster.Name).To(Equal(requests[0].Status.Cluster.Name))
 			Expect(cluster.Namespace).To(Equal(clusterNamespace))
 			Expect(cluster.Name).To(Equal(requests[0].Spec.Purpose))
-			Expect(cluster.Namespace).To(Equal(sc.Config.PurposeMappings[requests[0].Spec.Purpose].Template.ObjectMeta.Namespace))
+			Expect(cluster.Namespace).To(Equal(sc.Config.PurposeMappings[requests[0].Spec.Purpose].Template.Namespace))
 			Expect(cluster.Spec.Tenancy).To(BeEquivalentTo(clustersv1alpha1.TENANCY_SHARED))
 			Expect(cluster.Finalizers).To(ContainElements(requests[0].FinalizerForCluster()))
 		})

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ type ProviderReconciler struct {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`func (r *ProviderReconciler) ControllerName() string {`
`43`		`- return strings.ToLower(r.GroupVersionKind.Kind)`
	`43`	`+ return strings.ToLower(r.Kind)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`func (r *ProviderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res ctrl.Result, err error) {`
`@@ -78,7 +78,7 @@ func (r *ProviderReconciler) Reconcile(ctx context.Context, req ctrl.Request) (r`
`78`	`78`	`// Therefore, the ProviderReconciler watches also jobs. The present method handles the job events and creates a reconcile request.`
`79`	`79`	`func (r *ProviderReconciler) HandleJob(_ context.Context, job client.Object) []reconcile.Request {`
`80`	`80`	`providerKind, found := job.GetLabels()[install.ProviderKindLabel]`
`81`		`- if !found \|\| providerKind != r.GroupVersionKind.Kind {`
	`81`	`+ if !found \|\| providerKind != r.Kind {`
`82`	`82`	`return nil`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`"github.com/openmcp-project/controller-utils/pkg/logging"`
`9`	`9`	`"github.com/openmcp-project/controller-utils/pkg/readiness"`
`10`		`- . "github.com/openmcp-project/controller-utils/pkg/resources"`
	`10`	`+ "github.com/openmcp-project/controller-utils/pkg/resources"`
`11`	`11`	`v1 "k8s.io/api/batch/v1"`
`12`	`12`	`core "k8s.io/api/core/v1"`
`13`	`13`	`apierrors "k8s.io/apimachinery/pkg/api/errors"`
`@@ -38,19 +38,19 @@ func (a *Installer) InstallInitJob(ctx context.Context) (completed bool, err err`
`38`	`38`
`39`	`39`	`values := NewValues(a.Provider, a.DeploymentSpec, a.Environment)`
`40`	`40`
`41`		`- if err := CreateOrUpdateResource(ctx, a.PlatformClient, NewNamespaceMutator(values.Namespace(), nil, nil)); err != nil {`
	`41`	`+ if err := resources.CreateOrUpdateResource(ctx, a.PlatformClient, resources.NewNamespaceMutator(values.Namespace(), nil, nil)); err != nil {`
`42`	`42`	`return false, err`
`43`	`43`	`}`
`44`	`44`
`45`		`- if err = CreateOrUpdateResource(ctx, a.PlatformClient, newInitServiceAccountMutator(values)); err != nil {`
	`45`	`+ if err = resources.CreateOrUpdateResource(ctx, a.PlatformClient, newInitServiceAccountMutator(values)); err != nil {`
`46`	`46`	`return false, err`
`47`	`47`	`}`
`48`	`48`
`49`		`- if err = CreateOrUpdateResource(ctx, a.PlatformClient, newInitClusterRoleMutator(values)); err != nil {`
	`49`	`+ if err = resources.CreateOrUpdateResource(ctx, a.PlatformClient, newInitClusterRoleMutator(values)); err != nil {`
`50`	`50`	`return false, err`
`51`	`51`	`}`
`52`	`52`
`53`		`- if err = CreateOrUpdateResource(ctx, a.PlatformClient, newInitClusterRoleBindingMutator(values)); err != nil {`
	`53`	`+ if err = resources.CreateOrUpdateResource(ctx, a.PlatformClient, newInitClusterRoleBindingMutator(values)); err != nil {`
`54`	`54`	`return false, err`
`55`	`55`	`}`
`56`	`56`
`@@ -61,7 +61,7 @@ func (a *Installer) InstallInitJob(ctx context.Context) (completed bool, err err`
`61`	`61`	`})`
`62`	`62`	`var job *v1.Job`
`63`	`63`	`found := true`
`64`		`- job, err = GetResource(ctx, a.PlatformClient, j)`
	`64`	`+ job, err = resources.GetResource(ctx, a.PlatformClient, j)`
`65`	`65`	`if err != nil {`
`66`	`66`	`if apierrors.IsNotFound(err) {`
`67`	`67`	`found = false`
`@@ -72,7 +72,7 @@ func (a *Installer) InstallInitJob(ctx context.Context) (completed bool, err err`
`72`	`72`
`73`	`73`	`if !found {`
`74`	`74`	`// Job does not exist, create it`
`75`		`- if err := CreateOrUpdateResource(ctx, a.PlatformClient, j); err != nil {`
	`75`	`+ if err := resources.CreateOrUpdateResource(ctx, a.PlatformClient, j); err != nil {`
`76`	`76`	`return false, fmt.Errorf("failed to create job %s/%s: %w", values.Namespace(), a.Provider.GetName(), err)`
`77`	`77`	`}`
`78`	`78`	`return false, nil`
`@@ -83,10 +83,10 @@ func (a *Installer) InstallInitJob(ctx context.Context) (completed bool, err err`
`83`	`83`	`return false, fmt.Errorf("failed to cleanup job pods %s/%s: %w", values.Namespace(), a.Provider.GetName(), err)`
`84`	`84`	`}`
`85`	`85`
`86`		`- if err := DeleteResource(ctx, a.PlatformClient, j); err != nil {`
	`86`	`+ if err := resources.DeleteResource(ctx, a.PlatformClient, j); err != nil {`
`87`	`87`	`return false, fmt.Errorf("failed to delete job %s/%s: %w", values.Namespace(), a.Provider.GetName(), err)`
`88`	`88`	`}`
`89`		`- if err := CreateOrUpdateResource(ctx, a.PlatformClient, j); err != nil {`
	`89`	`+ if err := resources.CreateOrUpdateResource(ctx, a.PlatformClient, j); err != nil {`
`90`	`90`	`return false, fmt.Errorf("failed to re-create job %s/%s: %w", values.Namespace(), a.Provider.GetName(), err)`
`91`	`91`	`}`
`92`	`92`	`return false, nil`
`@@ -101,15 +101,15 @@ func (a *Installer) InstallProvider(ctx context.Context) error {`
`101`	`101`
`102`	`102`	`values := NewValues(a.Provider, a.DeploymentSpec, a.Environment)`
`103`	`103`
`104`		`- if err := CreateOrUpdateResource(ctx, a.PlatformClient, newProviderServiceAccountMutator(values)); err != nil {`
	`104`	`+ if err := resources.CreateOrUpdateResource(ctx, a.PlatformClient, newProviderServiceAccountMutator(values)); err != nil {`
`105`	`105`	`return err`
`106`	`106`	`}`
`107`	`107`
`108`		`- if err := CreateOrUpdateResource(ctx, a.PlatformClient, newProviderClusterRoleBindingMutator(values)); err != nil {`
	`108`	`+ if err := resources.CreateOrUpdateResource(ctx, a.PlatformClient, newProviderClusterRoleBindingMutator(values)); err != nil {`
`109`	`109`	`return err`
`110`	`110`	`}`
`111`	`111`
`112`		`- if err := CreateOrUpdateResource(ctx, a.PlatformClient, newDeploymentMutator(values)); err != nil {`
	`112`	`+ if err := resources.CreateOrUpdateResource(ctx, a.PlatformClient, newDeploymentMutator(values)); err != nil {`
`113`	`113`	`return err`
`114`	`114`	`}`
`115`	`115`
`@@ -119,7 +119,7 @@ func (a *Installer) InstallProvider(ctx context.Context) error {`
`119`	`119`	`func (a *Installer) CheckProviderReadiness(ctx context.Context) readiness.CheckResult {`
`120`	`120`	`values := NewValues(a.Provider, a.DeploymentSpec, a.Environment)`
`121`	`121`
`122`		`- depl, err := GetResource(ctx, a.PlatformClient, newDeploymentMutator(values))`
	`122`	`+ depl, err := resources.GetResource(ctx, a.PlatformClient, newDeploymentMutator(values))`
`123`	`123`	`if err != nil {`
`124`	`124`	`return readiness.NewFailedResult(err)`
`125`	`125`	`}`
`@@ -131,31 +131,31 @@ func (a *Installer) UninstallProvider(ctx context.Context) (deleted bool, err er`
`131`	`131`
`132`	`132`	`values := NewValues(a.Provider, a.DeploymentSpec, a.Environment)`
`133`	`133`
`134`		`- if err := DeleteResource(ctx, a.PlatformClient, newDeploymentMutator(values)); err != nil {`
	`134`	`+ if err := resources.DeleteResource(ctx, a.PlatformClient, newDeploymentMutator(values)); err != nil {`
`135`	`135`	`return false, err`
`136`	`136`	`}`
`137`	`137`
`138`		`- if err := DeleteResource(ctx, a.PlatformClient, newProviderClusterRoleBindingMutator(values)); err != nil {`
	`138`	`+ if err := resources.DeleteResource(ctx, a.PlatformClient, newProviderClusterRoleBindingMutator(values)); err != nil {`
`139`	`139`	`return false, err`
`140`	`140`	`}`
`141`	`141`
`142`		`- if err := DeleteResource(ctx, a.PlatformClient, newProviderServiceAccountMutator(values)); err != nil {`
	`142`	`+ if err := resources.DeleteResource(ctx, a.PlatformClient, newProviderServiceAccountMutator(values)); err != nil {`
`143`	`143`	`return false, err`
`144`	`144`	`}`
`145`	`145`
`146`		`- if err := DeleteResource(ctx, a.PlatformClient, newJobMutator(values, a.DeploymentSpec, nil)); err != nil {`
	`146`	`+ if err := resources.DeleteResource(ctx, a.PlatformClient, newJobMutator(values, a.DeploymentSpec, nil)); err != nil {`
`147`	`147`	`return false, err`
`148`	`148`	`}`
`149`	`149`
`150`		`- if err := DeleteResource(ctx, a.PlatformClient, newInitClusterRoleBindingMutator(values)); err != nil {`
	`150`	`+ if err := resources.DeleteResource(ctx, a.PlatformClient, newInitClusterRoleBindingMutator(values)); err != nil {`
`151`	`151`	`return false, err`
`152`	`152`	`}`
`153`	`153`
`154`		`- if err := DeleteResource(ctx, a.PlatformClient, newInitClusterRoleMutator(values)); err != nil {`
	`154`	`+ if err := resources.DeleteResource(ctx, a.PlatformClient, newInitClusterRoleMutator(values)); err != nil {`
`155`	`155`	`return false, err`
`156`	`156`	`}`
`157`	`157`
`158`		`- if err := DeleteResource(ctx, a.PlatformClient, newInitServiceAccountMutator(values)); err != nil {`
	`158`	`+ if err := resources.DeleteResource(ctx, a.PlatformClient, newInitServiceAccountMutator(values)); err != nil {`
`159`	`159`	`return false, err`
`160`	`160`	`}`
`161`	`161`
`@@ -194,7 +194,7 @@ func (a Installer) isJobFailed(job v1.Job) bool {`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`func (a Installer) isGenerationUpToDate(ctx context.Context, job v1.Job) bool {`
`197`		`- genJob := job.ObjectMeta.Annotations[ProviderGenerationLabel]`
	`197`	`+ genJob := job.Annotations[ProviderGenerationLabel]`
`198`	`198`	`if genJob == "" {`
`199`	`199`	`return false`
`200`	`200`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func (r *ClusterScheduler) reconcile(ctx context.Context, log logging.Logger, re`
`81`	`81`	`log.Info("Resource not found")`
`82`	`82`	`return ReconcileResult{}`
`83`	`83`	`}`
`84`		`- return ReconcileResult{ReconcileError: errutils.WithReason(fmt.Errorf("unable to get resource '%s' from cluster: %w", req.NamespacedName.String(), err), cconst.ReasonPlatformClusterInteractionProblem)}`
	`84`	`+ return ReconcileResult{ReconcileError: errutils.WithReason(fmt.Errorf("unable to get resource '%s' from cluster: %w", req.String(), err), cconst.ReasonPlatformClusterInteractionProblem)}`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`// handle operation annotation`
`@@ -125,7 +125,7 @@ func (r *ClusterScheduler) handleCreateOrUpdate(ctx context.Context, req reconci`
`125`	`125`	`if controllerutil.AddFinalizer(cr, clustersv1alpha1.ClusterRequestFinalizer) {`
`126`	`126`	`log.Info("Adding finalizer")`
`127`	`127`	`if err := r.PlatformCluster.Client().Patch(ctx, cr, client.MergeFrom(rr.OldObject)); err != nil {`
`128`		`- rr.ReconcileError = errutils.WithReason(fmt.Errorf("error patching finalizer on resource '%s': %w", req.NamespacedName.String(), err), cconst.ReasonPlatformClusterInteractionProblem)`
	`128`	`+ rr.ReconcileError = errutils.WithReason(fmt.Errorf("error patching finalizer on resource '%s': %w", req.String(), err), cconst.ReasonPlatformClusterInteractionProblem)`
`129`	`129`	`return rr`
`130`	`130`	`}`
`131`	`131`	`}`
`@@ -230,7 +230,7 @@ func (r *ClusterScheduler) handleCreateOrUpdate(ctx context.Context, req reconci`
`230`	`230`	`// create Cluster resource`
`231`	`231`	`if err := r.PlatformCluster.Client().Create(ctx, cluster); err != nil {`
`232`	`232`	`if apierrors.IsAlreadyExists(err) {`
`233`		`- rr.ReconcileError = errutils.WithReason(fmt.Errorf("Cluster '%s/%s' already exists, this is not supposed to happen", cluster.Namespace, cluster.Name), cconst.ReasonInternalError)`
	`233`	`+ rr.ReconcileError = errutils.WithReason(fmt.Errorf("cluster '%s/%s' already exists, this is not supposed to happen", cluster.Namespace, cluster.Name), cconst.ReasonInternalError)`
`234`	`234`	`return rr`
`235`	`235`	`}`
`236`	`236`	`rr.ReconcileError = errutils.WithReason(fmt.Errorf("error creating cluster '%s/%s': %w", cluster.Namespace, cluster.Name, err), cconst.ReasonPlatformClusterInteractionProblem)`
`@@ -304,7 +304,7 @@ func (r *ClusterScheduler) handleDelete(ctx context.Context, req reconcile.Reque`
`304`	`304`	`if controllerutil.RemoveFinalizer(cr, clustersv1alpha1.ClusterRequestFinalizer) {`
`305`	`305`	`log.Info("Removing finalizer")`
`306`	`306`	`if err := r.PlatformCluster.Client().Patch(ctx, cr, client.MergeFrom(rr.OldObject)); err != nil {`
`307`		`- rr.ReconcileError = errutils.WithReason(fmt.Errorf("error removing finalizer from resource '%s': %w", req.NamespacedName.String(), err), cconst.ReasonPlatformClusterInteractionProblem)`
	`307`	`+ rr.ReconcileError = errutils.WithReason(fmt.Errorf("error removing finalizer from resource '%s': %w", req.String(), err), cconst.ReasonPlatformClusterInteractionProblem)`
`308`	`308`	`return rr`
`309`	`309`	`}`
`310`	`310`	`}`