Merge pull request #746 from ccamacho/rke

ci: fix linter issues
Kubeinit · Jun 1, 2023 · 18ede8f · 18ede8f
2 parents 72a3130 + 2c6b386
commit 18ede8f
Show file tree

Hide file tree

Showing 21 changed files with 112 additions and 96 deletions.
diff --git a/.ansible-lint b/.ansible-lint
@@ -1,11 +1,13 @@
 ---
 parseable: true
 skip_list:
+  - 'experimental'              # Dont add any experimental rule
   - 'key-order'
   - 'truthy'
-  - 'line-length'  # [E204] Lines should be no longer than 120 chars
-  - 'command-instead-of-module'  # [E303] sed used in place of template, replace or lineinfile module
-  - 'package-latest'  # [E403] Package installs should not use latest
+  - 'line-length'               # [E204] Lines should be no longer than 120 chars
+  - 'command-instead-of-module' # [E303] sed used in place of template, replace or lineinfile module
+  - 'package-latest'            # [E403] Package installs should not use latest
   - 'var-spacing'
   - 'schema'
-  - 'git-latest'  # Git checkouts must contain explicit version.
+  - 'git-latest'                # Git checkouts must contain explicit version.
+  - 'var-naming'
diff --git a/.github/workflows/distro_test.yml b/.github/workflows/distro_test.yml
@@ -54,7 +54,12 @@ jobs:
           mkdir ~/.ssh/secrets
           cp ~/.ssh/kubeinit_id_rsa ~/.ssh/secrets/kubeinit-ssh-key
           sudo chown -R 1001:0 ~/.ssh/secrets
-          docker run --rm --network host \
+          docker run \
+              --oom-kill-disable \
+              --cpus=".5" \
+              --memory-swap=-1 \
+              --rm \
+              --network host \
               --volume ~/.ssh/secrets:/run/secrets:ro \
               kubeinit/kubeinit:latest \
                   -v \

diff --git a/ci/sanity.sh b/ci/sanity.sh
@@ -27,6 +27,7 @@ cd kubeinit
 rm -rf ~/.ansible/collections/ansible_collections/kubeinit/kubeinit
 ansible-galaxy collection build -v --force --output-path releases/
 ansible-galaxy collection install --force --force-with-deps releases/kubeinit-kubeinit-`cat galaxy.yml | shyaml get-value version`.tar.gz
+cp galaxy.yml ~/.ansible/collections/ansible_collections/kubeinit/kubeinit/
 cd ~/.ansible/collections/ansible_collections/kubeinit/kubeinit
 
 export HOME=$(eval echo ~$USER)

diff --git a/ci/units.sh b/ci/units.sh
@@ -27,6 +27,7 @@ cd kubeinit
 rm -rf ~/.ansible/collections/ansible_collections/kubeinit/kubeinit
 ansible-galaxy collection build -v --force --output-path releases/
 ansible-galaxy collection install --force --force-with-deps releases/kubeinit-kubeinit-`cat galaxy.yml | shyaml get-value version`.tar.gz
+cp galaxy.yml ~/.ansible/collections/ansible_collections/kubeinit/kubeinit/
 cd ~/.ansible/collections/ansible_collections/kubeinit/kubeinit
 
 export HOME=$(eval echo ~$USER)

diff --git a/kubeinit/galaxy.yml b/kubeinit/galaxy.yml
@@ -23,14 +23,15 @@ tags:
   - rancher
   - aws
 dependencies:
-  ansible.netcommon: '==2.5.0'
-  ansible.posix: '==1.3.0'
-  community.crypto: '==2.2.1'
-  community.general: '==4.4.0'
-  community.libvirt: '==1.0.2'
-  containers.podman: '==1.9.1'
-  openvswitch.openvswitch: '==2.1.0'
-  ansible.windows: '==1.10.0'
+  ansible.netcommon: '==5.1.1'
+  ansible.posix: '==1.5.4'
+  ansible.utils: '==2.10.3'
+  ansible.windows: '==1.14.0'
+  community.crypto: '==2.13.1'
+  community.general: '==7.0.1'
+  community.libvirt: '==1.2.0'
+  containers.podman: '==1.10.2'
+  openvswitch.openvswitch: '==2.1.1'
 
 repository: 'https://github.com/kubeinit/kubeinit'
 homepage: 'https://www.kubeinit.org'

diff --git a/kubeinit/requirements.yml b/kubeinit/requirements.yml
@@ -5,18 +5,20 @@
 ---
 collections:
   - name: ansible.netcommon
-    version: '2.5.0'
+    version: '5.1.1'
   - name: ansible.posix
-    version: '1.3.0'
+    version: '1.5.4'
+  - name: ansible.utils
+    version: '2.10.3'
+  - name: ansible.windows
+    version: '1.14.0'
   - name: community.crypto
-    version: '2.2.1'
+    version: '2.13.1'
   - name: community.general
-    version: '4.4.0'
+    version: '7.0.1'
   - name: community.libvirt
-    version: '1.0.2'
+    version: '1.2.0'
   - name: containers.podman
-    version: '1.9.1'
+    version: '1.10.2'
   - name: openvswitch.openvswitch
-    version: '2.1.0'
-  - name: ansible.windows
-    version: '1.10.0'
+    version: '2.1.1'
diff --git a/kubeinit/roles/kubeinit_apps/templates/win_sampleapp.yml.j2 b/kubeinit/roles/kubeinit_apps/templates/win_sampleapp.yml.j2
@@ -32,12 +32,12 @@ spec:
         app: windows-sampleapp
       name: windows-sampleapp
     spec:
-     containers:
-      - name: windowswebserver
-        image: mcr.microsoft.com/windows/servercore:ltsc2022
-        command:
-        - powershell.exe
-        - -command
-        - "<#code used from https://gist.github.com/19WAS85/5424431#> ; $$listener = New-Object System.Net.HttpListener ; $$listener.Prefixes.Add('http://*:80/') ; $$listener.Start() ; $$callerCounts = @{} ; Write-Host('Listening at http://*:80/') ; while ($$listener.IsListening) { ;$$context = $$listener.GetContext() ;$$requestUrl = $$context.Request.Url ;$$clientIP = $$context.Request.RemoteEndPoint.Address ;$$response = $$context.Response ;Write-Host '' ;Write-Host('> {0}' -f $$requestUrl) ;  ;$$count = 1 ;$$k=$$callerCounts.Get_Item($$clientIP) ;if ($$k -ne $$null) { $$count += $$k } ;$$callerCounts.Set_Item($$clientIP, $$count) ;$$ip=(Get-NetAdapter | Get-NetIpAddress); $$header='<html><body><H1>Windows Container Web Server</H1>' ;$$callerCountsString='' ;$$callerCounts.Keys | % { $$callerCountsString+='<p>IP {0} callerCount {1} ' -f $$ip[1].IPAddress,$$callerCounts.Item($$_) } ;$$footer='</body></html>' ;$$content='{0}{1}{2}' -f $$header,$$callerCountsString,$$footer ;Write-Output $$content ;$$buffer = [System.Text.Encoding]::UTF8.GetBytes($$content) ;$$response.ContentLength64 = $$buffer.Length ;$$response.OutputStream.Write($$buffer, 0, $$buffer.Length) ;$$response.Close() ;$$responseStatus = $$response.StatusCode ;Write-Host('< {0}' -f $$responseStatus)  } ; "
-     nodeSelector:
-      kubernetes.io/os: windows
+      containers:
+       - name: windowswebserver
+         image: mcr.microsoft.com/windows/servercore:ltsc2022
+         command:
+         - powershell.exe
+         - -command
+         - "<#code used from https://gist.github.com/19WAS85/5424431#> ; $$listener = New-Object System.Net.HttpListener ; $$listener.Prefixes.Add('http://*:80/') ; $$listener.Start() ; $$callerCounts = @{} ; Write-Host('Listening at http://*:80/') ; while ($$listener.IsListening) { ;$$context = $$listener.GetContext() ;$$requestUrl = $$context.Request.Url ;$$clientIP = $$context.Request.RemoteEndPoint.Address ;$$response = $$context.Response ;Write-Host '' ;Write-Host('> {0}' -f $$requestUrl) ;  ;$$count = 1 ;$$k=$$callerCounts.Get_Item($$clientIP) ;if ($$k -ne $$null) { $$count += $$k } ;$$callerCounts.Set_Item($$clientIP, $$count) ;$$ip=(Get-NetAdapter | Get-NetIpAddress); $$header='<html><body><H1>Windows Container Web Server</H1>' ;$$callerCountsString='' ;$$callerCounts.Keys | % { $$callerCountsString+='<p>IP {0} callerCount {1} ' -f $$ip[1].IPAddress,$$callerCounts.Item($$_) } ;$$footer='</body></html>' ;$$content='{0}{1}{2}' -f $$header,$$callerCountsString,$$footer ;Write-Output $$content ;$$buffer = [System.Text.Encoding]::UTF8.GetBytes($$content) ;$$response.ContentLength64 = $$buffer.Length ;$$response.OutputStream.Write($$buffer, 0, $$buffer.Length) ;$$response.Close() ;$$responseStatus = $$response.StatusCode ;Write-Host('< {0}' -f $$responseStatus)  } ; "
+      nodeSelector:
+        kubernetes.io/os: windows
diff --git a/kubeinit/roles/kubeinit_eks/tasks/main.yml b/kubeinit/roles/kubeinit_eks/tasks/main.yml
@@ -108,22 +108,26 @@
       register: _result_kubeadm_init_output
       changed_when: "_result_kubeadm_init_output.rc == 0"
 
+    - name: Create the cluster init template
+      ansible.builtin.copy:
+        dest: ~/config.yml
+        mode: '0644'
+        content: |
+          apiVersion: kubeadm.k8s.io/v1beta3
+          kind: ClusterConfiguration
+          etcd:
+            local:
+              imageRepository: "{{ kubeinit_registry_uri }}"
+              imageTag: {{ _result_etcd_tag.stdout }}
+          controlPlaneEndpoint: "api.{{ kubeinit_cluster_fqdn }}:6443"
+          kubernetesVersion: "stable-{{ kubeinit_eks_kubernetes_version }}"
+          networking:
+            serviceSubnet: "{{ kubeinit_eks_service_network_cidr }}"
+            podSubnet: "{{ kubeinit_eks_pod_network_cidr }}"
+
     - name: Initialize Kubernetes cluster
       ansible.builtin.shell: |
         set -eo pipefail
-        cat << EOF > ~/config.yml
-        apiVersion: kubeadm.k8s.io/v1beta2
-        kind: ClusterConfiguration
-        etcd:
-          local:
-            imageRepository: "{{ kubeinit_registry_uri }}"
-            imageTag: {{ _result_etcd_tag.stdout }}
-        controlPlaneEndpoint: "api.{{ kubeinit_cluster_fqdn }}:6443"
-        kubernetesVersion: "stable-{{ kubeinit_eks_kubernetes_version }}"
-        networking:
-          serviceSubnet: "{{ kubeinit_eks_service_network_cidr }}"
-          podSubnet: "{{ kubeinit_eks_pod_network_cidr }}"
-        EOF
         kubeadm init  --upload-certs  --config=config.yml
       args:
         executable: /bin/bash
@@ -191,9 +195,9 @@
 
 - name: Join additional controller nodes using the PK
   ansible.builtin.shell: |
-   kubeadm reset -f || true
-   echo "{{ _result_join_command.stdout }} {{ eks_controller_join_key }}" > ~/eks_controller_join_command.sh
-   sh ~/eks_controller_join_command.sh
+    kubeadm reset -f || true
+    echo "{{ _result_join_command.stdout }} {{ eks_controller_join_key }}" > ~/eks_controller_join_command.sh
+    sh ~/eks_controller_join_command.sh
   args:
     executable: /bin/bash
   register: _result

diff --git a/kubeinit/roles/kubeinit_eks/tasks/post_configure_guest.yml b/kubeinit/roles/kubeinit_eks/tasks/post_configure_guest.yml
@@ -107,14 +107,14 @@
   ansible.builtin.blockinfile:
     path: /etc/yum.repos.d/kubernetes.repo
     block: |
-     [kubernetes]
-     name=Kubernetes
-     baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
-     enabled=1
-     gpgcheck=1
-     repo_gpgcheck=1
-     gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
-     exclude=kubelet kubeadm kubectl
+      [kubernetes]
+      name=Kubernetes
+      baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
+      enabled=1
+      gpgcheck=1
+      repo_gpgcheck=1
+      gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
+      exclude=kubelet kubeadm kubectl
 
 #
 # Kubernetes config

diff --git a/kubeinit/roles/kubeinit_k8s/tasks/main.yml b/kubeinit/roles/kubeinit_k8s/tasks/main.yml
@@ -109,9 +109,9 @@
 
 - name: Join additional controller nodes using the PK
   ansible.builtin.shell: |
-   kubeadm reset -f || true
-   echo "{{ _result_join_command.stdout }} {{ k8s_controller_join_key }}" > ~/k8s_controller_join_command.sh
-   sh ~/k8s_controller_join_command.sh
+    kubeadm reset -f || true
+    echo "{{ _result_join_command.stdout }} {{ k8s_controller_join_key }}" > ~/k8s_controller_join_command.sh
+    sh ~/k8s_controller_join_command.sh
   args:
     executable: /bin/bash
   register: _result
@@ -165,7 +165,7 @@
 # The kubeconfig file is on the controller nodes so we run kubectl label on the first controller
 - name: Label node
   ansible.builtin.command: |
-   kubectl label node {{ hostvars[compute_node].fqdn }} node-role.kubernetes.io/worker=
+    kubectl label node {{ hostvars[compute_node].fqdn }} node-role.kubernetes.io/worker=
   register: _result
   changed_when: "_result.rc == 0"
   loop: "{{ groups['all_compute_nodes'] | default([]) }}"

diff --git a/kubeinit/roles/kubeinit_k8s/tasks/post_configure_guest.yml b/kubeinit/roles/kubeinit_k8s/tasks/post_configure_guest.yml
@@ -137,14 +137,14 @@
   ansible.builtin.blockinfile:
     path: /etc/yum.repos.d/kubernetes.repo
     block: |
-     [kubernetes]
-     name=Kubernetes
-     baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-$basearch
-     enabled=1
-     gpgcheck=1
-     repo_gpgcheck=1
-     gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
-     exclude=kubelet kubeadm kubectl
+      [kubernetes]
+      name=Kubernetes
+      baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-$basearch
+      enabled=1
+      gpgcheck=1
+      repo_gpgcheck=1
+      gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
+      exclude=kubelet kubeadm kubectl
 
 #
 # Kubernetes config

diff --git a/kubeinit/roles/kubeinit_libvirt/tasks/cleanup_hypervisors.yml b/kubeinit/roles/kubeinit_libvirt/tasks/cleanup_hypervisors.yml
@@ -315,7 +315,7 @@
   loop: "{{ groups['all_hosts'] | product(groups['all_service_nodes']) }}"
   vars:
     kubeinit_deployment_node_name: "{{ item[0] }}"
-    ovs_veth_devname: "veth0-{{ hostvars[item[1]].ansible_host | ansible.netcommon.ip4_hex }}"
+    ovs_veth_devname: "veth0-{{ hostvars[item[1]].ansible_host | ansible.utils.ip4_hex }}"
   register: _result
   changed_when: "_result.rc == 0"
   delegate_to: "{{ kubeinit_deployment_node_name }}"
@@ -329,7 +329,7 @@
   loop: "{{ groups['all_hosts'] | product(groups['all_service_nodes']) }}"
   vars:
     kubeinit_deployment_node_name: "{{ item[0] }}"
-    ovs_veth_devname: "veth0-{{ hostvars[item[1]].ansible_host | ansible.netcommon.ip4_hex }}"
+    ovs_veth_devname: "veth0-{{ hostvars[item[1]].ansible_host | ansible.utils.ip4_hex }}"
   register: _result
   changed_when: "_result.rc == 0"
   delegate_to: "{{ kubeinit_deployment_node_name }}"

diff --git a/kubeinit/roles/kubeinit_libvirt/tasks/deploy_centos_guest.yml b/kubeinit/roles/kubeinit_libvirt/tasks/deploy_centos_guest.yml
@@ -86,7 +86,7 @@
             --os-type linux \
             --os-variant rhel8.0 \
             --autostart \
-            --network network={{ kubeinit_cluster_hostvars.network_name }},mac={{ hostvars[kubeinit_deployment_node_name].mac }},virtualport.parameters.interfaceid={{ hostvars[kubeinit_deployment_node_name].interfaceid }},target.dev=veth0-{{ hostvars[kubeinit_deployment_node_name].ansible_host | ansible.netcommon.ip4_hex }},model=virtio \
+            --network network={{ kubeinit_cluster_hostvars.network_name }},mac={{ hostvars[kubeinit_deployment_node_name].mac }},virtualport.parameters.interfaceid={{ hostvars[kubeinit_deployment_node_name].interfaceid }},target.dev=veth0-{{ hostvars[kubeinit_deployment_node_name].ansible_host | ansible.utils.ip4_hex }},model=virtio \
             --graphics none \
             --noautoconsole \
             --import \

diff --git a/kubeinit/roles/kubeinit_libvirt/tasks/deploy_coreos_guest.yml b/kubeinit/roles/kubeinit_libvirt/tasks/deploy_coreos_guest.yml
@@ -35,7 +35,7 @@
             --os-type=linux \
             --os-variant=fedora29 \
             --autostart \
-            --network network={{ kubeinit_cluster_hostvars.network_name }},mac={{ hostvars[kubeinit_deployment_node_name].mac }},virtualport.parameters.interfaceid={{ hostvars[kubeinit_deployment_node_name].interfaceid }},target.dev=veth0-{{ hostvars[kubeinit_deployment_node_name].ansible_host | ansible.netcommon.ip4_hex }},model=virtio \
+            --network network={{ kubeinit_cluster_hostvars.network_name }},mac={{ hostvars[kubeinit_deployment_node_name].mac }},virtualport.parameters.interfaceid={{ hostvars[kubeinit_deployment_node_name].interfaceid }},target.dev=veth0-{{ hostvars[kubeinit_deployment_node_name].ansible_host | ansible.utils.ip4_hex }},model=virtio \
             --disk {{ kubeinit_libvirt_target_image_dir }}/{{ hostvars[kubeinit_deployment_node_name].guest_name }}.qcow2,format=qcow2,bus=virtio,size={{ hostvars[kubeinit_deployment_node_name].disk | replace('G','') }},readonly=false \
             --location {{ kubeinit_libvirt_target_image_dir }}/ \
             --extra-args "${kernel_args}"

diff --git a/kubeinit/roles/kubeinit_libvirt/tasks/deploy_debian_guest.yml b/kubeinit/roles/kubeinit_libvirt/tasks/deploy_debian_guest.yml
@@ -90,7 +90,7 @@
             --os-type=linux \
             --os-variant=ubuntu18.04 \
             --autostart \
-            --network network={{ kubeinit_cluster_hostvars.network_name }},mac={{ hostvars[kubeinit_deployment_node_name].mac }},virtualport.parameters.interfaceid={{ hostvars[kubeinit_deployment_node_name].interfaceid }},target.dev=veth0-{{ hostvars[kubeinit_deployment_node_name].ansible_host | ansible.netcommon.ip4_hex }},model=virtio \
+            --network network={{ kubeinit_cluster_hostvars.network_name }},mac={{ hostvars[kubeinit_deployment_node_name].mac }},virtualport.parameters.interfaceid={{ hostvars[kubeinit_deployment_node_name].interfaceid }},target.dev=veth0-{{ hostvars[kubeinit_deployment_node_name].ansible_host | ansible.utils.ip4_hex }},model=virtio \
             --graphics none \
             --noautoconsole \
             --import \

diff --git a/kubeinit/roles/kubeinit_libvirt/tasks/deploy_ubuntu_guest.yml b/kubeinit/roles/kubeinit_libvirt/tasks/deploy_ubuntu_guest.yml
@@ -90,7 +90,7 @@
             --os-type=linux \
             --os-variant=ubuntu18.04 \
             --autostart \
-            --network network={{ kubeinit_cluster_hostvars.network_name }},mac={{ hostvars[kubeinit_deployment_node_name].mac }},virtualport.parameters.interfaceid={{ hostvars[kubeinit_deployment_node_name].interfaceid }},target.dev=veth0-{{ hostvars[kubeinit_deployment_node_name].ansible_host | ansible.netcommon.ip4_hex }},model=virtio \
+            --network network={{ kubeinit_cluster_hostvars.network_name }},mac={{ hostvars[kubeinit_deployment_node_name].mac }},virtualport.parameters.interfaceid={{ hostvars[kubeinit_deployment_node_name].interfaceid }},target.dev=veth0-{{ hostvars[kubeinit_deployment_node_name].ansible_host | ansible.utils.ip4_hex }},model=virtio \
             --graphics none \
             --noautoconsole \
             --import \

diff --git a/kubeinit/roles/kubeinit_libvirt/tasks/deploy_windows_guest.yml b/kubeinit/roles/kubeinit_libvirt/tasks/deploy_windows_guest.yml
@@ -99,7 +99,7 @@
           --memory memory={{ hostvars[kubeinit_deployment_node_name].ram|int // 1024 }} \
           --cpuset=auto \
           --vcpus={{ hostvars[kubeinit_deployment_node_name].vcpus }},maxvcpus={{ hostvars[kubeinit_deployment_node_name].maxvcpus }} \
-          --network network={{ kubeinit_cluster_hostvars.network_name }},mac={{ hostvars[kubeinit_deployment_node_name].mac }},virtualport.parameters.interfaceid={{ hostvars[kubeinit_deployment_node_name].interfaceid }},target.dev=veth0-{{ hostvars[kubeinit_deployment_node_name].ansible_host | ansible.netcommon.ip4_hex }},model=virtio \
+          --network network={{ kubeinit_cluster_hostvars.network_name }},mac={{ hostvars[kubeinit_deployment_node_name].mac }},virtualport.parameters.interfaceid={{ hostvars[kubeinit_deployment_node_name].interfaceid }},target.dev=veth0-{{ hostvars[kubeinit_deployment_node_name].ansible_host | ansible.utils.ip4_hex }},model=virtio \
           --disk path={{ kubeinit_libvirt_target_image_dir }}/{{ hostvars[kubeinit_deployment_node_name].guest_name }}.qcow2,format=qcow2,bus=virtio \
           --cdrom {{ kubeinit_libvirt_target_image_dir }}/SERVER_EVAL_x64FRE_en-us.iso \
           --disk path={{ kubeinit_libvirt_target_image_dir }}/{{ kubeinit_libvirt_virtio_image_name }},device=cdrom \