Skip to content

Commit

Permalink
Update k8s to 1.27.10 and os ubuntu to 22.04
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrea Aymon authored and JamesClonk committed Feb 14, 2024
1 parent dc84c8d commit b6bccfe
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion config.example.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
kubernetes:
hostname: "my-kubernetes.my-domain.com" # adjust to your hostname, make sure you have a valid DNS records pointing to the edge gateway beforehand
version: "1.26.6"
version: "1.27.10"
csi:
storage_profile: "Ultra Fast Storage A" # adjust to a storage profile of your choice, see "VCD UI -> Data Centers -> Storage -> Storage Policies"
oidc:
Expand Down
10 changes: 5 additions & 5 deletions kubeone.version.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
"kubeone": {
"major": "1",
"minor": "7",
"gitVersion": "1.7.0",
"gitCommit": "1195366fd0cf11f314d194a3b29b6a782afde9a8",
"gitVersion": "1.7.2",
"gitCommit": "00fd09d91da76e307f016afb3b4f42ad6281eb2c",
"gitTreeState": "",
"buildDate": "2023-09-08T14:02:33Z",
"goVersion": "go1.20.5",
"buildDate": "2024-01-05T15:30:12Z",
"goVersion": "go1.21.3",
"compiler": "gc",
"platform": "linux/amd64"
},
"machine_controller": {
"major": "1",
"minor": "57",
"gitVersion": "v1.57.3",
"gitVersion": "v1.57.4",
"gitCommit": "",
"gitTreeState": "",
"buildDate": "",
Expand Down
28 changes: 14 additions & 14 deletions machines/kubeone-worker-pool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ metadata:
cluster.k8s.io/cluster-api-autoscaler-node-group-min-size: "3"
k8c.io/operating-system-profile: osp-ubuntu
creationTimestamp: null
name: kubeone-worker-pool
name: kubeone-dev-worker-pool
namespace: kube-system
spec:
minReadySeconds: 0
replicas: 3
selector:
matchLabels:
workerset: kubeone-worker-pool
workerset: kubeone-dev-worker-pool
strategy:
rollingUpdate:
maxSurge: 1
Expand All @@ -28,40 +28,40 @@ spec:
v1.kubelet-config.machine-controller.kubermatic.io/SystemReserved: cpu=200m,memory=200Mi
creationTimestamp: null
labels:
workerset: kubeone-worker-pool
workerset: kubeone-dev-worker-pool
namespace: kube-system
spec:
metadata:
creationTimestamp: null
labels:
workerset: kubeone-worker-pool
workerset: kubeone-dev-worker-pool
providerSpec:
value:
cloudProvider: vmware-cloud-director
cloudProviderSpec:
allowInsecure: false
catalog: KubeOne
catalog: KubeOne DEV
cpuCores: 1
cpus: 4
diskSizeGB: 250
cpus: 2
diskSizeGB: 100
ipAllocationMode: DHCP
memoryMB: 8192
memoryMB: 4096
metadata:
KubeOneCluster: kubeone
network: kubeone-routed-network
KubeOneCluster: kubeone-dev
network: kubeone-dev-routed-network
organization: PRO-005019247
storageProfile: Ultra Fast Storage A
template: Ubuntu 20.04 Server
vapp: kubeone
template: Ubuntu 22.04 Server
vapp: kubeone-dev
vdc: kubernetes-demo
operatingSystem: ubuntu
operatingSystemSpec:
distUpgradeOnBoot: false
sshPublicKeys:
- |
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC2QKTfntKlsoo4ELBZgBLvIshQht2hzaQ7AGmJU2cxnt6cen7mwkqHkYA+ZoBBSi5DxcAGv1M5PX7ICiW8vdkHjStQzLXvXeov7YYKR9+WXBPhw5MF6O/PqW30Vf40EnRWdr0mlTcm/8BYai4DyJDNLayOxkefsVfhUDw42/nWK2uHEA/RzCLrYQhp4A6fP2YWXoGWNHzHuOfY1rea+TZkDStPcJQj07Qlvqpb9wk7O9VxaaxcsJbHQDpFzW4nWFYzb2AJUBbnQZoRDlx0GAYSVyEPXRIL7mpTUHKyZeLD5b46xvWyhynMGOfMChtihGX2ITdidLzd5WXs162pt0rhf/Y0aAwbgDN0R1UfS8l7dLiNojj4sZcZ717eEjaCGZUKBeNftHvKnF+G8YZHB3eOR2ryoNT2S5ZlwabJiOrP3V51us2KMlkvdeI81VeVLU+C39MY/jGipAkIsQil+XKLtw7HVSEZ+gH/3MmFeGrOM5wbiIatum15J0IGxGTma+E= admin@kubernetes
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCipOCiyYaAXFDGY4F6bDuafSBax+iXEID338Mms7movZvv37DVYOktbCx0OyoWoYNXmm1w3s7MqqnEQYtYzB/qNWRkm2dBTRqvw8bMuvEa0srfo5sX/g7EuljsvpKG7rYoZXNk7+7lU7Bx4RRi2K7fKrQ8e30Mi9yjai3QHK5G8NTo0gapzdReb9NiTPofW39G3jm7U2B5gqzpbleUyrxfuNEv6iyayR7UXLcgCeEPH0vAhnXKnPgFSSL0dO8FbDUXvWCZlNmkDG8c18iRSfclHDqG2y9Nw7bd2sQnGM/z3mrAdlVlWgj9Vtx2OC/xGB1dBLwRuukiOT9rDGN/f4U+f2hwXgIr8LWVfKJqYbXf8ICePdw1O+iA9pDqIj7T3CbSumqL4+cmmZhea7Xp7Udy9Bf83Zl0NIibu6oidD/UNCcD9zCkdkHKAY28jZq4qSgHRA31hB25Fk2PpSHDdmGI2IyaGx8V4N92J4f5nYD/CkVDVLxmtcBD+FgXrwzResEJR0ftn9xjjP+SmE8iiW7MwqRil86EOsaQ0Po3vG2x7JTsQJrxwhf2nC2v6dhcaLjTsl6BwOq95+JzRHrniOhXe2sIl4AZRdKwjxADUYU0f7IiH5Ef+BwA8n5jMG0P5fha/S0BQhbhhvwvlb3UZGlirzTjFytdPQ/yz/ouhN+iFQ== tgdbefa3@ULXGWP007
versions:
kubelet: 1.26.6
kubelet: 1.27.10
status: {}

---
Expand Down
40 changes: 20 additions & 20 deletions terraform/output.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"external_ip": {
"sensitive": false,
"type": "string",
"value": "164.128.161.20"
"value": "164.128.146.156"
},
"kubeone_api": {
"sensitive": false,
Expand All @@ -20,9 +20,9 @@
],
"value": {
"apiserver_alternative_names": [
"kubeone-demo.kube-plus.cloud"
"kubeone-dev.kube-plus.cloud"
],
"endpoint": "kubeone-demo.kube-plus.cloud"
"endpoint": "kubeone-dev.kube-plus.cloud"
}
},
"kubeone_hosts": {
Expand Down Expand Up @@ -66,15 +66,15 @@
],
"value": {
"control_plane": {
"bastion": "164.128.161.20",
"bastion": "164.128.146.156",
"bastion_port": 2222,
"bastion_user": "ubuntu",
"cloud_provider": "vmwareCloudDirector",
"cluster_name": "kubeone",
"cluster_name": "kubeone-dev",
"hostnames": [
"kubeone-cp-1",
"kubeone-cp-2",
"kubeone-cp-3"
"kubeone-dev-cp-1",
"kubeone-dev-cp-2",
"kubeone-dev-cp-3"
],
"private_address": [
"192.168.1.10",
Expand All @@ -86,7 +86,7 @@
"ssh_private_key_file": "ssh_key_id_rsa",
"ssh_user": "ubuntu",
"storage_profile": "Ultra Fast Storage A with Backup",
"vapp_name": "kubeone"
"vapp_name": "kubeone-dev"
}
}
},
Expand All @@ -95,7 +95,7 @@
"type": [
"object",
{
"kubeone-worker-pool": [
"kubeone-dev-worker-pool": [
"object",
{
"providerSpec": [
Expand Down Expand Up @@ -163,7 +163,7 @@
}
],
"value": {
"kubeone-worker-pool": {
"kubeone-dev-worker-pool": {
"providerSpec": {
"annotations": {
"cluster.k8s.io/cluster-api-autoscaler-node-group-max-size": "5",
Expand All @@ -172,20 +172,20 @@
},
"cloudProviderSpec": {
"allowInsecure": false,
"catalog": "KubeOne",
"catalog": "KubeOne DEV",
"cpuCores": 1,
"cpus": 4,
"diskSizeGB": 250,
"cpus": 2,
"diskSizeGB": 100,
"ipAllocationMode": "DHCP",
"memoryMB": 8192,
"memoryMB": 4096,
"metadata": {
"KubeOneCluster": "kubeone"
"KubeOneCluster": "kubeone-dev"
},
"network": "kubeone-routed-network",
"network": "kubeone-dev-routed-network",
"organization": "PRO-005019247",
"storageProfile": "Ultra Fast Storage A",
"template": "Ubuntu 20.04 Server",
"vapp": "kubeone",
"template": "Ubuntu 22.04 Server",
"vapp": "kubeone-dev",
"vdc": "kubernetes-demo"
},
"machineObjectAnnotations": {
Expand All @@ -199,7 +199,7 @@
"distUpgradeOnBoot": false
},
"sshPublicKeys": [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC2QKTfntKlsoo4ELBZgBLvIshQht2hzaQ7AGmJU2cxnt6cen7mwkqHkYA+ZoBBSi5DxcAGv1M5PX7ICiW8vdkHjStQzLXvXeov7YYKR9+WXBPhw5MF6O/PqW30Vf40EnRWdr0mlTcm/8BYai4DyJDNLayOxkefsVfhUDw42/nWK2uHEA/RzCLrYQhp4A6fP2YWXoGWNHzHuOfY1rea+TZkDStPcJQj07Qlvqpb9wk7O9VxaaxcsJbHQDpFzW4nWFYzb2AJUBbnQZoRDlx0GAYSVyEPXRIL7mpTUHKyZeLD5b46xvWyhynMGOfMChtihGX2ITdidLzd5WXs162pt0rhf/Y0aAwbgDN0R1UfS8l7dLiNojj4sZcZ717eEjaCGZUKBeNftHvKnF+G8YZHB3eOR2ryoNT2S5ZlwabJiOrP3V51us2KMlkvdeI81VeVLU+C39MY/jGipAkIsQil+XKLtw7HVSEZ+gH/3MmFeGrOM5wbiIatum15J0IGxGTma+E= admin@kubernetes\n"
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCipOCiyYaAXFDGY4F6bDuafSBax+iXEID338Mms7movZvv37DVYOktbCx0OyoWoYNXmm1w3s7MqqnEQYtYzB/qNWRkm2dBTRqvw8bMuvEa0srfo5sX/g7EuljsvpKG7rYoZXNk7+7lU7Bx4RRi2K7fKrQ8e30Mi9yjai3QHK5G8NTo0gapzdReb9NiTPofW39G3jm7U2B5gqzpbleUyrxfuNEv6iyayR7UXLcgCeEPH0vAhnXKnPgFSSL0dO8FbDUXvWCZlNmkDG8c18iRSfclHDqG2y9Nw7bd2sQnGM/z3mrAdlVlWgj9Vtx2OC/xGB1dBLwRuukiOT9rDGN/f4U+f2hwXgIr8LWVfKJqYbXf8ICePdw1O+iA9pDqIj7T3CbSumqL4+cmmZhea7Xp7Udy9Bf83Zl0NIibu6oidD/UNCcD9zCkdkHKAY28jZq4qSgHRA31hB25Fk2PpSHDdmGI2IyaGx8V4N92J4f5nYD/CkVDVLxmtcBD+FgXrwzResEJR0ftn9xjjP+SmE8iiW7MwqRil86EOsaQ0Po3vG2x7JTsQJrxwhf2nC2v6dhcaLjTsl6BwOq95+JzRHrniOhXe2sIl4AZRdKwjxADUYU0f7IiH5Ef+BwA8n5jMG0P5fha/S0BQhbhhvwvlb3UZGlirzTjFytdPQ/yz/ouhN+iFQ== tgdbefa3@ULXGWP007\n"
]
},
"replicas": 3
Expand Down
4 changes: 2 additions & 2 deletions terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,13 @@ variable "catalog_name" {

variable "template_name" {
description = "Name of the vApp template to use"
default = "Ubuntu 20.04 Server"
default = "Ubuntu 22.04 Server"
type = string
}

variable "os_image_url" {
description = "URL of the OS image to upload"
default = "https://dcs-kubernetes.scapp.swisscom.com/ubuntu-20.04-server-cloudimg-amd64.ovf"
default = "https://dcs-kubernetes.scapp.swisscom.com/ubuntu-22.04-server-cloudimg-amd64.ovf"
type = string
}

Expand Down
6 changes: 3 additions & 3 deletions tools/install_tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ if [ ${OS} == "Darwin" ]; then
install_tool "jq" "https://github.com/stedolan/jq/releases/download/jq-1.6/jq-osx-amd64" "5c0a0a3ea600f302ee458b30317425dd9632d1ad8882259fcaf4e9b868b2b1ef"
install_tool "yq" "https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_darwin_arm64" "929e0a774d4fbe1fd05fa4284524f2455e4ec1b8b01360099b36c4b3f2a18c57"
install_tool_from_zipfile "kubelogin" "kubectl-oidc_login" "https://github.com/int128/kubelogin/releases/download/v1.28.0/kubelogin_darwin_arm64.zip" "98b5638f860e8ac026f411a1831773c7e1741d3e37f7cfbb6d63d91dc89796b1"
install_tool_from_zipfile "kubeone" "kubeone" "https://github.com/kubermatic/kubeone/releases/download/v1.7.0/kubeone_1.7.0_darwin_arm64.zip" "858eac50c003b7f77f52d97797b3385303d24c6f4b25f5a56fc81e7b044b090b"
install_tool_from_zipfile "kubeone" "kubeone" "https://github.com/kubermatic/kubeone/releases/download/v1.7.2/kubeone_1.7.2_darwin_arm64.zip" "31bce22e6d6ef999538bc13400da3392ac91b21fbbdd02317d0b06dee66a6e95"
install_tool_from_zipfile "terraform" "terraform" "https://releases.hashicorp.com/terraform/1.2.9/terraform_1.2.9_darwin_arm64.zip" "98f73281fd89a4bac7426149b9f2de8df492eb660b9441f445894dd112fd2c5c"
install_tool_from_tarball "darwin-arm64/helm" "helm" "https://get.helm.sh/helm-v3.10.3-darwin-arm64.tar.gz" "b5176d9b89ff43ac476983f58020ee2407ed0cbb5b785f928a57ff01d2c63754"
install_tool_from_tarball "trivy" "trivy" "https://github.com/aquasecurity/trivy/releases/download/v0.44.0/trivy_0.44.0_macOS-ARM64.tar.gz" "452af0f9d12daa82c3621008d1bd489e4f1bfdde277a534b507e9888c67df4c6"
Expand All @@ -98,7 +98,7 @@ if [ ${OS} == "Darwin" ]; then
install_tool "jq" "https://github.com/stedolan/jq/releases/download/jq-1.6/jq-osx-amd64" "5c0a0a3ea600f302ee458b30317425dd9632d1ad8882259fcaf4e9b868b2b1ef"
install_tool "yq" "https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_darwin_amd64" "73b0d5a2a43fdcdca51413ae47cbcacdd6dbfd92a46116ee963f362c798e9cb8"
install_tool_from_zipfile "kubelogin" "kubectl-oidc_login" "https://github.com/int128/kubelogin/releases/download/v1.28.0/kubelogin_darwin_amd64.zip" "3b12377314085fb1a035150352e27a4979115ac61357d2d851984b749f06cd4e"
install_tool_from_zipfile "kubeone" "kubeone" "https://github.com/kubermatic/kubeone/releases/download/v1.7.0/kubeone_1.7.0_darwin_amd64.zip" "d0007a0ad0e1bf98cd2015719f950ae6ca0bb78479c136f6df61d333d08da15e"
install_tool_from_zipfile "kubeone" "kubeone" "https://github.com/kubermatic/kubeone/releases/download/v1.7.2/kubeone_1.7.2_darwin_amd64.zip" "619bd0c23ac07189766eb66af40e9a9daf4257b7c321a6a85c37cbd139f2da39"
install_tool_from_zipfile "terraform" "terraform" "https://releases.hashicorp.com/terraform/1.2.9/terraform_1.2.9_darwin_amd64.zip" "4b7b4179653c5d501818d8523575e86e60f901506b986d035f2aa6870a810f24"
install_tool_from_tarball "darwin-amd64/helm" "helm" "https://get.helm.sh/helm-v3.10.3-darwin-amd64.tar.gz" "8f422d213a9f3530fe516c8b69be74059d89b9954b1afadb9ae6dc81edb52615"
install_tool_from_tarball "trivy" "trivy" "https://github.com/aquasecurity/trivy/releases/download/v0.44.0/trivy_0.44.0_macOS-64bit.tar.gz" "f1f76bc145e7079410570172a43c1b35bea77a5d8e2ffd15991020ac26dfc4d0"
Expand All @@ -109,7 +109,7 @@ else
install_tool "jq" "https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64" "af986793a515d500ab2d35f8d2aecd656e764504b789b66d7e1a0b727a124c44"
install_tool "yq" "https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64" "1952f93323e871700325a70610d2b33bafae5fe68e6eb4aec0621214f39a4c1e"
install_tool_from_zipfile "kubelogin" "kubectl-oidc_login" "https://github.com/int128/kubelogin/releases/download/v1.28.0/kubelogin_linux_amd64.zip" "27f50c9dbebb060afa8ce9c2d30c5b56de319c803749716c273536c688eaed91"
install_tool_from_zipfile "kubeone" "kubeone" "https://github.com/kubermatic/kubeone/releases/download/v1.7.0/kubeone_1.7.0_linux_amd64.zip" "60d02e47446dade6ca52e2131cf0cd445014df1715882f2e331f952ec4ce928b"
install_tool_from_zipfile "kubeone" "kubeone" "https://github.com/kubermatic/kubeone/releases/download/v1.7.2/kubeone_1.7.2_linux_amd64.zip" "9658874d7ad52a14b9c2231eb842bdbdfeae5946e41593d1a61b6c52980e9435"
install_tool_from_zipfile "terraform" "terraform" "https://releases.hashicorp.com/terraform/1.2.9/terraform_1.2.9_linux_amd64.zip" "70fa1a9c71347e7b220165b9c06df0a55f5af57dad8135f14808b343d1b5924a"
install_tool_from_tarball "linux-amd64/helm" "helm" "https://get.helm.sh/helm-v3.10.3-linux-amd64.tar.gz" "cc5223b23fd2ccdf4c80eda0acac7a6a5c8cdb81c5b538240e85fe97aa5bc3fb"
install_tool_from_tarball "trivy" "trivy" "https://github.com/aquasecurity/trivy/releases/download/v0.44.0/trivy_0.44.0_Linux-64bit.tar.gz" "5b767ba1b0c398354294aabc43280a206dd5bc6e4b075e0d046f23d0e1003764"
Expand Down

0 comments on commit b6bccfe

Please sign in to comment.