Skip to content

Commit

Permalink
Pass MACs to set-static-ip initContainer
Browse files Browse the repository at this point in the history
This was added for refresh-static-ips in openshift#149 - but actually
the point where we really need it is the initial setting of the IP
since the underlying script can't detect which interface to use
by IP until it's configured.
  • Loading branch information
Steven Hardy authored and asalkeld committed Jul 25, 2021
1 parent 5f4ae68 commit e32d6f9
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions provisioning/baremetal_pod.go
Expand Up @@ -265,7 +265,7 @@ func newMetal3InitContainers(info *ProvisioningInfo) []corev1.Container {
// particular provisioning IP on the machine CIDR, we have nothing for this container
// to manage.
if info.ProvConfig.Spec.ProvisioningIP != "" && info.ProvConfig.Spec.ProvisioningNetwork != metal3iov1alpha1.ProvisioningNetworkDisabled {
initContainers = append(initContainers, createInitContainerStaticIpSet(info.Images, &info.ProvConfig.Spec))
initContainers = append(initContainers, createInitContainerStaticIpSet(info.Images, &info.ProvConfig.Spec, info.MasterMacAddresses))
}

// If the PreProvisioningOSDownloadURLs are set, we fetch the URLs of either CoreOS ISO and IPA assets or in some
Expand Down Expand Up @@ -404,7 +404,7 @@ func createInitContainerMachineOsDownloader(info *ProvisioningInfo, imageURLs st
return initContainer
}

func createInitContainerStaticIpSet(images *Images, config *metal3iov1alpha1.ProvisioningSpec) corev1.Container {
func createInitContainerStaticIpSet(images *Images, config *metal3iov1alpha1.ProvisioningSpec, macs []string) corev1.Container {
initContainer := corev1.Container{
Name: "metal3-static-ip-set",
Image: images.StaticIpManager,
Expand All @@ -424,6 +424,9 @@ func createInitContainerStaticIpSet(images *Images, config *metal3iov1alpha1.Pro
},
},
}

initContainer.Env = envWithMasterMacAddresses(initContainer.Env, macs)

return initContainer
}

Expand Down

0 comments on commit e32d6f9

Please sign in to comment.