fix(upgrade): 普通用户升级兼容

Zhang Dongliang · Zhang Dongliang · commit f6da60420bd5 · 2023-08-23T17:34:10.000+08:00
diff --git a/hack/save_tags.sh b/hack/save_tags.sh
@@ -3,35 +3,35 @@ set -e
 export PATH=$PATH:/opt/yunion/bin
 export KUBECONFIG=/etc/kubernetes/admin.conf
 
-OCVER=$(kubectl -n onecloud get onecloudclusters default -o=jsonpath='{.spec.version}')
+OCVER=$(sudo kubectl -n onecloud get onecloudclusters default -o=jsonpath='{.spec.version}')
 echo "/opt/yunion/bin/ocadm cluster update --version $OCVER --wait"
 
 if [ "$1" == "-all" ]; then
-    nslist="$(kubectl get namespace|tail -n +2| awk '{print $1}' | xargs)"
+    nslist="$(kubectl get namespace | tail -n +2 | awk '{print $1}' | xargs)"
 else
     nslist=onecloud
 fi
 
 for namespace in $nslist; do
     for typ in daemonset deployment; do
         kubectl get $typ -n $namespace -o jsonpath='{range .items[*]}{@.metadata.name}{"@"}{@.spec.template.spec.containers[*].name}{"%"}{@.spec.template.spec.containers[*].image}{"\n"}{end}'} | while read line; do
-            dep=$(echo $line |awk -F@ '{print $1}')
-            names=($(echo $line|sed -e 's#.*@##g' -e 's#%.*$##g'))
-            images=($(echo $line |sed -e 's#.*%##'))
+            dep=$(echo $line | awk -F@ '{print $1}')
+            names=($(echo $line | sed -e 's#.*@##g' -e 's#%.*$##g'))
+            images=($(echo $line | sed -e 's#.*%##'))
             echo -e "kubectl set image -n $namespace $typ/$dep \c"
             for idx in ${!names[@]}; do
                 echo -e "${names[$idx]}=${images[$idx]} \c"
             done
-        echo
+            echo
         done
-        kubectl get $typ -n $namespace -o jsonpath='{range .items[*]}{@.metadata.name}{"@"}{@.spec.template.spec.initContainers[*].name}{"%"}{@.spec.template.spec.initContainers[*].image}{"\n"}{end}'} |while read line; do
-            if ! echo "$line" |grep -q '@%$'; then
-                dep=$(echo $line |awk -F@ '{print $1}')
+        kubectl get $typ -n $namespace -o jsonpath='{range .items[*]}{@.metadata.name}{"@"}{@.spec.template.spec.initContainers[*].name}{"%"}{@.spec.template.spec.initContainers[*].image}{"\n"}{end}'} | while read line; do
+            if ! echo "$line" | grep -q '@%$'; then
+                dep=$(echo $line | awk -F@ '{print $1}')
                 echo -e "kubectl set image -n $namespace $typ/$dep \c"
-                img=$(echo "$line" |sed -e 's#.*%##')
+                img=$(echo "$line" | sed -e 's#.*%##')
                 echo -e "init=$img \c"
             fi
-        done |sed -e 's# kubectl#\nkubectl#g'
+        done | sed -e 's# kubectl#\nkubectl#g'
         echo
     done
 done
diff --git a/lib/cluster.py b/lib/cluster.py
@@ -3,7 +3,7 @@
 
 import json
 import re
-
+from getpass import getuser
 from .ssh import SSHClient
 from . import k8s
 
@@ -32,7 +32,7 @@ class OnecloudCluster(object):
     def __init__(self, ssh_client):
         self.ssh_client = ssh_client
         ret = ssh_client.exec_command(
-            'kubectl -n onecloud get onecloudclusters default -o json')
+            'sudo kubectl -n onecloud get onecloudclusters default -o json')
         try:
             cluster = json.loads(ret)
         except ValueError:
@@ -85,7 +85,7 @@ def get_current_version(self):
         return self.get_spec().get('version')
 
     def _construct_nodes(self):
-        k8s_nodes = json.loads(self.ssh_client.exec_command('kubectl get nodes -o json')).get('items')
+        k8s_nodes = json.loads(self.ssh_client.exec_command('sudo kubectl get nodes -o json')).get('items')
         self.k8s_nodes = [k8s.Node(obj) for obj in k8s_nodes]
         self.master_nodes = [node for node in self.k8s_nodes if node.is_master()]
         self.worker_nodes = [node for node in self.k8s_nodes if not node.is_master()]
@@ -123,7 +123,7 @@ def add_i(node):
         return inventory.generate_content()
 
     def set_current_version(self, version):
-        cmd = 'kubectl -n onecloud annotate --overwrite=true onecloudclusters default %s=%s' % (
+        cmd = 'sudo kubectl -n onecloud annotate --overwrite=true onecloudclusters default %s=%s' % (
             A_OCBOOT_UPGRADE_CURRENT_VERSION,
             version)
         self.ssh_client.exec_command(cmd)
@@ -178,7 +178,7 @@ def generate_content(self):
 
 class ansibleHost(object):
 
-    def __init__(self, node, role, user='root', port=22):
+    def __init__(self, node, role, user=getuser(), port=22):
         self.hostname = node.get_hostname()
         self.ip = node.get_ip()
         self.role = role
@@ -215,20 +215,20 @@ def get_content(self):
 
 class AnsiblePrimaryMasterHost(ansibleHost):
 
-    def __init__(self, node, user='root', port=22):
+    def __init__(self, node, user=getuser(), port=22):
         super(AnsiblePrimaryMasterHost, self).__init__(
             node, GROUP_PRIMARY_MASTER_NODE, user, port)
 
 
 class AnsibleMasterHost(ansibleHost):
 
-    def __init__(self, node, user='root', port=22):
+    def __init__(self, node, user=getuser(), port=22):
         super(AnsibleMasterHost, self).__init__(
             node, GROUP_MASTER_NODES, user, port)
 
 
 class AnsibleWorkerHost(ansibleHost):
 
-    def __init__(self, node, user='root', port=22):
+    def __init__(self, node, user=getuser(), port=22):
         super(AnsibleWorkerHost, self).__init__(
             node, GROUP_WORKER_NODES, user, port)
diff --git a/lib/cmd.py b/lib/cmd.py
@@ -3,6 +3,7 @@
 import os
 
 from lib import utils
+from lib.utils import init_local_user_path
 
 def init_ansible_playbook_path():
     if '/usr/local/bin' not in os.environ.get('PATH', '').split(':'):
@@ -42,6 +43,9 @@ def run_ansible_playbook(hosts_f, playbook_f, debug_level=0, vars=None):
     debug level support example:
     ANSIBLE_VERBOSITY=4 /opt/yunionboot/run.py /opt/yunion/upgrade/config.yml
     """
+
+    init_local_user_path()
+
     debug_flag = ''
     if debug_level == 0:
         debug_level = int(os.environ.get('ANSIBLE_VERBOSITY', 0))
diff --git a/lib/upgrade.py b/lib/upgrade.py
@@ -9,9 +9,9 @@
 from .utils import get_major_version
 from .cluster import construct_cluster
 from . import consts
+from getpass import getuser
 from lib import utils
 
-
 UPGRADE_MSG = """
 ┌───────────────────────────────────────────────────────────────────────────────┐
 │                                                                               │
@@ -39,10 +39,9 @@ def add_command(subparsers):
 
     # optional options
     help_d = lambda help: help + " (default: %(default)s)"
-
     parser.add_argument("--user", "-u",
                         dest="ssh_user",
-                        default="root",
+                        default=getuser(),
                         help=help_d("primary master host ssh user"))
 
     parser.add_argument("--key-file", "-k",
diff --git a/lib/utils.py b/lib/utils.py
@@ -72,3 +72,14 @@ def print_title(title):
     print('=' * 80)
     print(title)
     print('=' * 80)
+
+
+def init_local_user_path():
+    import os
+    path = os.environ['PATH']
+    user_bin = os.path.expanduser('~/.local/bin')
+    if user_bin not in path.split(os.pathsep):
+        path = f'{path}:{user_bin}'
+        os.environ['PATH'] = path
+
+
diff --git a/ocboot.py b/ocboot.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 import argparse
diff --git a/onecloud/roles/upgrade/primary_master_node/tasks/main.yml b/onecloud/roles/upgrade/primary_master_node/tasks/main.yml
@@ -26,6 +26,7 @@
     mkdir -p $bk_dir
     kubectl get deployment -n onecloud onecloud-operator -o yaml | sed -f /tmp/clean_k8s_obj.sed > $bk_dir/operator.yml
     kubectl get oc -n onecloud default -o yaml | sed -f /tmp/clean_k8s_obj.sed > $bk_dir/oc.yml
+  become: yes
 
 - name: update operator only
   shell: |
@@ -36,6 +37,7 @@
         --operator-only \
         --wait
   # 30 minutes timeout
+  become: yes
   async: 1800
   poll: 0
 
@@ -114,6 +116,7 @@
     To watch upgrade process,
     SSH login host "{{ ansible_hostname }}" execute:
       kubectl get pods -n onecloud -w
+  become: yes
   async_status:
     jid: "{{ ocadm_update_register.ansible_job_id }}"
   register: ocadm_update_result
diff --git a/run.py b/run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # encoding: utf-8
 from __future__ import unicode_literals
 from __future__ import absolute_import
@@ -11,6 +11,7 @@
 import argparse
 from lib import install
 from lib import cmd
+from lib.utils import init_local_user_path
 
 
 def show_usage():
@@ -37,13 +38,6 @@ def version_ge(v1, v2):
     return versiontuple(v1) >= versiontuple(v2)
 
 
-def init_local_user_path():
-    path = os.environ['PATH']
-    user_bin = os.path.expanduser('~/.local/bin')
-    if user_bin not in path.split(os.pathsep):
-        path = f'{path}:{user_bin}'
-        os.environ['PATH'] = path
-
 def get_username():
     import getpass
     # python2 / python3 are all tested to get username

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python`
	`1`	`+#!/usr/bin/env python3`
`2`	`2`
`3`	`3`	`import sys`
`4`	`4`	`import argparse`