remove commented code, revert driver.go

pkg/addons/addons.go

@@ -159,14 +159,10 @@ func EnableOrDisableAddon(cc *config.ClusterConfig, name, val string) error {
 
 	// check addon status before enabling/disabling it
 	if isAddonAlreadySet(cc, addon, enable) {
-		// if addon.Name() == "gcp-auth" {
-		// 	return nil
-		// }
 		switch addon.Name() {
 		case "gcp-auth", "storage-provisioner", "default-storageclass":
 			return nil
 		}
-		// klog.Warningf("addon %s should already be in state %s", name, val)
 		out.WarningT("addon {{.name}} is already set to {{.val}}", out.V{"name": name, "val": val})
 		if !enable {
 			return nil

pkg/drivers/hyperkit/driver.go

@@ -207,10 +207,7 @@ func (d *Driver) createHost() (*hyperkit.HyperKit, error) {
 	}
 
 	// TODO: handle the rest of our settings.
-
-	fmt.Printf("abc xyz")
-	// h.Kernel = d.ResolveStorePath("bzimage")
-	h.Kernel = d.ResolveStorePath("vmlinuz")
+	h.Kernel = d.ResolveStorePath("bzimage")
 	h.Initrd = d.ResolveStorePath("initrd")
 	h.VMNet = true
 	h.ISOImages = []string{d.ResolveStorePath(isoFilename)}
@@ -423,14 +420,11 @@ func (d *Driver) Stop() error {
 }
 
 func (d *Driver) extractKernel(isoPath string) error {
-	log.Infof("abc123a")
-	fmt.Print("abc333")
 	for _, f := range []struct {
 		pathInIso string
 		destPath  string
 	}{
-		// {"/boot/bzimage", "bzimage"},
-		{"/boot/vmlinuz", "bzimage"},
+		{"/boot/bzimage", "bzimage"},
 		{"/boot/initrd", "initrd"},
 	} {
 		fullDestPath := d.ResolveStorePath(f.destPath)