diff --git a/docs/src/topics/omi.md b/docs/src/topics/omi.md index 9b9e89b83..ba54612ff 100644 --- a/docs/src/topics/omi.md +++ b/docs/src/topics/omi.md @@ -11,13 +11,10 @@ New OMI will be builded and publish every two weeks for each supported Os Distri ## Current available image: ubuntu: -- ubuntu-2004-2004-kubernetes-v1.28.0-2023-08-16 -- ubuntu-2004-2004-kubernetes-v1.21.14-2022-10-13 - ubuntu-2004-2004-kubernetes-v1.22.11-2022-08-22 -- ubuntu-2004-2004-kubernetes-v1.22.11-2022-10-13 -- ubuntu-2004-2004-kubernetes-v1.23.8-2022-10-13 -- ubuntu-2004-2004-kubernetes-v1.24.2-2022-10-13 -- ubuntu-2004-2004-kubernetes-v1.25.2-2022-10-13 +- ubuntu-2204-2004-kubernetes-v1.23.8-2023-02-10 +- ubuntu-2004-2004-kubernetes-v1.25.9-2023-04-14 +- ubuntu-2004-2004-kubernetes-v1.28.0-2023-08-16 ## Supported Image on CloudGov: - ubuntu-2004-2004-kubernetes-v1.22.11-2022-11-23 diff --git a/example/cluster-machine-template-simple-taint.yaml b/example/cluster-machine-template-simple-taint.yaml index c38dea3d6..f6a830c2a 100644 --- a/example/cluster-machine-template-simple-taint.yaml +++ b/example/cluster-machine-template-simple-taint.yaml @@ -320,10 +320,10 @@ spec: kubeadmConfigSpec: initConfiguration: nodeRegistration: - taints: - - key: "key1" - value: "value1" - effect: "NoSchedule" + taints: + - key: "key1" + value: "value1" + effect: "NoSchedule" kubeletExtraArgs: cloud-provider: external provider-id: aws://'{{ ds.meta_data.placement.availability_zone }}'/'{{ ds.meta_data.instance_id }}' @@ -339,10 +339,10 @@ spec: permissions: "0744" joinConfiguration: nodeRegistration: - taints: - - key: "key1" - value: "value1" - effect: "NoSchedule" + taints: + - key: "key1" + value: "value1" + effect: "NoSchedule" kubeletExtraArgs: cloud-provider: external provider-id: aws://'{{ ds.meta_data.placement.availability_zone }}'/'{{ ds.meta_data.instance_id }}' diff --git a/test/e2e/config/outscale.yaml b/test/e2e/config/outscale.yaml index 847017913..ce2c9acc7 100644 --- a/test/e2e/config/outscale.yaml +++ b/test/e2e/config/outscale.yaml @@ -90,8 +90,8 @@ variables: KUBERNETES_VERSION_UPGRADE_FROM: "v1.22.11" KUBERNETES_VERSION_UPGRADE_TO: "v1.23.8" TEMPLATE_PATH: "${PWD}/test/e2e/data/infrastructure-outscale/cluster-template-with-clusterclass.yaml" - KUBERNETES_IMAGE_UPGRADE_FROM: "${IMG_UPGRADE_FROM:ami-d3470f3f}" - KUBERNETES_IMAGE_UPGRADE_TO: "${IMG_UPGRADE_TO:ami-58b89b08}" + KUBERNETES_IMAGE_UPGRADE_FROM: "${IMG_UPGRADE_FROM:ami-e1a786f1}" + KUBERNETES_IMAGE_UPGRADE_TO: "${IMG_UPGRADE_TO:ami-a56b2f36" CONTROL_PLANE_MACHINE_TEMPLATE_UPGRADE_TO: "cp-k8s-upgrade-and-conformance" WORKERS_MACHINE_TEMPLATE_UPGRADE_TO: "worker-k8s-upgrade-and-conformance" CONFORMANCE_WORKER_MACHINE_COUNT: 2