Upgrade Kubernetes to v1.28.3

wise2c-devops · Feb 14, 2024 · e0f19a1 · e0f19a1
1 parent 67799e0
commit e0f19a1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ jobs:
   build-branches-amd64:
     environment:
       CEPH_VERSION: '18.2.1'
-      KUBE_VERSION: '1.28.6'
+      KUBE_VERSION: '1.28.3'
       DOCKER_VERSION: '25.0.3-1'
       CRIO_MAJOR_VERSION: '1.28'
       CRIO_VERSION: '1.28.3'
@@ -65,7 +65,7 @@ jobs:
   build-tags-amd64:
     environment:
       CEPH_VERSION: '18.2.1'
-      KUBE_VERSION: '1.28.6'
+      KUBE_VERSION: '1.28.3'
       DOCKER_VERSION: '25.0.3-1'
       CRIO_MAJOR_VERSION: '1.28'
       CRIO_VERSION: '1.28.3'
@@ -128,7 +128,7 @@ jobs:
   build-branches-aarch64:
     environment:
       CEPH_VERSION: '18.2.1'
-      KUBE_VERSION: '1.28.6'
+      KUBE_VERSION: '1.28.3'
       DOCKER_VERSION: '25.0.3-1'
       CRIO_MAJOR_VERSION: '1.28'
       CRIO_VERSION: '1.28.3'
@@ -193,7 +193,7 @@ jobs:
   build-tags-aarch64:
     environment:
       CEPH_VERSION: '18.2.1'
-      KUBE_VERSION: '1.28.6'
+      KUBE_VERSION: '1.28.3'
       DOCKER_VERSION: '25.0.3-1'
       CRIO_MAJOR_VERSION: '1.28'
       CRIO_VERSION: '1.28.3'

diff --git a/README.md b/README.md
@@ -23,11 +23,21 @@ enabled=1
 
 gpgcheck=0
 
-[wise2c-crio]
+[wise2c-docker]
 
-name=wise2c-crio
+name=wise2c-docker
 
-baseurl=http://repo-server-ip:2009/rpms/crio/centos9
+baseurl=http://repo-server-ip:2009/rpms/docker/centos9
+
+enabled=1
+
+gpgcheck=0
+
+[wise2c-ceph]
+
+name=wise2c-ceph
+
+baseurl=http://repo-server-ip:2009/rpms/ceph/centos9
 
 enabled=1
 
@@ -39,12 +49,12 @@ gpgcheck=0
 
 然后就可以直接用yum install命令命令安装相关软件了。例如：
 
-yum --disablerepo=* --enablerepo=wise2c-k8s install docker-ce docker-ce-cli docker-python docker-compose
-
 yum --disablerepo=* --enablerepo=wise2c-k8s install rsync python-chardet jq nfs-utils
 
 yum --disablerepo=* --enablerepo=wise2c-k8s install kubernetes-cni kubectl kubelet kubeadm
 
-yum --disablerepo=* --enablerepo=wise2c-k8s install ceph-deploy ceph ceph-radosgw rbd-nbd rbd-mirror
+yum --disablerepo=* --enablerepo=wise2c-k8s install cri-o podman crun
+
+yum --disablerepo=* --enablerepo=wise2c-docker install docker-ce docker-ce-cli
 
-yum --disablerepo=* --enablerepo=wise2c-crio install crio podman
+yum --disablerepo=* --enablerepo=wise2c-ceph install ceph-deploy ceph ceph-radosgw rbd-nbd rbd-mirror