Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Honouring write_kubeconfig post cluster creation #325

Merged
merged 1 commit into from
Aug 16, 2024
Merged

Honouring write_kubeconfig post cluster creation #325

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion civo/kubernetes/resource_kubernetes_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ func resourceKubernetesClusterRead(_ context.Context, d *schema.ResourceData, m
if writeKubeconfig {
d.Set("kubeconfig", resp.KubeConfig)
} else {
d.Set("kubeconfig", "")
d.Set("kubeconfig", nil)
}

if err := d.Set("pools", flattenNodePool(resp)); err != nil {
Expand Down Expand Up @@ -445,6 +445,16 @@ func resourceKubernetesClusterUpdate(ctx context.Context, d *schema.ResourceData
if d.HasChange("write_kubeconfig") {
// setting atleast one field inside the KubernetesClusterConfig, just to ensure we are not sending an empty config
config.FirewallID = d.Get("firewall_id").(string)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am guessing you don't need this line now then?

writeKubeconfig := d.Get("write_kubeconfig").(bool)
if writeKubeconfig {
resp, err := apiClient.GetKubernetesCluster(d.Id())
if err != nil {
return diag.Errorf("[ERR] failed to get kubernetes cluster: %s", err)
}
d.Set("kubeconfig", resp.KubeConfig)
} else {
d.Set("kubeconfig", nil)
}
}

log.Printf("[INFO] updating the kubernetes cluster %s", d.Id())
Expand Down Expand Up @@ -505,6 +515,13 @@ func resourceKubernetesClusterDelete(ctx context.Context, d *schema.ResourceData

func customizeDiffKubernetesCluster(ctx context.Context, d *schema.ResourceDiff, meta interface{}) error {
if d.Id() != "" {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not related to this change, but the check is getting rather lengthy and it is making harder to review. We should invert this check and early return instead.

	if d.Id() == "" {
		return errors.New("some error") //
	}
	
	if d.HasCHange("write_kubeconfig") {
		...

if d.HasChange("write_kubeconfig") {
err := d.SetNewComputed("kubeconfig")
if err != nil {
return err
}
}

if d.HasChange("applications") {
return fmt.Errorf("the 'applications' field is immutable")
}
Expand Down
Loading