Skip to content

fix: fallback to spec.kubernetes.vpcId when infra output.json has no vpc_id #656

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

Open
mimnix wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: fallback to spec.kubernetes.vpcId when infra output.json has no vpc_id #656

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
36 changes: 16 additions & 20 deletions internal/apis/kfd/v1alpha2/ekscluster/common/distribution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,34 +142,30 @@ func (d *Distribution) extractVpcIDFromPrevPhases(fMerger *merge.Merger) (string
var infraOut terraform.OutputJSON

if err := json.Unmarshal(infraOutJSON, &infraOut); err == nil {
if infraOut["vpc_id"] == nil {
return vpcID, ErrVpcIDNotFound
}
if infraOut["vpc_id"] != nil {
vpcIDOut, ok := infraOut["vpc_id"].Value.(string)
if !ok {
return vpcID, ErrCastingVpcIDToStr
}

vpcIDOut, ok := infraOut["vpc_id"].Value.(string)
if !ok {
return vpcID, ErrCastingVpcIDToStr
return vpcIDOut, nil
}

vpcID = vpcIDOut
}
} else {
fModel := merge.NewDefaultModel((*fMerger.GetBase()).Content(), ".spec.kubernetes")
}

kubeFromFuryctlConf, err := fModel.Get()
if err != nil {
return vpcID, fmt.Errorf("error getting kubernetes from furyctl config: %w", err)
}
fModel := merge.NewDefaultModel((*fMerger.GetBase()).Content(), ".spec.kubernetes")

vpcFromFuryctlConf, ok := kubeFromFuryctlConf["vpcId"].(string)
if !ok && !d.DryRun {
return vpcID, ErrCastingVpcIDToStr
}
kubeFromFuryctlConf, err := fModel.Get()
if err != nil {
return vpcID, fmt.Errorf("error getting kubernetes from furyctl config: %w", err)
}

vpcID = vpcFromFuryctlConf
vpcFromFuryctlConf, ok := kubeFromFuryctlConf["vpcId"].(string)
if !ok && !d.DryRun {
return vpcID, ErrCastingVpcIDToStr
}

return vpcID, nil
return vpcFromFuryctlConf, nil
}

func (d *Distribution) PreparePostTerraform(
Expand Down