feat: change apiVersion

rbac.authorization.k8s.io/v1beta1 >> rbac.authorization.k8s.io/v1 networking.k8s.io/v1beta1 >> networking.k8s.io/v1 batch/v1 >> batch/v1 fix: centos 8 repo url. fix: remove centos install kubernetes-cni. fix: metrics-server secure-port error.
lework · Aug 9, 2021 · 61254ac · 61254ac
1 parent 46cdfbe
commit 61254ac
Show file tree

Hide file tree

Showing 3 changed files with 212 additions and 113 deletions.
diff --git a/kainstall-centos.sh b/kainstall-centos.sh
@@ -333,7 +333,7 @@ function script::init_node() {
   [ -f /etc/yum.repos.d/epel.repo ] && sed -e 's!^mirrorlist=!#mirrorlist=!g' \
     -e 's!^metalink=!#metalink=!g' \
     -e 's!^#baseurl=!baseurl=!g' \
-    -e 's!//download\.fedoraproject\.org/pub!//mirrors.aliyun.com!g' \
+    -e 's!//download.*/pub!//mirrors.aliyun.com!g' \
     -e 's!http://mirrors\.aliyun!https://mirrors.aliyun!g' \
     -i /etc/yum.repos.d/epel.repo
 
@@ -1118,7 +1118,7 @@ EOF
     [ -f /usr/bin/kubelet ]  && yum remove -y kubelet
     [ -f /usr/bin/kubectl ]  && yum remove -y kubectl
 
-    yum install -y "kubeadm${version}" "kubelet${version}" "kubectl${version}" kubernetes-cni --disableexcludes=kubernetes
+    yum install -y "kubeadm${version}" "kubelet${version}" "kubectl${version}" --disableexcludes=kubernetes
   fi
 
   [ -d /etc/bash_completion.d ] && \
@@ -2155,7 +2155,7 @@ function add::ingress() {
     kube::apply "traefik" """
 ---
 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: ingress-traefik-controller
 rules:
@@ -2187,7 +2187,7 @@ rules:
       - update
 ---
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: ingress-traefik-controller
 roleRef:
@@ -2403,7 +2403,7 @@ spec:
       port: 80
       targetPort: 80
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: ingress-demo-app
@@ -2415,9 +2415,12 @@ spec:
     http:
       paths:
       - path: /
+        pathType: Prefix
         backend:
-          serviceName: ingress-demo-app
-          servicePort: 80
+          service:
+            name: ingress-demo-app
+            port:
+              number: 80
 """
     # shellcheck disable=SC2181
     if [[ "$?" == "0" ]]; then
@@ -2501,7 +2504,7 @@ function add::network() {
     log::info "[monitor]" "add hubble-ui ingress"
     kube::apply "hubble-ui ingress" "
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: hubble-ui
@@ -2513,9 +2516,13 @@ spec:
   - host: hubble-ui.cluster.local
     http:
       paths:
-      - backend:
-          serviceName: hubble-ui
-          servicePort: 80
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: hubble-ui
+            port:
+              number: 80
     "
     # shellcheck disable=SC2181
     if [[ "$?" == "0" ]]; then                                                                                                                                            
@@ -2539,7 +2546,7 @@ function add::addon() {
     command::exec "${MGMT_NODE}" "
       sed -i -e 's#k8s.gcr.io/metrics-server#$KUBE_IMAGE_REPO#g' \
              -e '/--kubelet-preferred-address-types=.*/d' \
-             -e 's/\\(.*\\)- --secure-port=4443/\\1- --secure-port=4443\\n\\1- --kubelet-insecure-tls\\n\\1- --kubelet-preferred-address-types=InternalIP,InternalDNS,ExternalIP,ExternalDNS,Hostname/g' \
+             -e 's/\\(.*\\)- --secure-port=\\(.*\\)/\\1- --secure-port=\\2\\n\\1- --kubelet-insecure-tls\\n\\1- --kubelet-preferred-address-types=InternalIP,InternalDNS,ExternalIP,ExternalDNS,Hostname/g' \
              \"${metrics_server_file}\"
     "
     check::exit_code "$?" "addon" "change metrics-server parameter"
@@ -2627,7 +2634,7 @@ spec:
     log::info "[monitor]" "add prometheus ingress"
     kube::apply "prometheus ingress" "
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: grafana
@@ -2639,11 +2646,15 @@ spec:
   - host: grafana.monitoring.cluster.local
     http:
       paths:
-      - backend:
-          serviceName: grafana
-          servicePort: 3000
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: grafana
+            port:
+              number: 3000
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: prometheus
@@ -2655,11 +2666,15 @@ spec:
   - host: prometheus.monitoring.cluster.local
     http:
       paths:
-      - backend:
-          serviceName: prometheus-k8s
-          servicePort: 9090
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: prometheus-k8s
+            port:
+              number: 9090
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: alertmanager
@@ -2671,9 +2686,13 @@ spec:
   - host: alertmanager.monitoring.cluster.local
     http:
       paths:
-      - backend:
-          serviceName: alertmanager-main
-          servicePort: 9093
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: alertmanager-main
+            port:
+              number: 9093
     "
     # shellcheck disable=SC2181
     if [[ "$?" == "0" ]]; then
@@ -2790,7 +2809,7 @@ spec:
         securityContext:
           privileged: true
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: elasticsearch
@@ -2802,9 +2821,13 @@ spec:
   - host: elasticsearch.logging.cluster.local
     http:
       paths:
-      - backend:
-          serviceName: elasticsearch
-          servicePort: 9200
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: elasticsearch
+            port:
+              number: 9200
 ---
 apiVersion: v1
 kind: Service
@@ -2851,7 +2874,7 @@ spec:
         ports:
         - containerPort: 5601
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: kibana
@@ -2863,9 +2886,13 @@ spec:
   - host: kibana.logging.cluster.local
     http:
       paths:
-      - backend:
-          serviceName: kibana
-          servicePort: 5601
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: kibana
+            port:
+              number: 5601
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -3027,7 +3054,7 @@ function add::storage() {
     
     kube::apply "longhorn ingress" "
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: longhorn-ingress
@@ -3038,9 +3065,12 @@ spec:
     http:
       paths:
       - path: /
+        pathType: Prefix
         backend:
-          serviceName: longhorn-frontend
-          servicePort: 80
+          service:
+            name: longhorn-frontend
+            port:
+              number: 80
     "
     # shellcheck disable=SC2181
     if [[ "$?" == "0" ]]; then
@@ -3063,7 +3093,7 @@ function add::ui() {
     kube::apply "${dashboard_file}"
     kube::apply "kubernetes dashboard ingress" "
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
@@ -3103,9 +3133,12 @@ fi
     http:
       paths:
       - path: /
+        pathType: Prefix
         backend:
-          serviceName: kubernetes-dashboard
-          servicePort: 443
+          service:
+            name: kubernetes-dashboard
+            port:
+              number: 443
     "
     # shellcheck disable=SC2181
     if [[ "$?" == "0" ]]; then
@@ -3186,7 +3219,7 @@ function add::ops() {
   [[ "${master_num:-0}" == "0" ]] && master_num=1
   kube::apply "etcd-snapshot" """
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: etcd-snapshot