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.

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

Honouring write_kubeconfig post cluster creation #325

Merged
merged 1 commit into from
Aug 16, 2024
Merged

Conversation

uzaxirr
Copy link
Member

@uzaxirr uzaxirr commented Aug 16, 2024

Here its necessary to set firewall_id in the d.HasChange("write_kubeconfig") block so that in case where only write_kubeconfig is changed we do not pass on an empty config struct in the update API call and it will fail.
And since firewall is a required field. It does no harm in sending it as an update

Copy link
Member

@rytswd rytswd left a comment

Choose a reason for hiding this comment

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

LGTM, but just left one quick comment around the code structure

@@ -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") {
		...

@@ -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?

@uzaxirr uzaxirr merged commit af6a857 into master Aug 16, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants