diff options
author | Seth Foster <fosterbseth@gmail.com> | 2022-09-27 19:15:59 +0200 |
---|---|---|
committer | Seth Foster <fosterbseth@gmail.com> | 2022-10-31 18:52:48 +0100 |
commit | 529a936d0a7f5ff1defa415bae34f931d305bcf7 (patch) | |
tree | 66322a2a1c127d4a82deb528c5abfd75e9b82dc8 /tools/docker-compose-minikube | |
parent | Fix Schedules Form date validation same day different time scenario (#13062) (diff) | |
download | awx-529a936d0a7f5ff1defa415bae34f931d305bcf7.tar.xz awx-529a936d0a7f5ff1defa415bae34f931d305bcf7.zip |
Make installing minikube optional in dev setup
Diffstat (limited to 'tools/docker-compose-minikube')
-rw-r--r-- | tools/docker-compose-minikube/minikube/defaults/main.yml | 4 | ||||
-rw-r--r-- | tools/docker-compose-minikube/minikube/tasks/main.yml | 39 |
2 files changed, 26 insertions, 17 deletions
diff --git a/tools/docker-compose-minikube/minikube/defaults/main.yml b/tools/docker-compose-minikube/minikube/defaults/main.yml index b61ada8d34..a0cb7bdf03 100644 --- a/tools/docker-compose-minikube/minikube/defaults/main.yml +++ b/tools/docker-compose-minikube/minikube/defaults/main.yml @@ -9,8 +9,8 @@ addons: minikube_url_linux: 'https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64' minikube_url_macos: 'https://storage.googleapis.com/minikube/releases/latest/minikube-darwin-amd64' -kubectl_url_linux: 'https://dl.k8s.io/release/v1.21.0/bin/linux/amd64/kubectl' -kubectl_url_macos: 'https://dl.k8s.io/release/v1.21.0/bin/darwin/amd64/kubectl' +kubectl_url_linux: 'https://dl.k8s.io/release/v1.25.0/bin/linux/amd64/kubectl' +kubectl_url_macos: 'https://dl.k8s.io/release/v1.25.0/bin/darwin/amd64/kubectl' # Service Account Name minikube_service_account_name: 'awx-devel' diff --git a/tools/docker-compose-minikube/minikube/tasks/main.yml b/tools/docker-compose-minikube/minikube/tasks/main.yml index 9ddef11167..0cf9c841a9 100644 --- a/tools/docker-compose-minikube/minikube/tasks/main.yml +++ b/tools/docker-compose-minikube/minikube/tasks/main.yml @@ -8,6 +8,10 @@ state: 'directory' mode: '0700' +- name: debug minikube_setup + debug: + var: minikube_setup + # Linux block - block: - name: Download Minikube @@ -24,6 +28,7 @@ when: - ansible_architecture == "x86_64" - ansible_system == "Linux" + - minikube_setup | default(False) | bool # MacOS block - block: @@ -41,25 +46,29 @@ when: - ansible_architecture == "x86_64" - ansible_system == "Darwin" + - minikube_setup | default(False) | bool -- name: Starting Minikube - shell: "{{ sources_dest }}/minikube start --driver={{ driver }} --install-addons=true --addons={{ addons | join(',') }}" - register: minikube_stdout +- block: + - name: Starting Minikube + shell: "{{ sources_dest }}/minikube start --driver={{ driver }} --install-addons=true --addons={{ addons | join(',') }}" + register: minikube_stdout -- name: Enable Ingress Controller on Minikube - shell: "{{ sources_dest }}/minikube addons enable ingress" - when: - - minikube_stdout.rc == 0 - register: _minikube_ingress - ignore_errors: true + - name: Enable Ingress Controller on Minikube + shell: "{{ sources_dest }}/minikube addons enable ingress" + when: + - minikube_stdout.rc == 0 + register: _minikube_ingress + ignore_errors: true -- name: Show Minikube Ingress known-issue 7332 warning - pause: - seconds: 5 - prompt: "The Minikube Ingress addon has been disabled since it looks like you are hitting https://github.com/kubernetes/minikube/issues/7332" + - name: Show Minikube Ingress known-issue 7332 warning + pause: + seconds: 5 + prompt: "The Minikube Ingress addon has been disabled since it looks like you are hitting https://github.com/kubernetes/minikube/issues/7332" + when: + - '"minikube/issues/7332" in _minikube_ingress.stderr' + - ansible_system == "Darwin" when: - - '"minikube/issues/7332" in _minikube_ingress.stderr' - - ansible_system == "Darwin" + - minikube_setup | default(False) | bool - name: Create ServiceAccount and clusterRoleBinding k8s: |