Fix annotation, Skip nil response (#48)

canonical · Aug 30, 2024 · 0985ddb · 0985ddb
1 parent b532314
commit 0985ddb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/pkg/ck8s/config_init.go b/pkg/ck8s/config_init.go
@@ -83,10 +83,12 @@ func GenerateInitControlPlaneConfig(cfg InitControlPlaneConfig) (apiv1.Bootstrap
 
 	// Since CAPI handles the lifecycle management of Kubernetes nodes, k8s-snap should only focus on
 	// cleaning up microcluster and files during upgrades.
-	if out.ClusterConfig.Annotations != nil {
-		if _, ok := out.ClusterConfig.Annotations[apiv1.AnnotationSkipCleanupKubernetesNodeOnRemove]; !ok {
-			out.ClusterConfig.Annotations[apiv1.AnnotationSkipCleanupKubernetesNodeOnRemove] = "true"
-		}
+	if out.ClusterConfig.Annotations == nil {
+		out.ClusterConfig.Annotations = map[string]string{}
+	}
+
+	if _, ok := out.ClusterConfig.Annotations[apiv1.AnnotationSkipCleanupKubernetesNodeOnRemove]; !ok {
+		out.ClusterConfig.Annotations[apiv1.AnnotationSkipCleanupKubernetesNodeOnRemove] = "true"
 	}
 
 	// features

diff --git a/pkg/ck8s/workload_cluster.go b/pkg/ck8s/workload_cluster.go
@@ -289,7 +289,7 @@ func (w *Workload) doK8sdRequest(ctx context.Context, method, endpoint string, r
 	if responseBody.Error != "" {
 		return fmt.Errorf("k8sd request failed: %s", responseBody.Error)
 	}
-	if responseBody.Metadata == nil {
+	if responseBody.Metadata == nil || response == nil {
 		// Nothing to decode
 		return nil
 	}