Skip to content

Commit

Permalink
Remove the use of dev-push-hyperkube.sh in Azure deployer
Browse files Browse the repository at this point in the history
The script ./dev-push-hyperkube.sh was removed from Kubernetes
recently in a general effort of moving Hyperkube away from the
k/k repo (see kubernetes/kubernetes#81760).

Until hyperkube gets an official home and it is completely removed
from k/k, we will need to build it manually from within the k8s
repo.

This affects the upstream Windows 1.17 jobs (
https://testgrid.k8s.io/sig-windows#aks-engine-azure-windows-master-staging
and
https://testgrid.k8s.io/sig-windows#aks-engine-azure-windows-master)
  • Loading branch information
adelina-t committed Oct 7, 2019
1 parent ebebbce commit 04c34e6
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions kubetest/azure.go
Expand Up @@ -723,14 +723,19 @@ func (c *Cluster) buildHyperKube() error {
if err := c.dockerLogin(); err != nil {
return err
}
log.Println("Building and pushing hyperkube.")
pushHyperkube := util.K8s("kubernetes", "hack", "dev-push-hyperkube.sh")
cmd := exec.Command(pushHyperkube)
log.Println("Building hyperkube.")
cmd := exec.Command("make", "-C", util.K8s("kubernetes"), "WHAT=cmd/hyperkube")
// dev-push-hyperkube will produce a lot of output to stdout. We should capture the output here.
cmd.Stdout = ioutil.Discard
if err := control.FinishRunning(cmd); err != nil {
return err
}
log.Println("Pushing hyperkube.")
hyperkube_bin := util.K8s("kubernetes", "_output", "bin", "hyperkube")
cmd = exec.Command("make", "-C", util.K8s("kubernetes", "cluster", "images", "hyperkube"), "push", fmt.Sprintf("HYPERKUBE_BIN=%s", hyperkube_bin))
if err := control.FinishRunning(cmd); err != nil {
return err
}
c.aksCustomHyperKubeURL = fmt.Sprintf("%s/hyperkube-amd64:%s", os.Getenv("REGISTRY"), os.Getenv("VERSION"))
if err := dockerLogout(); err != nil {
log.Println("Docker logout failed.")
Expand Down

0 comments on commit 04c34e6

Please sign in to comment.