Deprecate CentOS distros

electrocucaracha · Oct 5, 2024 · 186389e · 186389e
1 parent 26d4b8c
commit 186389e
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -24,9 +24,8 @@ different scenarios. There are different setups located in the
 | Name       | Version           |
 |:-----------|:-----------------:|
 | Ubuntu     | 18.04/20.04/22.04 |
-| CentOS     | 7/8               |
 | openSUSE   | Leap              |
-| Fedora     | 37/38             |
+| Fedora     | 37/38/39/40       |
 
 ## Components
 

diff --git a/ci/bootstrap.sh b/ci/bootstrap.sh
@@ -31,7 +31,7 @@ if [[ ${TEST_MULTINODE:-false} == "false" ]]; then
 - name: aio
   os:
     name: ${OS:-ubuntu}
-    release: ${RELEASE:-bionic}
+    release: ${RELEASE:-jammy}
   networks:
     - name: public-net
       ip: "10.10.16.3"
@@ -80,7 +80,7 @@ else
 - name: controller
   os:
     name: ${OS:-ubuntu}
-    release: ${RELEASE:-bionic}
+    release: ${RELEASE:-jammy}
   networks:
     - name: public-net
       ip: "10.10.16.3"
@@ -108,7 +108,7 @@ EOL
 - name: worker0${i}
   os:
     name: ${OS:-ubuntu}
-    release: ${RELEASE:-bionic}
+    release: ${RELEASE:-jammy}
   networks:
     - name: public-net
       ip: "10.10.16.$((i + 3))"

diff --git a/ci/update_distros.sh b/ci/update_distros.sh
@@ -84,9 +84,6 @@ cat <<EOT >.distros_supported.yml
 ##############################################################################
 EOT
 
-echo "centos:" >>.distros_supported.yml
-_vagrant_pull "7" "generic/centos7"
-_vagrant_pull "8" "generic/centos8"
 echo "ubuntu:" >>.distros_supported.yml
 _vagrant_pull "bionic" "generic/ubuntu1804"
 _vagrant_pull "focal" "generic/ubuntu2004"
@@ -96,6 +93,8 @@ _vagrant_pull "leap" "generic/opensuse15"
 echo "fedora:" >>.distros_supported.yml
 _vagrant_pull "37" "fedora/37-cloud-base"
 _vagrant_pull "38" "fedora/38-cloud-base"
+_vagrant_pull "39" "fedora/39-cloud-base"
+_vagrant_pull "40" "fedora/40-cloud-base"
 
 if [ "$msg" ]; then
     echo -e "$msg"

diff --git a/config/default.yml b/config/default.yml
@@ -9,8 +9,8 @@
 ##############################################################################
 - name: "controller01"
   os:
-    name: centos
-    release: 7
+    name: ubuntu
+    release: jammy
   networks:
     - name: public-net
       ip: "10.10.16.3"
@@ -21,8 +21,8 @@
     - etcd
 - name: "controller02"
   os:
-    name: centos
-    release: 7
+    name: ubuntu
+    release: jammy
   networks:
     - name: public-net
       ip: "10.10.16.4"
@@ -33,8 +33,8 @@
     - etcd
 - name: "controller03"
   os:
-    name: centos
-    release: 7
+    name: ubuntu
+    release: jammy
   networks:
     - name: public-net
       ip: "10.10.16.5"

diff --git a/config/samples/pdf.yml.distros b/config/samples/pdf.yml.distros
@@ -1,7 +1,7 @@
 - name: controller
   os:
     name: ubuntu
-    release: focal
+    release: jammy
   networks:
     - name: public-net
       ip: "10.10.16.3"
@@ -21,10 +21,10 @@
   roles:
     - kube-master
     - etcd
-- name: ubuntu16
+- name: ubuntu18
   os:
     name: ubuntu
-    release: focal
+    release: bionic
   networks:
     - name: public-net
       ip: "10.10.16.4"
@@ -43,10 +43,10 @@
       device: 0
   roles:
     - kube-node
-- name: ubuntu18
+- name: ubuntu20
   os:
     name: ubuntu
-    release: bionic
+    release: focal
   networks:
     - name: public-net
       ip: "10.10.16.5"
@@ -65,10 +65,10 @@
       device: 0
   roles:
     - kube-node
-- name: ubuntu20
+- name: ubuntu22
   os:
     name: ubuntu
-    release: focal
+    release: jammy
   networks:
     - name: public-net
       ip: "10.10.16.6"
@@ -109,10 +109,10 @@
       device: 0
   roles:
     - kube-node
-- name: fedora34
+- name: fedora37
   os:
     name: fedora
-    release: 34
+    release: 37
   networks:
     - name: public-net
       ip: "10.10.16.8"
@@ -131,10 +131,10 @@
       device: 0
   roles:
     - kube-node
-- name: fedora35
+- name: fedora38
   os:
     name: fedora
-    release: 35
+    release: 38
   networks:
     - name: public-net
       ip: "10.10.16.9"
@@ -153,10 +153,10 @@
       device: 0
   roles:
     - kube-node
-- name: centos7
+- name: fedora39
   os:
-    name: centos
-    release: 7
+    name: fedora39
+    release: 39
   networks:
     - name: public-net
       ip: "10.10.16.10"
@@ -175,10 +175,10 @@
       device: 0
   roles:
     - kube-node
-- name: centos8
+- name: fedora40
   os:
-    name: centos
-    release: 8
+    name: fedora
+    release: 40
   networks:
     - name: public-net
       ip: "10.10.16.11"

diff --git a/config/samples/pdf.yml.localai b/config/samples/pdf.yml.localai
@@ -2,7 +2,7 @@
 - name: aio
   os:
     name: ubuntu
-    release: bionic
+    release: jammy
   networks:
     - name: public-net
       ip: "10.10.16.3"

diff --git a/config/samples/pdf.yml.mini b/config/samples/pdf.yml.mini
@@ -10,8 +10,8 @@
 
 - name: master
   os:
-    name: centos
-    release: 7
+    name: ubuntu
+    release: jammy
   networks:
     - name: public-net
       ip: "10.10.16.3"
@@ -22,8 +22,8 @@
     - etcd
 - name: minion01
   os:
-    name: centos
-    release: 7
+    name: ubuntu
+    release: jammy
   networks:
     - name: public-net
       ip: "10.10.16.4"
@@ -33,8 +33,8 @@
     - kube-node
 - name: minion02
   os:
-    name: centos
-    release: 7
+    name: ubuntu
+    release: jammy
   networks:
     - name: public-net
       ip: "10.10.16.5"

diff --git a/distros_supported.yml b/distros_supported.yml
@@ -7,13 +7,6 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-centos:
-  7:
-    name: generic/centos7
-    version: "4.3.12"
-  8:
-    name: generic/centos8
-    version: "4.3.12"
 ubuntu:
   bionic:
     name: generic/ubuntu1804
@@ -35,3 +28,9 @@ fedora:
   38:
     name: fedora/38-cloud-base
     version: "38.20230413.1"
+  39:
+    name: fedora/39-cloud-base
+    version: "39.20231031.1"
+  40:
+    name: fedora/40-cloud-base
+    version: "40.20240414.0"