Skip to content

Commit c10287a

Browse files
committed
remove the linode-kernel option since it has always been ignored
1 parent 1657499 commit c10287a

File tree

2 files changed

+13
-23
lines changed

2 files changed

+13
-23
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ docker-machine create -d linode --linode-token=<linode-token> --linode-root-pass
5656
| `linode-region` | `LINODE_REGION` | `us-east` | The Linode Instance `region` (see [here](https://api.linode.com/v4/regions))
5757
| `linode-instance-type` | `LINODE_INSTANCE_TYPE` | `g6-standard-4` | The Linode Instance `type` (see [here](https://api.linode.com/v4/linode/types))
5858
| `linode-image` | `LINODE_IMAGE` | `linode/ubuntu18.04` | The Linode Instance `image` which provides the Linux distribution (see [here](https://api.linode.com/v4/images)).
59-
| `linode-kernel` | `LINODE_KERNEL` | `linode/grub2` | The Linux Instance `kernel` to boot. `linode/grub2` will defer to the distribution kernel. (see [here](https://api.linode.com/v4/linode/kernels) (`?page=N`))
6059
| `linode-ssh-port` | `LINODE_SSH_PORT` | `22` | The port that SSH is running on, needed for Docker Machine to provision the Linode.
6160
| `linode-ssh-user` | `LINODE_SSH_USER` | `root` | The user as which docker-machine should log in to the Linode instance to install Docker. This user must have passwordless sudo.
6261
| `linode-docker-port` | `LINODE_DOCKER_PORT` | `2376` | The TCP port of the Linode that Docker will be listening on

pkg/drivers/linode/linode.go

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,12 @@ type Driver struct {
3535
InstanceID int
3636
InstanceLabel string
3737

38-
Region string
39-
InstanceType string
40-
RootPassword string
41-
SSHPort int
42-
InstanceImage string
43-
InstanceKernel string
44-
SwapSize int
38+
Region string
39+
InstanceType string
40+
RootPassword string
41+
SSHPort int
42+
InstanceImage string
43+
SwapSize int
4544

4645
StackScriptID int
4746
StackScriptUser string
@@ -55,14 +54,13 @@ var (
5554
)
5655

5756
const (
58-
defaultSSHPort = 22
59-
defaultSSHUser = "root"
60-
defaultInstanceImage = "linode/ubuntu18.04"
61-
defaultRegion = "us-east"
62-
defaultInstanceType = "g6-standard-4"
63-
defaultInstanceKernel = "linode/grub2"
64-
defaultSwapSize = 512
65-
defaultDockerPort = 2376
57+
defaultSSHPort = 22
58+
defaultSSHUser = "root"
59+
defaultInstanceImage = "linode/ubuntu18.04"
60+
defaultRegion = "us-east"
61+
defaultInstanceType = "g6-standard-4"
62+
defaultSwapSize = 512
63+
defaultDockerPort = 2376
6664

6765
defaultContainerLinuxSSHUser = "core"
6866
)
@@ -176,12 +174,6 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
176174
Usage: "Specifies the Linode Instance image which determines the OS distribution and base files",
177175
Value: defaultInstanceImage, // "linode/ubuntu18.04", "linode/arch", ...
178176
},
179-
mcnflag.StringFlag{
180-
EnvVar: "LINODE_KERNEL",
181-
Name: "linode-kernel",
182-
Usage: "Linode Instance Kernel",
183-
Value: defaultInstanceKernel, // linode/latest-64bit, ..
184-
},
185177
mcnflag.IntFlag{
186178
EnvVar: "LINODE_DOCKER_PORT",
187179
Name: "linode-docker-port",
@@ -251,7 +243,6 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
251243
d.SSHPort = flags.Int("linode-ssh-port")
252244
d.SSHUser = flags.String("linode-ssh-user")
253245
d.InstanceImage = flags.String("linode-image")
254-
d.InstanceKernel = flags.String("linode-kernel")
255246
d.InstanceLabel = flags.String("linode-label")
256247
d.SwapSize = flags.Int("linode-swap-size")
257248
d.DockerPort = flags.Int("linode-docker-port")

0 commit comments

Comments
 (0)