From: Todd Malsbary Date: Wed, 3 Nov 2021 17:19:12 +0000 (-0700) Subject: Update provisioned OS to Ubuntu 20.04 X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=308b436e60c4f9477641a196fe5a53996fd9bc92;p=icn.git Update provisioned OS to Ubuntu 20.04 Signed-off-by: Todd Malsbary Change-Id: I4279dd565e796b28e1e33484a6a64ecaf99cf3a2 --- diff --git a/README.md b/README.md index 242156b..3f76e11 100644 --- a/README.md +++ b/README.md @@ -149,7 +149,7 @@ ICN provides DHCP servers for the provisioning network. "address": "10.10.10.11" }, "os": { - "image_name": "bionic-server-cloudimg-amd64.img", + "image_name": "focal-server-cloudimg-amd64.img", "username": "ubuntu", "password": "mypasswd" }, @@ -203,7 +203,7 @@ ICN provides DHCP servers for the provisioning network. "address": "10.10.10.12" }, "os": { - "image_name": "bionic-server-cloudimg-amd64.img", + "image_name": "focal-server-cloudimg-amd64.img", "username": "ubuntu", "password": "mypasswd" }, diff --git a/deploy/clusters/ha-dhcp-values.yaml b/deploy/clusters/ha-dhcp-values.yaml index bee2c39..b001dad 100644 --- a/deploy/clusters/ha-dhcp-values.yaml +++ b/deploy/clusters/ha-dhcp-values.yaml @@ -70,14 +70,14 @@ clusters: # # Refer to the below for further information: # - https://github.com/kubernetes/kubernetes/blob/master/build/dependencies.yaml - # - https://download.docker.com/linux/ubuntu/dists/bionic/stable/binary-amd64/Packages + # - https://download.docker.com/linux/ubuntu/dists/focal/stable/binary-amd64/Packages # # The OS image. - imageName: bionic-server-cloudimg-amd64.img + imageName: focal-server-cloudimg-amd64.img # The version of Kubernetes installed. k8sVersion: v1.21.6 # The version of the kubelet, kubeadm, and kubectl packages. kubeVersion: 1.21.6-00 # The version of the CRI installed. containerdVersion: 1.4.11-1 - dockerVersion: 5:20.10.10~3-0~ubuntu-bionic + dockerVersion: 5:20.10.10~3-0~ubuntu-focal diff --git a/deploy/clusters/static-values.yaml b/deploy/clusters/static-values.yaml index 6a2fad0..4df5373 100644 --- a/deploy/clusters/static-values.yaml +++ b/deploy/clusters/static-values.yaml @@ -66,14 +66,14 @@ clusters: # # Refer to the below for further information: # - https://github.com/kubernetes/kubernetes/blob/master/build/dependencies.yaml - # - https://download.docker.com/linux/ubuntu/dists/bionic/stable/binary-amd64/Packages + # - https://download.docker.com/linux/ubuntu/dists/focal/stable/binary-amd64/Packages # # The OS image. - imageName: bionic-server-cloudimg-amd64.img + imageName: focal-server-cloudimg-amd64.img # The version of Kubernetes installed. k8sVersion: v1.21.6 # The version of the kubelet, kubeadm, and kubectl packages. kubeVersion: 1.21.6-00 # The version of the CRI installed. containerdVersion: 1.4.11-1 - dockerVersion: 5:20.10.10~3-0~ubuntu-bionic + dockerVersion: 5:20.10.10~3-0~ubuntu-focal diff --git a/deploy/machines/example-values.yaml b/deploy/machines/example-values.yaml index 7d6b16c..3c68b2d 100644 --- a/deploy/machines/example-values.yaml +++ b/deploy/machines/example-values.yaml @@ -8,7 +8,7 @@ machines: bootMACAddress: 52:54:00:2b:bc:3a # Optional - imageName: bionic-server-cloudimg-amd64.img + imageName: focal-server-cloudimg-amd64.img # Optional networks: diff --git a/deploy/metal3/scripts/nodes.json.sample b/deploy/metal3/scripts/nodes.json.sample index 43010b9..ce2402a 100644 --- a/deploy/metal3/scripts/nodes.json.sample +++ b/deploy/metal3/scripts/nodes.json.sample @@ -8,7 +8,7 @@ "address": "10.10.110.12" }, "os": { - "image_name": "bionic-server-cloudimg-amd64.img", + "image_name": "focal-server-cloudimg-amd64.img", "username": "ubuntu", "password": "mypasswd" }, @@ -62,7 +62,7 @@ "address": "10.10.110.13" }, "os": { - "image_name": "bionic-server-cloudimg-amd64.img", + "image_name": "focal-server-cloudimg-amd64.img", "username": "ubuntu", "password": "mypasswd" }, diff --git a/deploy/site/vm/clusters-values.yaml b/deploy/site/vm/clusters-values.yaml index d0278f4..dd8baaf 100644 --- a/deploy/site/vm/clusters-values.yaml +++ b/deploy/site/vm/clusters-values.yaml @@ -27,8 +27,8 @@ clusters: containerRuntime: containerd podCidr: 10.244.64.0/18 cni: flannel - imageName: bionic-server-cloudimg-amd64.img + imageName: focal-server-cloudimg-amd64.img k8sVersion: v1.21.6 kubeVersion: 1.21.6-00 containerdVersion: 1.4.11-1 - dockerVersion: 5:20.10.10~3-0~ubuntu-bionic + dockerVersion: 5:20.10.10~3-0~ubuntu-focal diff --git a/env/lib/common.sh b/env/lib/common.sh index 1e633b6..56d19ba 100755 --- a/env/lib/common.sh +++ b/env/lib/common.sh @@ -9,8 +9,8 @@ IRONIC_INTERFACE=${IRONIC_INTERFACE:-} IRONIC_PROVISIONING_INTERFACE=${IRONIC_PROVISIONING_INTERFACE:-"provisioning"} IRONIC_IPMI_INTERFACE=${IRONIC_IPMI_INTERFACE:-} IRONIC_PROVISIONING_INTERFACE_IP=${IRONIC_PROVISIONING_INTERFACE_IP:-"172.22.0.1"} -BM_IMAGE_URL=${BM_IMAGE_URL:-"https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img"} -BM_IMAGE=${BM_IMAGE:-"bionic-server-cloudimg-amd64.img"} +BM_IMAGE_URL=${BM_IMAGE_URL:-"https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"} +BM_IMAGE=${BM_IMAGE:-"focal-server-cloudimg-amd64.img"} #Baremetal operator repository URL BMOREPO="${BMOREPO:-https://github.com/metal3-io/baremetal-operator.git}" diff --git a/tools/vagrant/create_nodes_json_sample.sh b/tools/vagrant/create_nodes_json_sample.sh index b0ed2b4..e1a9948 100755 --- a/tools/vagrant/create_nodes_json_sample.sh +++ b/tools/vagrant/create_nodes_json_sample.sh @@ -27,7 +27,7 @@ for ((i=1;i<=num_machines;++i)); do "address": "${ipmi_host}:${ipmi_port}" }, "os": { - "image_name": "bionic-server-cloudimg-amd64.img", + "image_name": "focal-server-cloudimg-amd64.img", "username": "ubuntu", "password": "mypasswd" },