zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-03-20 07:43:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make installing minikube optional in dev setup

Browse Source
This commit is contained in:
Seth Foster
2022-09-27 13:15:59 -04:00
parent e40824bded
commit 529a936d0a
4 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -454,6 +454,7 @@ COMPOSE_OPTS ?=
CONTROL_PLANE_NODE_COUNT ?= 1 CONTROL_PLANE_NODE_COUNT ?= 1
EXECUTION_NODE_COUNT ?= 2 EXECUTION_NODE_COUNT ?= 2
MINIKUBE_CONTAINER_GROUP ?= false MINIKUBE_CONTAINER_GROUP ?= false
MINIKUBE_SETUP ?= false # if false, run minikube separately
EXTRA_SOURCES_ANSIBLE_OPTS ?= EXTRA_SOURCES_ANSIBLE_OPTS ?=
ifneq ($(ADMIN_PASSWORD),) ifneq ($(ADMIN_PASSWORD),)
@@ -462,7 +463,7 @@ endif
docker-compose-sources: .git/hooks/pre-commit docker-compose-sources: .git/hooks/pre-commit
@if [ $(MINIKUBE_CONTAINER_GROUP) = true ]; then\ @if [ $(MINIKUBE_CONTAINER_GROUP) = true ]; then\
ansible-playbook -i tools/docker-compose/inventory tools/docker-compose-minikube/deploy.yml; \ ansible-playbook -i tools/docker-compose/inventory -e minikube_setup=$(MINIKUBE_SETUP) tools/docker-compose-minikube/deploy.yml; \
fi; fi;
ansible-playbook -i tools/docker-compose/inventory tools/docker-compose/ansible/sources.yml \ ansible-playbook -i tools/docker-compose/inventory tools/docker-compose/ansible/sources.yml \

4
tools/docker-compose-minikube/minikube/defaults/main.yml
View File

@@ -9,8 +9,8 @@ addons:
minikube_url_linux: 'https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64' 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' 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_linux: 'https://dl.k8s.io/release/v1.25.0/bin/linux/amd64/kubectl'
kubectl_url_macos: 'https://dl.k8s.io/release/v1.21.0/bin/darwin/amd64/kubectl' kubectl_url_macos: 'https://dl.k8s.io/release/v1.25.0/bin/darwin/amd64/kubectl'
# Service Account Name # Service Account Name
minikube_service_account_name: 'awx-devel' minikube_service_account_name: 'awx-devel'

15
tools/docker-compose-minikube/minikube/tasks/main.yml
View File

@@ -8,6 +8,10 @@
state: 'directory' state: 'directory'
mode: '0700' mode: '0700'
- name: debug minikube_setup
debug:
var: minikube_setup
# Linux block # Linux block
- block: - block:
- name: Download Minikube - name: Download Minikube
@@ -24,6 +28,7 @@
when: when:
- ansible_architecture == "x86_64" - ansible_architecture == "x86_64"
- ansible_system == "Linux" - ansible_system == "Linux"
- minikube_setup | default(False) | bool
# MacOS block # MacOS block
- block: - block:
@@ -41,25 +46,29 @@
when: when:
- ansible_architecture == "x86_64" - ansible_architecture == "x86_64"
- ansible_system == "Darwin" - ansible_system == "Darwin"
- minikube_setup | default(False) | bool
- name: Starting Minikube - block:
- name: Starting Minikube
shell: "{{ sources_dest }}/minikube start --driver={{ driver }} --install-addons=true --addons={{ addons | join(',') }}" shell: "{{ sources_dest }}/minikube start --driver={{ driver }} --install-addons=true --addons={{ addons | join(',') }}"
register: minikube_stdout register: minikube_stdout
- name: Enable Ingress Controller on Minikube - name: Enable Ingress Controller on Minikube
shell: "{{ sources_dest }}/minikube addons enable ingress" shell: "{{ sources_dest }}/minikube addons enable ingress"
when: when:
- minikube_stdout.rc == 0 - minikube_stdout.rc == 0
register: _minikube_ingress register: _minikube_ingress
ignore_errors: true ignore_errors: true
- name: Show Minikube Ingress known-issue 7332 warning - name: Show Minikube Ingress known-issue 7332 warning
pause: pause:
seconds: 5 seconds: 5
prompt: "The Minikube Ingress addon has been disabled since it looks like you are hitting https://github.com/kubernetes/minikube/issues/7332" prompt: "The Minikube Ingress addon has been disabled since it looks like you are hitting https://github.com/kubernetes/minikube/issues/7332"
when: when:
- '"minikube/issues/7332" in _minikube_ingress.stderr' - '"minikube/issues/7332" in _minikube_ingress.stderr'
- ansible_system == "Darwin" - ansible_system == "Darwin"
when:
- minikube_setup | default(False) | bool
- name: Create ServiceAccount and clusterRoleBinding - name: Create ServiceAccount and clusterRoleBinding
k8s: k8s:

10
tools/docker-compose/README.md
View File

@@ -301,11 +301,19 @@ Note that you may see multiple messages of the form `2021-03-04 20:11:47,666 WAR
To bring up a 1 node AWX + minikube that is accessible from AWX run the following. To bring up a 1 node AWX + minikube that is accessible from AWX run the following.
Start minikube
```bash
(host)$minikube start --cpus=4 --memory=8g --addons=ingress`
```
Start AWX
```bash ```bash
(host)$ make docker-compose-container-group (host)$ make docker-compose-container-group
``` ```
Alternatively, you can set the env var `MINIKUBE_CONTAINER_GROUP=true` to use the default dev env bring up. his way you can use other env flags like the cluster node count. Alternatively, you can set the env var `MINIKUBE_CONTAINER_GROUP=true` to use the default dev env bring up. his way you can use other env flags like the cluster node count. Set `MINIKUBE_SETUP=true` to make the roles download, install and run minikube for you, but if you run into issues with this just start minikube yourself.
```bash ```bash
(host)$ MINIKUBE_CONTAINER_GROUP=true make docker-compose (host)$ MINIKUBE_CONTAINER_GROUP=true make docker-compose