Merge pull request #208 from gianlucam76/release-0.9

gianlucam76 · web-flow · commit f93464bf1193 · 2023-04-24T11:12:22.000+02:00
Release 0.9
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -6,7 +6,7 @@ on:
     - 'main'
     - 'dev'
   pull_request:
-    types: opened
+    types: [opened, edited, reopened]
 
 
 jobs:
diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ ARCH ?= amd64
 OS ?= $(shell uname -s | tr A-Z a-z)
 K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
 export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
-TAG ?= v0.9.0
+TAG ?= v0.9.1
 
 # Get cluster-api version and build ldflags
 clusterapi := $(shell go list -m sigs.k8s.io/cluster-api)
diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml
@@ -8,5 +8,5 @@ spec:
     spec:
       containers:
       # Change the value of image field below to your controller image URL
-      - image: projectsveltos/addon-manager-amd64:v0.9.0
+      - image: projectsveltos/addon-manager-amd64:v0.9.1
         name: manager
diff --git a/controllers/clustersummary_controller.go b/controllers/clustersummary_controller.go
@@ -211,7 +211,7 @@ func (r *ClusterSummaryReconciler) reconcileDelete(
 
 	err = r.removeResourceSummary(ctx, clusterSummaryScope, logger)
 	if err != nil {
-		logger.V(logs.LogInfo).Info("failed to remove ResourceSummary.")
+		logger.V(logs.LogInfo).Error(err, "failed to remove ResourceSummary.")
 		return reconcile.Result{Requeue: true, RequeueAfter: deleteRequeueAfter}, nil
 	}
 
diff --git a/controllers/handlers_resources.go b/controllers/handlers_resources.go
@@ -72,16 +72,17 @@ func deployResources(ctx context.Context, c client.Client,
 	var remoteResourceReports []configv1alpha1.ResourceReport
 	localResourceReports, remoteResourceReports, err = deployReferencedObjects(ctx, c, remoteRestConfig,
 		clusterSummary, featureHandler, logger)
-	if err != nil {
-		return err
-	}
 
-	clusterProfileOwnerRef, err := configv1alpha1.GetClusterProfileOwnerReference(clusterSummary)
+	// Irrespective of error, update deployed gvks. Otherwise cleanup won't happen in case
+	gvkErr := updateDeployedGroupVersionKind(ctx, clusterSummary, localResourceReports, remoteResourceReports, logger)
 	if err != nil {
 		return err
 	}
+	if gvkErr != nil {
+		return gvkErr
+	}
 
-	err = updateDeployedGroupVersionKind(ctx, clusterSummary, localResourceReports, remoteResourceReports, logger)
+	clusterProfileOwnerRef, err := configv1alpha1.GetClusterProfileOwnerReference(clusterSummary)
 	if err != nil {
 		return err
 	}
diff --git a/controllers/handlers_utils.go b/controllers/handlers_utils.go
@@ -478,22 +478,21 @@ func deployReferencedObjects(ctx context.Context, c client.Client, remoteConfig
 		localConfig.Impersonate = rest.ImpersonationConfig{
 			UserName: fmt.Sprintf("system:serviceaccount:%s:%s", adminNamespace, adminName),
 		}
-		logger.Info("MGIANLUC")
 	}
 	tmpResourceReports, err = deployObjects(ctx, c, localConfig, objectsToDeployLocally, clusterSummary,
 		mgtmResources, logger)
+	localReports = append(localReports, tmpResourceReports...)
 	if err != nil {
-		return nil, nil, err
+		return localReports, nil, err
 	}
-	localReports = append(localReports, tmpResourceReports...)
 
 	// Deploy all resources that need to be deployed in the managed cluster
 	tmpResourceReports, err = deployObjects(ctx, remoteClient, remoteConfig, objectsToDeployRemotely, clusterSummary,
 		mgtmResources, logger)
+	remoteReports = append(remoteReports, tmpResourceReports...)
 	if err != nil {
-		return nil, nil, err
+		return localReports, remoteReports, err
 	}
-	remoteReports = append(remoteReports, tmpResourceReports...)
 
 	return localReports, remoteReports, nil
 }
diff --git a/controllers/template_instantiation.go b/controllers/template_instantiation.go
@@ -173,7 +173,7 @@ func instantiateTemplateValues(ctx context.Context, config *rest.Config, c clien
 	}
 
 	templateName := getTemplateName(clusterNamespace, clusterName, requestorName)
-	tmpl, err := template.New(templateName).Funcs(sprig.FuncMap()).Parse(values)
+	tmpl, err := template.New(templateName).Option("missingkey=error").Funcs(sprig.FuncMap()).Parse(values)
 	if err != nil {
 		return "", err
 	}
diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.9.2
 	github.com/onsi/gomega v1.27.5
 	github.com/pkg/errors v0.9.1
-	github.com/projectsveltos/libsveltos v0.9.0
+	github.com/projectsveltos/libsveltos v0.9.1
 	github.com/prometheus/client_golang v1.14.0
 	github.com/spf13/pflag v1.0.5
 	golang.org/x/text v0.8.0
diff --git a/go.sum b/go.sum
@@ -529,8 +529,8 @@ github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSg
 github.com/poy/onpar v0.0.0-20200406201722-06f95a1c68e8/go.mod h1:nSbFQvMj97ZyhFRSJYtut+msi4sOY6zJDGCdSc+/rZU=
 github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
 github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
-github.com/projectsveltos/libsveltos v0.9.0 h1:JYOlEtnFTDqmozNTz7hmuRAW1+VrFlu++ZPZwPv39Rk=
-github.com/projectsveltos/libsveltos v0.9.0/go.mod h1:10UR0S+rA8NdP/X8IPWKv1tb0CL4gOOguT2JCXyL/18=
+github.com/projectsveltos/libsveltos v0.9.1 h1:6y6oq2FGlDlQ9/6vyA7tzWC6lq0B3X74kDbpSsV8Y5E=
+github.com/projectsveltos/libsveltos v0.9.1/go.mod h1:10UR0S+rA8NdP/X8IPWKv1tb0CL4gOOguT2JCXyL/18=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml
@@ -1561,7 +1561,7 @@ spec:
         - --v=5
         command:
         - /manager
-        image: projectsveltos/addon-manager-amd64:v0.9.0
+        image: projectsveltos/addon-manager-amd64:v0.9.1
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/pkg/drift-detection/drift-detection-manager.go b/pkg/drift-detection/drift-detection-manager.go
@@ -260,7 +260,7 @@ spec:
         - --run-mode=do-not-send-updates
         command:
         - /manager
-        image: projectsveltos/drift-detection-manager-amd64:v0.9.0
+        image: projectsveltos/drift-detection-manager-amd64:v0.9.1
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/pkg/drift-detection/drift-detection-manager.yaml b/pkg/drift-detection/drift-detection-manager.yaml
@@ -242,7 +242,7 @@ spec:
         - --run-mode=do-not-send-updates
         command:
         - /manager
-        image: projectsveltos/drift-detection-manager-amd64:v0.9.0
+        image: projectsveltos/drift-detection-manager-amd64:v0.9.1
         livenessProbe:
           httpGet:
             path: /healthz

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ func (r *ClusterSummaryReconciler) reconcileDelete(`
`211`	`211`
`212`	`212`	`err = r.removeResourceSummary(ctx, clusterSummaryScope, logger)`
`213`	`213`	`if err != nil {`
`214`		`- logger.V(logs.LogInfo).Info("failed to remove ResourceSummary.")`
	`214`	`+ logger.V(logs.LogInfo).Error(err, "failed to remove ResourceSummary.")`
`215`	`215`	`return reconcile.Result{Requeue: true, RequeueAfter: deleteRequeueAfter}, nil`
`216`	`216`	`}`
`217`	`217`
Original file line number	Diff line number	Diff line change
`@@ -478,22 +478,21 @@ func deployReferencedObjects(ctx context.Context, c client.Client, remoteConfig`
`478`	`478`	`localConfig.Impersonate = rest.ImpersonationConfig{`
`479`	`479`	`UserName: fmt.Sprintf("system:serviceaccount:%s:%s", adminNamespace, adminName),`
`480`	`480`	`}`
`481`		`- logger.Info("MGIANLUC")`
`482`	`481`	`}`
`483`	`482`	`tmpResourceReports, err = deployObjects(ctx, c, localConfig, objectsToDeployLocally, clusterSummary,`
`484`	`483`	`mgtmResources, logger)`
	`484`	`+ localReports = append(localReports, tmpResourceReports...)`
`485`	`485`	`if err != nil {`
`486`		`- return nil, nil, err`
	`486`	`+ return localReports, nil, err`
`487`	`487`	`}`
`488`		`- localReports = append(localReports, tmpResourceReports...)`
`489`	`488`
`490`	`489`	`// Deploy all resources that need to be deployed in the managed cluster`
`491`	`490`	`tmpResourceReports, err = deployObjects(ctx, remoteClient, remoteConfig, objectsToDeployRemotely, clusterSummary,`
`492`	`491`	`mgtmResources, logger)`
	`492`	`+ remoteReports = append(remoteReports, tmpResourceReports...)`
`493`	`493`	`if err != nil {`
`494`		`- return nil, nil, err`
	`494`	`+ return localReports, remoteReports, err`
`495`	`495`	`}`
`496`		`- remoteReports = append(remoteReports, tmpResourceReports...)`
`497`	`496`
`498`	`497`	`return localReports, remoteReports, nil`
`499`	`498`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ func instantiateTemplateValues(ctx context.Context, config *rest.Config, c clien`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`templateName := getTemplateName(clusterNamespace, clusterName, requestorName)`
`176`		`- tmpl, err := template.New(templateName).Funcs(sprig.FuncMap()).Parse(values)`
	`176`	`+ tmpl, err := template.New(templateName).Option("missingkey=error").Funcs(sprig.FuncMap()).Parse(values)`
`177`	`177`	`if err != nil {`
`178`	`178`	`return "", err`
`179`	`179`	`}`