Kamesh Sampath 5 vuotta sitten
vanhempi
commit
d8aafb233a

+ 5 - 5
README.md

@@ -10,8 +10,8 @@ Ansible to create [minikube](https://minikube.sigs.k8s.io) cluster.
 
 ```shell
 pip3 install \
-  -r https://raw.githubusercontent.com/kameshsampath/kameshsampath.minikube/master/requirements.txt
-ansible-galaxy role install -r https://raw.githubusercontent.com/kameshsampath/kameshsampath.minikube/master/requirements.yml
+  -r https://raw.githubusercontent.com/kameshsampath/ansible-role-minikube/master/requirements.txt
+ansible-galaxy role install -r https://raw.githubusercontent.com/kameshsampath/ansible-role-minikube/master/requirements.yml
 ```
 __NOTE__: For Windows its recommended to use Windows Subsystem for Linux (WSL)
 
@@ -38,7 +38,7 @@ __NOTE__: For Windows its recommended to use Windows Subsystem for Linux (WSL)
 
 ## License
 
-[Apache v2](https://github.com/kameshsampath/kameshsampath.minikube/tree/master/LICENSE)
+[Apache v2](https://github.com/kameshsampath/ansible-role-minikube/tree/master/LICENSE)
 
 ## Author Information
 
@@ -46,7 +46,7 @@ __NOTE__: For Windows its recommended to use Windows Subsystem for Linux (WSL)
 
 ## Issues
 
-[Issues](https://github.com/kameshsampath/kameshsampath.minikube/issues)
+[Issues](https://github.com/kameshsampath/ansible-role-minikube/issues)
 
 ## Testing
 
@@ -56,7 +56,7 @@ __NOTE__: For Windows its recommended to use Windows Subsystem for Linux (WSL)
 - Extra Python modules
 ```shell
 pip3 install \
-  -r https://raw.githubusercontent.com/kameshsampath/kameshsampath.minikube/master/molecule/requirements.txt
+  -r https://raw.githubusercontent.com/kameshsampath/ansible-role-minikube/master/molecule/requirements.txt
 ```
 
 All tests are built using [molecule](https://molecule.readthedocs.io/en/latest/index.html) with following scenarios:

+ 0 - 1
meta/main.yml

@@ -17,7 +17,6 @@ galaxy_info:
     - name: Ubuntu
       versions:
       - all
-  
   galaxy_tags:
     - kind
     - kubernetes

+ 10 - 9
molecule/common/verify_tasks.yml

@@ -7,12 +7,13 @@
 - name: Get minikube Version
   command:
     argv:
-      - '{{minikube_dir_result.stat.path}}'
+      - '{{ minikube_dir_result.stat.path }}'
       - version
   register: minikube_version_out
   changed_when: False
 
-- set_fact: 
+- name: Set actual version
+  set_fact:
     actual_version: "{{ minikube_version_out.stdout | regex_search(minikube_version) }}"
 
 - name: Verify minikube version
@@ -24,20 +25,20 @@
     argv:
       - /usr/local/bin/minikube
       - -p
-      - "{{minikube_profile_name}}"
+      - "{{ minikube_profile_name }}"
       - addons
       - list
       - --output=json
   register: minikube_addons_json
   changed_when: False
-  
-- set_fact:
-    output_json: "{{minikube_addons_json.stdout|from_json}}"
-      
+
+- name: Set Minikube addons list as JSON
+  set_fact:
+    output_json: "{{ minikube_addons_json.stdout|from_json }}"
+
 - name: Verify addons status
   assert:
-    that: "{{output_json[item].Status == 'enabled'}}"
+    that: "{{ output_json[item].Status == 'enabled' }}"
   with_items:
     - registry
     - registry-aliases
-  

+ 6 - 4
molecule/default/destroy.yml

@@ -6,17 +6,19 @@
   vars:
     ansible_python_interpreter: '{{ ansible_playbook_python }}'
     minikube_profile_name: molecule
+
   tasks:
-    - name: "Delete minikube profile {{minikube_profile_name}}"
+    - name: "Delete minikube profile {{ minikube_profile_name }}"
       command:
         argv:
           - minikube
           - -p
-          - "{{minikube_profile_name}}"
+          - "{{ minikube_profile_name }}"
           - delete
+      changed_when: False
       register: delete_test_res
-    - name: Fail when not cleaned 
+
+    - name: Fail when not cleaned
       fail:
         msg: "Error while deleting test resources"
       when: delete_test_res.rc != 0
-      

+ 2 - 2
molecule/pre_reqs/verify.yml

@@ -5,6 +5,6 @@
 
   vars:
     ansible_python_interpreter: '{{ ansible_playbook_python }}'
-    
+
   tasks:
-   - import_tasks: ../common/tasks/verify.yml
+   - import_tasks: ../common/verify_tasks.yml

+ 0 - 2
requirements.yml

@@ -1,5 +1,3 @@
 ---
 roles:
   - name: kameshsampath.minikube
-    src: https://github.com/kameshsampath/kameshsampath.minikube
-    version: master

+ 2 - 2
tasks/main.yml

@@ -9,13 +9,13 @@
 ###################################
 # Create
 ###################################
-- name: 'Create minikube {{minikube_profile_name}} Cluster'
+- name: 'Create minikube {{ minikube_profile_name }} Cluster'
   include_tasks: minikube_create.yml
   when: minikube_create
 
 ###################################
 # Destroy
 ###################################
-- name: 'Destroy minikube {{minikube_profile_name}} Cluster'
+- name: 'Destroy minikube {{ minikube_profile_name }} Cluster'
   include_tasks: minikube_destroy.yml
   when: minikube_destroy | default(False)

+ 19 - 19
tasks/minikube_create.yml

@@ -1,8 +1,8 @@
 ---
-- name: "Check if {{minikube_profile_name}} already exists"
+- name: "Check if {{ minikube_profile_name }} already exists"
   command:
     argv:
-      - "{{minikube_binary}}"
+      - "{{ minikube_binary }}"
       - "profile"
       - "list"
   register: profile_check_result
@@ -15,29 +15,29 @@
   when: profile_check_result.stderr is defined
 
 - name: Set existing profile name
-  set_fact: 
-    profile_name: '{{ profile_check_result.stdout_lines | join("~") | regex_search(minikube_profile_name)}}'
+  set_fact:
+    profile_name: '{{ profile_check_result.stdout_lines | join("~") | regex_search(minikube_profile_name) }}'
   when: no_profiles is not defined
 
-# - debug: msg="{{profile_check_result}}" 
+# - debug: msg="{{ profile_check_result }}" 
 
-- name: "Create minikube with profile {{minikube_profile_name}}"
+- name: "Create minikube with profile {{ minikube_profile_name }}"
   command:
       argv:
-        - "{{minikube_binary}}"
+        - "{{ minikube_binary }}"
         - -p
-        - "{{minikube_profile_name}}"
+        - "{{ minikube_profile_name }}"
         - start
         # TODO #2 load the start up parameters from CLI
-        - --memory={{minikube_memory}}
-        - --cpus={{minikube_cpus}}
-        - --disk-size={{minikube_disk_size}}
+        - --memory={{ minikube_memory }}
+        - --cpus={{ minikube_cpus }}
+        - --disk-size={{ minikube_disk_size }}
         - --delete-on-failure=true
-        - --driver={{minikube_driver}}
+        - --driver={{ minikube_driver }}
   register: minikube_start_result
   when: (no_profiles is defined and no_profiles | length > 0) or (profile_name is defined and profile_name | length == 0)
 
-# - debug: msg="{{minikube_start_result}}"
+# - debug: msg="{{ minikube_start_result }}"
 
 - name: "Fail when not started"
   fail:
@@ -47,18 +47,18 @@
 - name: "Set profile as current profile"
   command:
      argv:
-       - "{{minikube_binary}}"
+       - "{{ minikube_binary }}"
        - profile
-       - "{{minikube_profile_name}}"
+       - "{{ minikube_profile_name }}"
   changed_when: False
-  
+
 - name: "Enabling addon"
   command:
      argv:
-       - "{{minikube_binary}}"
+       - "{{ minikube_binary }}"
        - addons
        - enable
-       - "{{item}}"
-  loop: "{{minikube_addons}}"
+       - "{{ item }}"
+  loop: "{{ minikube_addons }}"
   register: addons_enable_result
   changed_when: False

+ 5 - 6
tasks/minikube_destroy.yml

@@ -1,16 +1,15 @@
 ---
-
-- name: "Delete minikube cluster {{minikube_profile_name}}"
+- name: "Delete minikube cluster {{ minikube_profile_name }}"
   command:
     argv:
-      - "{{minikube_binary}}"
-      - -p 
-      - "{{minikube_profile_name}}"
+      - "{{ minikube_binary }}"
+      - -p
+      - "{{ minikube_profile_name }}"
       - delete
   register: delete_test_res
   changed_when: False
 
-- name: Fail when not cleaned 
+- name: Fail when not cleaned
   fail:
     msg: "Error while deleting minikube resources"
   when: delete_test_res.rc != 0

+ 14 - 14
tasks/minikube_pre_reqs.yml

@@ -1,10 +1,10 @@
 ---
 - name: Create minikube Home Dir
   file:
-    state: directory 
-    name: "{{item}}"
+    state: directory
+    name: "{{ item }}"
   loop:
-    - "{{minikube_home_dir}}"
+    - "{{ minikube_home_dir }}"
 
 - name: Check if minikube is installed
   stat:
@@ -15,46 +15,46 @@
 - name: "Check for minikube updates"
   command:
     argv:
-      - "{{minikube_stat_result.stat.path}}"
+      - "{{ minikube_stat_result.stat.path }}"
       - update-check
   register: minikube_result
   when: minikube_stat_result.stat.exists
 
 - name: Set minikube versions
-  set_fact: 
+  set_fact:
     current_version: "{{ minikube_result.stdout_lines[0] | regex_search('v\\d+.\\d+.\\d+') }}"
     new_version: "{{ minikube_result.stdout_lines[1] | regex_search('v\\d+.\\d+.\\d+') }}"
   when: minikube_result is defined and minikube_result.rc == 0 and minikube_result.stdout_lines
 
 - name: Minikube Version Check
-  debug: 
-     msg: "Current Version {{current_version}}, New Version: {{new_version}}"
+  debug:
+     msg: "Current Version {{ current_version }}, New Version: {{ new_version }}"
 
 - name: Set minikube current and update versions
   set_fact:
-    need_to_download: '{{ not minikube_stat_result.stat.exists or current_version is version(new_version,"<",strict=False)}}'
+    need_to_download: '{{ not minikube_stat_result.stat.exists or current_version is version(new_version,"<" ,strict=False) }}'
 
 - name: set minikube version fact
   set_fact:
-    minikube_version: "{{new_version}}"
+    minikube_version: "{{ new_version }}"
   when: current_version is version(new_version,"<",strict=False)
 
 - name: Set minikube macOS download binary
   set_fact:
-      minikube_download_binary: "https://github.com/kubernetes/minikube/releases/download/{{minikube_version}}/minikube-darwin-amd64"
+      minikube_download_binary: "https://github.com/kubernetes/minikube/releases/download/{{ minikube_version }}/minikube-darwin-amd64"
   when: need_to_download  and ansible_os_family == "Darwin"
 
 - name: Set minikube Linux download binary
   set_fact:
-      minikube_download_binary: "https://github.com/kubernetes/minikube/releases/download/{{minikube_version}}/minikube-linux-amd64"
+      minikube_download_binary: "https://github.com/kubernetes/minikube/releases/download/{{ minikube_version }}/minikube-linux-amd64"
   when: need_to_download and (ansible_os_family == "RedHat" or ansible_os_family == "CentOS" or ansible_os_family == "Debian")
 
 - name: Set minikube Windows download binary
   set_fact:
-      minikube_download_binary: "https://github.com/kubernetes/minikube/releases/download/{{minikube_version}}/minikube-windows-amd64"
+      minikube_download_binary: "https://github.com/kubernetes/minikube/releases/download/{{ minikube_version }}/minikube-windows-amd64"
   when: need_to_download and ansible_os_family == "Windows"
 
-- name: Create user local bin directory 
+- name: Create user local bin directory
   file:
     path: /usr/local/bin
     state: directory
@@ -63,7 +63,7 @@
 
 - name: Download minikube binary
   get_url:
-    url: "{{minikube_download_binary}}"
+    url: "{{ minikube_download_binary }}"
     dest: "/usr/local/bin/minikube"
     mode: "0755"
     force: yes