use containerd as runtime by default in kubernetes v1.24

cloudnativer · May 5, 2022 · 236ee04 · 236ee04
1 parent 4318c42
commit 236ee04
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 22 deletions.
diff --git a/data/statistics/diskinfo.txt b/data/statistics/diskinfo.txt
@@ -1 +1 @@
-32
+47
diff --git a/data/statistics/meminfo.txt b/data/statistics/meminfo.txt
@@ -1 +1 @@
-4
+3
diff --git a/docs/roadmap.md b/docs/roadmap.md
@@ -1,16 +1,3 @@
-# Version 0.8.1 Feature Preview:
-
-<br>
-
-We will add the following features in 0.8.1 version:
-
-* ...
-* ...
-
-
-<br>
-
-
 
 # Version 0.8.0 Feature Preview:
 

diff --git a/main.go b/main.go
@@ -56,8 +56,8 @@ func main() {
 
     // Set the version number and release date of Kube-Install.
     const (
-        Version string = "v0.8.0-beta2"
-        ReleaseDate string = "4/13/2022"
+        Version string = "v0.8.0"
+        ReleaseDate string = "5/5/2022"
         CompatibleK8S string = "1.18, 1.19, 1.20, 1.21, 1.22, 1.23, and 1.24"
         CompatibleOS string = "CentOS linux 7, CentOS linux 8, RHEL 7, RHEL 8, Ubuntu 20, and SUSE 15"
     )

diff --git a/static/html/index.tmpl b/static/html/index.tmpl
@@ -263,7 +263,7 @@
 
                                 <div class="g_6">
                                         <div class="widget_header">
-                                                <h4 class="widget_header_title wwIcon i_16_pie">{{if eq .Lang "cn"}}Kubernetes集群节点数量Top5{{else}}Top 5 Number of Kubernetes Nodes{{end}}</h4>
+                                                <h4 class="widget_header_title wwIcon i_16_pie">{{if eq .Lang "cn"}}Kubernetes集群Node数量Top5{{else}}Top 5 Number of Kubernetes Nodes{{end}}</h4>
                                         </div>
                                         <div class="widget_contents">
 						<div id="k8snodenum" style="width: 380px;height:165px;"></div>

diff --git a/sys/0x0000000000node/kubelet/templates/kubelet.service-1.24.j2 b/sys/0x0000000000node/kubelet/templates/kubelet.service-1.24.j2
@@ -8,9 +8,6 @@ ExecStartPre=/usr/local/bin/resolvinit.sh
 ExecStart=/usr/local/bin/kubelet \
   --bootstrap-kubeconfig=/etc/kubernetes/ssl/bootstrap.kubeconfig \
   --root-dir={{k8s_install_home}}/kubernetes/kubelet \
-  --network-plugin=cni \
-  --cni-conf-dir=/etc/cni/net.d \
-  --cni-bin-dir=/opt/cni/bin/ \
   --cert-dir=/etc/kubernetes/ssl \
   --kubeconfig=/etc/kubernetes/ssl/kubelet.kubeconfig \
   --config=/etc/kubernetes/kubelet.config.json \

diff --git a/sys/0x00000000addons/tasks/main.yml b/sys/0x00000000addons/tasks/main.yml
@@ -39,8 +39,9 @@
     src: "../templates/2.dashboard/{{item}}"
     dest: "{{k8s_install_home}}/addons/dashboard/{{item}}"
   with_items:
-    - kubernetes-dashboard-admin-rbac.yaml
+    - kubernetes-dashboard-rbac-admin.yaml
     - kubernetes-dashboard-rbac-minimal.yaml
+    - kubernetes-dashboard-secret.yaml
 - copy:
     src: "../templates/2.dashboard/{{k8sdashboardshell}}.sh"
     dest: "{{k8s_install_home}}/temp/{{k8sdashboardshell}}.sh"

diff --git a/...oard/kubernetes-dashboard-admin-rbac.yaml → ...oard/kubernetes-dashboard-rbac-admin.yaml b/...oard/kubernetes-dashboard-admin-rbac.yaml → ...oard/kubernetes-dashboard-rbac-admin.yaml
diff --git a/sys/0x00000000addons/templates/2.dashboard/kubernetes-dashboard-secret.yaml b/sys/0x00000000addons/templates/2.dashboard/kubernetes-dashboard-secret.yaml
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  annotations:
+    kubernetes.io/service-account.name: default
+  name: default
+  namespace: kube-system
+type: kubernetes.io/service-account-token
+
+---
+
+apiVersion: v1
+kind: Secret
+metadata:
+  annotations:
+    kubernetes.io/service-account.name: kubernetes-dashboard-admin
+  name: kubernetes-dashboard-admin
+  namespace: kube-system
+type: kubernetes.io/service-account-token
+
+