Skip to content

Commit

Permalink
Fix mysql vardefs
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlos Gonzalez committed Sep 5, 2024
1 parent 7dc8c78 commit 44a0e21
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ An opinionated [ansible role](https://galaxy.ansible.com/nephelaiio/k8s) to boot
* [LongHorn](https://github.com/longhorn/charts) (Helm deployment)
* [Strimzi](https://operatorhub.io/operator/strimzi-kafka-operator) (Helm deployment)
* [Zalando Postgres](https://github.com/zalando/postgres-operator) Operator (Helm deployment)
* [MySQL Operator](https://dev.mysql.com/doc/mysql-operator/en/) (Helm deployment)
* [MySQL](https://github.com/bitnami/charts/tree/main/bitnami/mysql) (Helm deployment)
* [Grafana](https://github.com/grafana/grafana) (TODO)
* [Kyverno](https://github.com/kyverno/kyverno) (TODO)

Expand Down
3 changes: 2 additions & 1 deletion defaults/main/mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ k8s_mysql_chart:
release: "11.1.16"
last_checked: "2024-09-05T11:02:33-05:00"
k8s_mysql_deployments:
- namespace: "mysql"
- name: "mysql"
namespace: "mysql"
parameters: {}
5 changes: 3 additions & 2 deletions molecule/mysql/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ provisioner:

# mysql vardefs
k8s_mysql_deployments:
- namespace: "mysql"
- name: "mysql"
namespace: "mysql"
parameters:
architecture: standalone
auth:
Expand All @@ -60,7 +61,7 @@ provisioner:
k8s_opensearch_deploy: false
k8s_strimzi_deploy: false
k8s_argocd_deploy: false
k8s_longhorn_deploy: false
k8s_longhorn_deploy: true
k8s_zalando_deploy: false
k8s_mysql_deploy: true
k8s_nginx_deploy: false
Expand Down
10 changes: 5 additions & 5 deletions tasks/deploy/mysql.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
- name: Deploy MySQL operator chart
- name: Deploy bitnami MySQL chart
kubernetes.core.helm:
name: mysql
name: "{{ _chart_name }}"
chart_ref: "{{ k8s_mysql_chart.name }}"
chart_repo_url: "{{ k8s_mysql_chart.repo }}"
chart_version: "{{ _release }}"
release_namespace: "{{ _namespace }}"
release_namespace: "{{ item.namespace }}"
create_namespace: true
state: present
wait: true
Expand All @@ -15,7 +15,7 @@
values: "{{ item.parameters }}"
vars:
_release: "{{ k8s_mysql_chart_release | default(k8s_mysql_chart.release) }}"
_namespace: "{{ item.namespace }}"
_chart_name: "{{ item.name }}"
loop: "{{ k8s_mysql_deployments }}"
loop_control:
label: "{{ _namespace }}"
label: "{{ _chart_name }}"

0 comments on commit 44a0e21

Please sign in to comment.