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

Commit d8a7b1c

Browse files
cpriviterecprivitere
authored
Merge pull request #576 from equinix-labs/ubuntu-2004
🐛 Move to 20.04 as default
2 parents 6021631 + a0e1151 commit d8a7b1c

11 files changed

+17
-17
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ You should then follow the [Cluster API Quick Start Guide](https://cluster-api.s
5050
If you do not change the generated `yaml` files, it will use defaults. You can look in the [templates/cluster-template.yaml](./templates/cluster-template.yaml) file for details.
5151

5252
* `CPEM_VERSION` (defaults to `v3.6.0`)
53-
* `KUBE_VIP_VERSION` (defaults to `v0.5.0`)
54-
* `NODE_OS` (defaults to `ubuntu_22_04`)
53+
* `KUBE_VIP_VERSION` (defaults to `v0.5.12`)
54+
* `NODE_OS` (defaults to `ubuntu_20_04`)
5555
* `POD_CIDR` (defaults to `192.168.0.0/16`)
5656
* `SERVICE_CIDR` (defaults to `172.26.0.0/16`)
5757

@@ -70,7 +70,7 @@ spec:
7070
spec:
7171
billingCycle: hourly
7272
machineType: c3.small.x86
73-
os: ubuntu_22_04
73+
os: ubuntu_20_04
7474
sshKeys:
7575
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDvMgVEubPLztrvVKgNPnRe9sZSjAqaYj9nmCkgr4PdK username@computer
7676
tags: []

‎docs/concepts/machine.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ kind: PacketMachine
1111
metadata:
1212
name: "qa-controlplane-0"
1313
spec:
14-
os: "ubuntu_22_04"
14+
os: "ubuntu_20_04"
1515
billingCycle: hourly
1616
machineType: "c3.small.x86"
1717
sshKeys:

‎templates/cluster-template-crs-cni.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ spec:
238238
spec:
239239
billingCycle: hourly
240240
machineType: ${CONTROLPLANE_NODE_TYPE}
241-
os: ${NODE_OS:=ubuntu_22_04}
241+
os: ${NODE_OS:=ubuntu_20_04}
242242
sshKeys:
243243
- ${SSH_KEY}
244244
tags: []
@@ -252,7 +252,7 @@ spec:
252252
spec:
253253
billingCycle: hourly
254254
machineType: ${WORKER_NODE_TYPE}
255-
os: ${NODE_OS:=ubuntu_22_04}
255+
os: ${NODE_OS:=ubuntu_20_04}
256256
sshKeys:
257257
- ${SSH_KEY}
258258
tags: []

‎templates/cluster-template-kube-vip-crs-cni.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ spec:
257257
spec:
258258
billingCycle: hourly
259259
machineType: ${CONTROLPLANE_NODE_TYPE}
260-
os: ${NODE_OS:=ubuntu_22_04}
260+
os: ${NODE_OS:=ubuntu_20_04}
261261
sshKeys:
262262
- ${SSH_KEY}
263263
tags: []
@@ -271,7 +271,7 @@ spec:
271271
spec:
272272
billingCycle: hourly
273273
machineType: ${WORKER_NODE_TYPE}
274-
os: ${NODE_OS:=ubuntu_22_04}
274+
os: ${NODE_OS:=ubuntu_20_04}
275275
sshKeys:
276276
- ${SSH_KEY}
277277
tags: []

‎templates/cluster-template-kube-vip.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ spec:
236236
spec:
237237
billingCycle: hourly
238238
machineType: ${CONTROLPLANE_NODE_TYPE}
239-
os: ${NODE_OS:=ubuntu_22_04}
239+
os: ${NODE_OS:=ubuntu_20_04}
240240
sshKeys:
241241
- ${SSH_KEY}
242242
tags: []
@@ -250,7 +250,7 @@ spec:
250250
spec:
251251
billingCycle: hourly
252252
machineType: ${WORKER_NODE_TYPE}
253-
os: ${NODE_OS:=ubuntu_22_04}
253+
os: ${NODE_OS:=ubuntu_20_04}
254254
sshKeys:
255255
- ${SSH_KEY}
256256
tags: []

‎templates/cluster-template.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ metadata:
102102
spec:
103103
template:
104104
spec:
105-
os: "${NODE_OS:=ubuntu_22_04}"
105+
os: "${NODE_OS:=ubuntu_20_04}"
106106
billingCycle: hourly
107107
machineType: "${CONTROLPLANE_NODE_TYPE}"
108108
sshKeys:
@@ -178,7 +178,7 @@ metadata:
178178
spec:
179179
template:
180180
spec:
181-
os: "${NODE_OS:=ubuntu_22_04}"
181+
os: "${NODE_OS:=ubuntu_20_04}"
182182
billingCycle: hourly
183183
machineType: "${WORKER_NODE_TYPE}"
184184
sshKeys:

‎test/e2e/config/packet-ci-actions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ variables:
147147
COREDNS_VERSION_UPGRADE_TO: "v1.9.3"
148148

149149
# Infra provider specific variables
150-
NODE_OS: "ubuntu_22_04"
150+
NODE_OS: "ubuntu_20_04"
151151
POD_CIDR: "192.168.0.0/16"
152152
SERVICE_CIDR: "172.26.0.0/16"
153153

‎test/e2e/config/packet-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ variables:
152152
COREDNS_VERSION_UPGRADE_TO: "v1.9.3"
153153

154154
# Infra provider specific variables
155-
NODE_OS: "ubuntu_22_04"
155+
NODE_OS: "ubuntu_20_04"
156156
POD_CIDR: "192.168.0.0/16"
157157
SERVICE_CIDR: "172.26.0.0/16"
158158

‎test/e2e/data/v1alpha3/bases/cluster-with-kcp-cpem.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ metadata:
4343
spec:
4444
template:
4545
spec:
46-
OS: "${NODE_OS:=ubuntu_22_04}"
46+
OS: "${NODE_OS:=ubuntu_20_04}"
4747
billingCycle: hourly
4848
machineType: "${CONTROLPLANE_NODE_TYPE}"
4949
sshKeys:

‎test/e2e/data/v1alpha3/bases/cluster-with-kcp-packet-ccm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ metadata:
4343
spec:
4444
template:
4545
spec:
46-
OS: "${NODE_OS:=ubuntu_22_04}"
46+
OS: "${NODE_OS:=ubuntu_20_04}"
4747
billingCycle: hourly
4848
machineType: "${CONTROLPLANE_NODE_TYPE}"
4949
sshKeys:

0 commit comments

Comments
 (0)