Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #204

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/modules-add-to-project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# changes when modifying this workflow.

name: "add-to-project"
run-name: Adding this pull request to the project by @${{ github.actor }}

on:
workflow_call:
secrets:
Expand Down Expand Up @@ -35,4 +35,3 @@ jobs:
uses: toshimaru/[email protected]
with:
repo-token: ${{ secrets.PAT }}
author: 'GersonRS'
2 changes: 1 addition & 1 deletion .github/workflows/modules-linters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# changes when modifying this workflow.

name: "modules-linters"
run-name: Checking commits and code by @${{ github.actor }}

on:
workflow_call:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-antora-docs.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Publish to GitHub Pages with Lunr Search Extension
run-name: Deploy GitHub Pages site by @${{ github.actor }}

on:
push:
branches:
Expand Down
157 changes: 97 additions & 60 deletions examples/kind/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -93,21 +93,6 @@ module "oidc" {
}
}

module "postgresql" {
source = "git::https://github.com/GersonRS/modern-gitops-stack-module-postgresql.git?ref=v2.8.2"
cluster_name = local.cluster_name
base_domain = local.base_domain
subdomain = local.subdomain
cluster_issuer = local.cluster_issuer
argocd_project = local.cluster_name
app_autosync = local.app_autosync
enable_service_monitor = local.enable_service_monitor

dependency_ids = {
argocd = module.argocd_bootstrap.id
}
}

module "minio" {
source = "git::https://github.com/GersonRS/modern-gitops-stack-module-minio.git?ref=v2.6.2"

Expand All @@ -128,35 +113,35 @@ module "minio" {
}
}

module "mlflow" {
source = "git::https://github.com/GersonRS/modern-gitops-stack-module-mlflow.git?ref=v1.2.1"
cluster_name = local.cluster_name
base_domain = local.base_domain
subdomain = local.subdomain
cluster_issuer = local.cluster_issuer
argocd_project = local.cluster_name
app_autosync = local.app_autosync
enable_service_monitor = local.enable_service_monitor
# module "mlflow" {
# source = "git::https://github.com/GersonRS/modern-gitops-stack-module-mlflow.git?ref=v1.2.1"
# cluster_name = local.cluster_name
# base_domain = local.base_domain
# subdomain = local.subdomain
# cluster_issuer = local.cluster_issuer
# argocd_project = local.cluster_name
# app_autosync = local.app_autosync
# enable_service_monitor = local.enable_service_monitor

storage = {
bucket_name = "mlflow"
endpoint = module.minio.endpoint
access_key = module.minio.minio_root_user_credentials.username
secret_access_key = module.minio.minio_root_user_credentials.password
}
database = {
user = module.postgresql.credentials.user
password = module.postgresql.credentials.password
database = "mlflow"
service = module.postgresql.cluster_dns
}
dependency_ids = {
argocd = module.argocd_bootstrap.id
traefik = module.traefik.id
minio = module.minio.id
postgresql = module.postgresql.id
}
}
# storage = {
# bucket_name = "mlflow"
# endpoint = module.minio.endpoint
# access_key = module.minio.minio_root_user_credentials.username
# secret_access_key = module.minio.minio_root_user_credentials.password
# }
# database = {
# user = module.postgresql.credentials.user
# password = module.postgresql.credentials.password
# database = "mlflow"
# service = module.postgresql.cluster_dns
# }
# dependency_ids = {
# argocd = module.argocd_bootstrap.id
# traefik = module.traefik.id
# minio = module.minio.id
# postgresql = module.postgresql.id
# }
# }

# module "strimzi" {
# source = "git::https://github.com/GersonRS/modern-gitops-stack-module-strimzi.git?ref=v1.4.3"
Expand Down Expand Up @@ -393,26 +378,78 @@ module "kube-prometheus-stack" {
}
}

# module "spark" {
# source = "git::https://github.com/GersonRS/modern-gitops-stack-module-spark.git?ref=v1.5.1"
module "spark" {
source = "git::https://github.com/GersonRS/modern-gitops-stack-module-spark.git?ref=v1.5.1"

# cluster_name = local.cluster_name
# base_domain = local.base_domain
# subdomain = local.subdomain
# cluster_issuer = local.cluster_issuer
# argocd_project = local.cluster_name
# app_autosync = local.app_autosync
# enable_service_monitor = local.enable_service_monitor
cluster_name = local.cluster_name
base_domain = local.base_domain
subdomain = local.subdomain
cluster_issuer = local.cluster_issuer
argocd_project = local.cluster_name
app_autosync = local.app_autosync
enable_service_monitor = local.enable_service_monitor

# storage = {
# access_key = module.minio.minio_root_user_credentials.username
# secret_access_key = module.minio.minio_root_user_credentials.password
# }
storage = {
access_key = module.minio.minio_root_user_credentials.username
secret_access_key = module.minio.minio_root_user_credentials.password
}

# dependency_ids = {
# cert-manager = module.cert-manager.id
# }
# }
dependency_ids = {
argocd = module.argocd_bootstrap.id
traefik = module.traefik.id
cert-manager = module.cert-manager.id
minio = module.minio.id
}
}

module "postgresql" {
source = "git::https://github.com/GersonRS/modern-gitops-stack-module-postgresql.git?ref=v2.10.0"
cluster_name = local.cluster_name
base_domain = local.base_domain
subdomain = local.subdomain
cluster_issuer = local.cluster_issuer
argocd_project = local.cluster_name
app_autosync = local.app_autosync
enable_service_monitor = local.enable_service_monitor

dependency_ids = {
argocd = module.argocd_bootstrap.id
}
}

module "hive-metastore" {
source = "git::https://github.com/GersonRS/modern-gitops-stack-module-hive-metastore.git?ref=v1.2.0"

cluster_name = local.cluster_name
base_domain = local.base_domain
subdomain = local.subdomain
cluster_issuer = local.cluster_issuer
argocd_project = local.cluster_name
app_autosync = local.app_autosync
enable_service_monitor = local.enable_service_monitor

storage = {
bucket_name = "warehouse"
endpoint = module.minio.endpoint
access_key = module.minio.minio_root_user_credentials.username
secret_access_key = module.minio.minio_root_user_credentials.password
}
database = {
user = module.postgresql.credentials.user
password = module.postgresql.credentials.password
database = "metastore"
service = module.postgresql.cluster_dns
}

dependency_ids = {
argocd = module.argocd_bootstrap.id
traefik = module.traefik.id
cert-manager = module.cert-manager.id
minio = module.minio.id
postgresql = module.postgresql.id
spark = module.spark.id
}
}

# module "airflow" {
# source = "git::https://github.com/GersonRS/modern-gitops-stack-module-airflow.git?ref=v1.6.2"
Expand Down
3 changes: 3 additions & 0 deletions examples/kind/s3_buckets.tf
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,9 @@ locals {
{
name = "curated"
},
{
name = "warehouse"
},
{
name = "bronze"
},
Expand Down