Skip to content

Commit 261ed11

Browse files
committed
cluster/tfvars: remove GCP letfover code
This is a fallout of 77234cc when the license field support was removed.
1 parent b16323c commit 261ed11

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

pkg/asset/cluster/tfvars/tfvars.go

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212

1313
"github.com/IBM/vpc-go-sdk/vpcv1"
1414
igntypes "github.com/coreos/ignition/v2/config/v3_2/types"
15-
coreosarch "github.com/coreos/stream-metadata-go/arch"
1615
"github.com/pkg/errors"
1716
"github.com/sirupsen/logrus"
1817
"k8s.io/utils/ptr"
@@ -39,7 +38,6 @@ import (
3938
"github.com/openshift/installer/pkg/asset/manifests"
4039
"github.com/openshift/installer/pkg/asset/openshiftinstall"
4140
"github.com/openshift/installer/pkg/asset/rhcos"
42-
rhcospkg "github.com/openshift/installer/pkg/rhcos"
4341
"github.com/openshift/installer/pkg/tfvars"
4442
awstfvars "github.com/openshift/installer/pkg/tfvars/aws"
4543
azuretfvars "github.com/openshift/installer/pkg/tfvars/azure"
@@ -538,21 +536,6 @@ func (t *TerraformVariables) Generate(ctx context.Context, parents asset.Parents
538536
return fmt.Errorf("failed to create gcp ignition shim: %w", err)
539537
}
540538

541-
archName := coreosarch.RpmArch(string(installConfig.Config.ControlPlane.Architecture))
542-
st, err := rhcospkg.FetchCoreOSBuild(ctx)
543-
if err != nil {
544-
return err
545-
}
546-
streamArch, err := st.GetArchitecture(archName)
547-
if err != nil {
548-
return err
549-
}
550-
551-
img := streamArch.Images.Gcp
552-
if img == nil {
553-
return fmt.Errorf("%s: No GCP build found", st.FormatPrefix(archName))
554-
}
555-
556539
tags, err := gcpconfig.NewTagManager(client).GetUserTags(ctx,
557540
installConfig.Config.Platform.GCP.ProjectID,
558541
installConfig.Config.Platform.GCP.UserTags)

0 commit comments

Comments
 (0)