Skip to content
This repository was archived by the owner on Aug 12, 2025. It is now read-only.

Commit 7debe82

Browse files
committed
update docker version
1 parent 40d3f0c commit 7debe82

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

config/default/machine_configs.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ items:
33
- image: ubuntu_18_04
44
versions:
55
kubelet: 1.14.3
6-
containerRuntime: docker-ce=18.03.1~ce~3-0~ubuntu
6+
containerRuntime: docker-ce=5:18.09.7~3-0~ubuntu-bionic
77
- image: ubuntu_18_04
88
versions:
99
kubelet: 1.14.3
1010
controlPlane: 1.14.3
11-
containerRuntime: docker-ce=18.03.1~ce~3-0~ubuntu
11+
containerRuntime: docker-ce=5:18.09.7~3-0~ubuntu-bionic
1212
userdata: |
1313
set -e
1414
set -x
@@ -156,6 +156,9 @@ items:
156156
EOF
157157

158158
install_custom_ca
159+
160+
# running with swap is not supported
161+
swapoff -a
159162
kubeadm init --config /etc/kubernetes/kubeadm_config.yaml
160163
# Apply Weave CNI
161164
for tries in $(seq 1 60); do

pkg/cloud/packet/actuators/machine/machineconfig/machineconfig.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func findMatchingConfig(configs *configList, params *ConfigParams) (*config, str
9494
continue
9595
}
9696
matchingConfigs = append(matchingConfigs, conf)
97-
containerRuntime = params.ContainerRuntime
97+
containerRuntime = validParams.ContainerRuntime
9898
}
9999
}
100100

pkg/cloud/packet/deployer/deploy.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ func (d *Deployer) GetIP(cluster *clusterv1.Cluster, machine *clusterv1.Machine)
9696
if device == nil {
9797
return "", fmt.Errorf("machine does not exist: %s", machineRef)
9898
}
99+
if device.Network == nil || len(device.Network) == 0 || device.Network[0].Address == "" {
100+
return "", fmt.Errorf("machine does not yet have an IP address: %s", machineRef)
101+
}
99102
// TODO: validate that this address exists, so we don't hit nil pointer
100103
// TODO: check which address to return
101104
// TODO: check address format (cidr, subnet, etc.)

0 commit comments

Comments
 (0)