cleanup

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: v0.3.2
-TAG ?= v0.3.2-preview.26
+TAG ?= v0.3.2-preview.28
 ARCH ?= $(shell go env GOARCH)
 ALL_ARCH = amd64 arm arm64
 

api/v1alpha1/condition_consts.go

@@ -22,13 +22,13 @@ import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 const (
 	// DeploymentProgressingCondition indicates that the cdk8s application deployment is progressing.
 	DeploymentProgressingCondition clusterv1.ConditionType = "DeploymentProgressing"
-
 	// GitCloneFailedReason indicates that git clone operation failed.
 	GitCloneFailedReason = "GitCloneFailed"
 	// GitCheckoutFailedReason indicates that git checkout operation failed.
 	GitCheckoutFailedReason = "GitCheckoutFailed"
 	// SourceNotSpecifiedReason indicates that no source (GitRepository) was specified.
 	SourceNotSpecifiedReason = "SourceNotSpecified"
+	GitOperationFailedReason = "GitOperationFailed"
 	// Cdk8sSynthFailedReason indicates that cdk8s synth operation failed.
 	Cdk8sSynthFailedReason = "Cdk8sSynthFailed"
 	// WalkDistFailedReason indicates that walking the dist directory failed.

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:v0.3.2-preview.26
+      - image: ghcr.io/patricklaabs/cluster-api-addon-provider-cdk8s/cluster-api-cdk8s-controller:v0.3.2-preview.28
         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:v0.3.2-preview.26
+      - image: ghcr.io/patricklaabs/cluster-api-addon-provider-cdk8s/cluster-api-cdk8s-controller:v0.3.2-preview.28
         name: manager

controllers/cdk8sappproxy/cdk8sappproxy_consts.go

@@ -7,11 +7,6 @@ const (
 
 // Operation represents the type of operation being performed by the cdk8sappproxy controller.
 const (
-	OperationDeletion   = "deletion"
-	OperationNormal     = "normal"
-	OperationPolling    = "polling"
-	OperationFindFiles  = "findFiles"
-	OperationSynthesize = "synthesize"
-	OperationApply      = "apply"
-	OperationNpmInstall = "npmInstall"
+	OperationDeletion = "deletion"
+	OperationNormal   = "normal"
 )

controllers/cdk8sappproxy/cdk8sappproxy_controller.go

@@ -87,19 +87,20 @@ func (r *Reconciler) checkIfResourceExists(ctx context.Context, dynClient dynami
 }
 
 func (r *Reconciler) synthesizeAndParseResources(appSourcePath string, logger logr.Logger) ([]*unstructured.Unstructured, error) {
+	reason := addonsv1alpha1.Cdk8sSynthFailedReason
 	// Synthesize cdk8s application
-	if err := r.synthesizeCdk8sApp(appSourcePath, logger, OperationSynthesize); err != nil {
+	if err := r.synthesizeCdk8sApp(appSourcePath, logger, reason); err != nil {
 		return nil, err
 	}
 
 	// Find manifest files
-	manifestFiles, err := r.findManifestFiles(appSourcePath, logger, OperationFindFiles)
+	manifestFiles, err := r.findManifestFiles(appSourcePath, logger, reason)
 	if err != nil {
 		return nil, err
 	}
 
 	// Parse resources from manifest files using the consolidated function
-	return r.parseManifestFiles(manifestFiles, logger, OperationSynthesize)
+	return r.parseManifestFiles(manifestFiles, logger, reason)
 }
 
 func (r *Reconciler) synthesizeCdk8sApp(appSourcePath string, logger logr.Logger, operation string) error {
@@ -212,7 +213,7 @@ func (r *Reconciler) deleteResourcesFromClusters(ctx context.Context, cdk8sAppPr
 		dynamicClient, err := r.getDynamicClientForCluster(ctx, cdk8sAppProxy.Namespace, cluster.Name)
 		if err != nil {
 			clusterLogger.Error(err, "Failed to get dynamic client for cluster during deletion, skipping this cluster")
-			// Log error but continue with other clusters
+
 			continue
 		}