Merge pull request #298 from ErikJiang/enable_repo

Support restore yum repo in enable-repo.yml

Author: kubean-pr-robot[bot]

docs/offline.zh.md

@@ -203,6 +203,10 @@ spec:
   postHook:
     - actionType: playbook
       action: cluster-info.yml
+    - actionType: playbook
+      action: enable-repo.yml  # 在部署集群后, 还原各节点 yum repo 配置. (注：此步骤, 可视情况添加.)
+      extraArgs: |
+        -e undo=true
 ```
 
 ## 部署集群前的配置

pkg/util/entrypoint/entrypoint_test.go

@@ -149,8 +149,8 @@ var testData = `
   input:
     actionType: playbook
     action: kubeconfig.yml
-    extraArgs: "-e postback_undo=true"
-  matchString: "/kubespray/kubeconfig.yml -e postback_undo=true"
+    extraArgs: "-e undo=true"
+  matchString: "/kubespray/kubeconfig.yml -e undo=true"
   output: true
 
 - message: "Check entrypoint script cmd concatenation"

playbooks/enable-repo.yml

@@ -8,6 +8,9 @@
     yum_repo_bak_path: /etc/yum.repos.d.bak
     yum_repo_url_list: []
   tasks:
+
+    # Install
+
     - name: Checking if "{{ yum_repo_name }}" exists
       stat:
         path: "{{ yum_repo_src_path }}/{{ yum_repo_name }}.repo"
@@ -22,6 +25,7 @@
       when: 
         - ansible_facts['os_family'] == "RedHat"
         - not file_data.stat.exists and ( yum_repo_url_list | length > 0 )
+        - not undo|default(false)|bool
 
     - name: Enable "{{ yum_repo_name }}" yum repositories
       ansible.builtin.yum_repository:
@@ -36,3 +40,43 @@
         index_var: url_index
       when:
         - ansible_facts['os_family'] == "RedHat"
+        - not undo|default(false)|bool
+
+    # Uninstall
+
+    - name: Clean extension repo
+      shell: >
+        rm -rf {{ yum_repo_src_path }}/{{ yum_repo_name }}.repo
+      args:
+        executable: /bin/bash
+      register: clean_repo_result
+      until: clean_repo_result.rc == 0
+      retries: 5
+      delay: 5
+      when:
+        - undo|default(false)|bool
+        - ansible_facts['os_family'] == "RedHat"
+        - file_data.stat.exists
+
+    - name: Checking if "{{ yum_repo_bak_path }}" exists
+      stat:
+        path: "{{ yum_repo_bak_path }}"
+      register: repo_bak_path
+      when:
+        - undo|default(false)|bool
+        - ansible_facts['os_family'] == "RedHat"
+
+    - name: Restore "{{ yum_repo_src_path }}" repo
+      shell: >
+        mv {{ yum_repo_bak_path }}/* {{ yum_repo_src_path }}/ &&
+        rm -rf {{ yum_repo_bak_path }}
+      args:
+        executable: /bin/bash
+      register: restore_repo_result
+      until: restore_repo_result.rc == 0
+      retries: 5
+      delay: 5
+      when:
+        - undo|default(false)|bool
+        - ansible_facts['os_family'] == "RedHat"
+        - repo_bak_path.stat.exists

playbooks/kubeconfig.yml

@@ -10,7 +10,7 @@
       register: cp_kubeconf_result
       until: cp_kubeconf_result is not failed
       retries: 10
-      when: not postback_undo|default(false)|bool
+      when: not undo|default(false)|bool
 
 - hosts: localhost
   gather_facts: false
@@ -29,7 +29,7 @@
         executable: /bin/bash
       register: update_kubeconfig_result
       failed_when: update_kubeconfig_result.stderr
-      when: not postback_undo|default(false)|bool
+      when: not undo|default(false)|bool
 
     - name: Check kubeconfig configmap
       shell: "kubectl -n kubean-system get configmap {{ kubeconfig_name }}"
@@ -52,7 +52,7 @@
       until: create_cm_result.rc == 0
       retries: 5
       delay: 5
-      when: not postback_undo|default(false)|bool
+      when: not undo|default(false)|bool
 
     - name: Patch kubeconfRef info
       shell: >
@@ -63,7 +63,7 @@
       until: patch_ref_result.rc == 0
       retries: 5
       delay: 5
-      when: not postback_undo|default(false)|bool
+      when: not undo|default(false)|bool
 
     # Uninstall
 
@@ -76,11 +76,11 @@
       until: clean_ref_result.rc == 0
       retries: 5
       delay: 5
-      when: postback_undo|default(false)|bool
+      when: undo|default(false)|bool
 
     - name: Delete local kubeconfig file
       shell: "rm -rf {{ local_kube_config }}"
       args:
         executable: /bin/bash
       ignore_errors: true
-      when: postback_undo|default(false)|bool
+      when: undo|default(false)|bool