Skip to content

pkg/asset/machines/aws/machinesets: Give workers public IPs (for now) #927

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

Merged
openshift-merge-robot merged 1 commit into from
Dec 17, 2018
Merged

pkg/asset/machines/aws/machinesets: Give workers public IPs (for now) #927

Show file tree
Hide file tree
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
13 changes: 13 additions & 0 deletions pkg/asset/machines/aws/machinesets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ 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"
Expand Down Expand Up @@ -88,3 +90,14 @@ 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)
}
}
1 change: 1 addition & 0 deletions pkg/asset/machines/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ 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)
Expand Down