From e026b8d7fb1265b80137ca09584098177b0de713 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Fri, 21 Dec 2018 15:52:59 -0500 Subject: [PATCH] Revert "pkg/asset/machines/aws/machinesets: Give workers public IPs (for now)" --- pkg/asset/machines/aws/machinesets.go | 13 ------------- pkg/asset/machines/worker.go | 1 - 2 files changed, 14 deletions(-) diff --git a/pkg/asset/machines/aws/machinesets.go b/pkg/asset/machines/aws/machinesets.go index ce1a9a87702..65af0057c7c 100644 --- a/pkg/asset/machines/aws/machinesets.go +++ b/pkg/asset/machines/aws/machinesets.go @@ -6,8 +6,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/utils/pointer" - awsprovider "sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1alpha1" clusterapi "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1" "github.com/openshift/installer/pkg/types" @@ -90,14 +88,3 @@ func MachineSets(config *types.InstallConfig, pool *types.MachinePool, role, use return machinesets, nil } - -// ConfigWorkers sets the PublicIP flag for the given machine sets. -// -// Deprecated: We'll remove this once the e2e tests no longer require -// worker SSH access. -func ConfigWorkers(machineSets []clusterapi.MachineSet) { - for _, machineSet := range machineSets { - providerConfig := machineSet.Spec.Template.Spec.ProviderConfig.Value.Object.(*awsprovider.AWSMachineProviderConfig) - providerConfig.PublicIP = pointer.BoolPtr(true) - } -} diff --git a/pkg/asset/machines/worker.go b/pkg/asset/machines/worker.go index 69e7faa3b81..fde09596aee 100644 --- a/pkg/asset/machines/worker.go +++ b/pkg/asset/machines/worker.go @@ -100,7 +100,6 @@ func (w *Worker) Generate(dependencies asset.Parents) error { if err != nil { return errors.Wrap(err, "failed to create worker machine objects") } - aws.ConfigWorkers(sets) list := listFromMachineSets(sets) raw, err := yaml.Marshal(list)