Unverified Commit 978bc50b authored by alankan-finocomp's avatar alankan-finocomp Committed by GitHub
Browse files

Fix kubeconfig merge with existing config (#351) 



* Fix kubeconfig merge with existing config

Signed-off-by: default avataralankan-finocomp <79436574+alankan-finocomp@users.noreply.github.com>
Signed-off-by: default avatarDerek Nola <derek.nola@suse.com>
Co-authored-by: default avatarDerek Nola <derek.nola@suse.com>
parent c8527cc9

roles/k3s_server/tasks/main.yml

+7 −7
Original line number Diff line number Diff line
@@ -164,21 +164,21 @@ 
            - csa_result.rc == 0



        - name: Setup kubeconfig context on control node - {{ cluster_context }}

          when: kubeconfig != "~/.kube/config"

          when: kubeconfig == "~/.kube/config.new"

          ansible.builtin.replace:

            path: "{{ kubeconfig }}"

            regexp: 'name: default'

            replace: 'name: {{ cluster_context }}'

            regexp: 'default'

            replace: '{{ cluster_context }}'

          delegate_to: 127.0.0.1

          become: false



        - name: Merge with any existing kubeconfig on control node

          when: kubeconfig != "~/.kube/config"

          when: kubeconfig == "~/.kube/config.new"

          ansible.builtin.shell: |

            TFILE=$(mktemp)

            KUBECONFIG={{ kubeconfig }} kubectl config set-context {{ cluster_context }} --user={{ cluster_context }} --cluster={{ cluster_context }}

            KUBECONFIG={{ kubeconfig }} kubectl config view --flatten > ${TFILE}

            mv ${TFILE} {{ kubeconfig }}

            KUBECONFIG={{ kubeconfig }}:~/.kube/config kubectl config set-context {{ cluster_context }} --user={{ cluster_context }} --cluster={{ cluster_context }}

            KUBECONFIG={{ kubeconfig }}:~/.kube/config kubectl config view --flatten > ${TFILE}

            mv ${TFILE} ~/.kube/config

          delegate_to: 127.0.0.1

          become: false

          register: mv_result