summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
b186c13)
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I4279dd565e796b28e1e33484a6a64ecaf99cf3a2
"address": "10.10.10.11"
},
"os": {
"address": "10.10.10.11"
},
"os": {
- "image_name": "bionic-server-cloudimg-amd64.img",
+ "image_name": "focal-server-cloudimg-amd64.img",
"username": "ubuntu",
"password": "mypasswd"
},
"username": "ubuntu",
"password": "mypasswd"
},
"address": "10.10.10.12"
},
"os": {
"address": "10.10.10.12"
},
"os": {
- "image_name": "bionic-server-cloudimg-amd64.img",
+ "image_name": "focal-server-cloudimg-amd64.img",
"username": "ubuntu",
"password": "mypasswd"
},
"username": "ubuntu",
"password": "mypasswd"
},
#
# Refer to the below for further information:
# - https://github.com/kubernetes/kubernetes/blob/master/build/dependencies.yaml
#
# 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
- 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
# 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
#
# Refer to the below for further information:
# - https://github.com/kubernetes/kubernetes/blob/master/build/dependencies.yaml
#
# 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
- 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
# 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
bootMACAddress: 52:54:00:2b:bc:3a
# Optional
bootMACAddress: 52:54:00:2b:bc:3a
# Optional
- imageName: bionic-server-cloudimg-amd64.img
+ imageName: focal-server-cloudimg-amd64.img
"address": "10.10.110.12"
},
"os": {
"address": "10.10.110.12"
},
"os": {
- "image_name": "bionic-server-cloudimg-amd64.img",
+ "image_name": "focal-server-cloudimg-amd64.img",
"username": "ubuntu",
"password": "mypasswd"
},
"username": "ubuntu",
"password": "mypasswd"
},
"address": "10.10.110.13"
},
"os": {
"address": "10.10.110.13"
},
"os": {
- "image_name": "bionic-server-cloudimg-amd64.img",
+ "image_name": "focal-server-cloudimg-amd64.img",
"username": "ubuntu",
"password": "mypasswd"
},
"username": "ubuntu",
"password": "mypasswd"
},
containerRuntime: containerd
podCidr: 10.244.64.0/18
cni: flannel
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
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
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"}
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}"
#Baremetal operator repository URL
BMOREPO="${BMOREPO:-https://github.com/metal3-io/baremetal-operator.git}"
"address": "${ipmi_host}:${ipmi_port}"
},
"os": {
"address": "${ipmi_host}:${ipmi_port}"
},
"os": {
- "image_name": "bionic-server-cloudimg-amd64.img",
+ "image_name": "focal-server-cloudimg-amd64.img",
"username": "ubuntu",
"password": "mypasswd"
},
"username": "ubuntu",
"password": "mypasswd"
},