[ci skip] Flatten module wrappers into stack roots
Remove the module "xxx" { source = "./module" } indirection layer
from all 66 service stacks. Resources are now defined directly in
each stack's main.tf instead of through a wrapper module.
- Merge module/main.tf contents into stack main.tf
- Apply variable replacements (var.tier -> local.tiers.X, renamed vars)
- Fix shared module paths (one fewer ../ at each level)
- Move extra files/dirs (factory/, chart_values, subdirs) to stack root
- Update state files to strip module.<name>. prefix
- Update CLAUDE.md to reflect flat structure
Verified: terragrunt plan shows 0 add, 0 destroy across all stacks.
This commit is contained in:
Viktor Barzin
parent
b0499a7f31
commit
c7c7047f1c
245 changed files with 11733 additions and 12432 deletions
|
|
@ -17,15 +17,193 @@ locals {
|
|||
}
|
||||
}
|
||||
|
||||
module "webhook_handler" {
|
||||
source = "./module"
|
||||
tls_secret_name = var.tls_secret_name
|
||||
webhook_secret = var.webhook_handler_secret
|
||||
fb_verify_token = var.webhook_handler_fb_verify_token
|
||||
fb_page_token = var.webhook_handler_fb_page_token
|
||||
fb_app_secret = var.webhook_handler_fb_app_secret
|
||||
git_user = var.webhook_handler_git_user
|
||||
git_token = var.webhook_handler_git_token
|
||||
ssh_key = var.webhook_handler_ssh_key
|
||||
tier = local.tiers.aux
|
||||
resource "kubernetes_namespace" "webhook-handler" {
|
||||
metadata {
|
||||
name = "webhook-handler"
|
||||
labels = {
|
||||
tier = local.tiers.aux
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module "tls_secret" {
|
||||
source = "../../modules/kubernetes/setup_tls_secret"
|
||||
namespace = kubernetes_namespace.webhook-handler.metadata[0].name
|
||||
tls_secret_name = var.tls_secret_name
|
||||
}
|
||||
|
||||
resource "kubernetes_cluster_role" "deployment_updater" {
|
||||
metadata {
|
||||
name = "deployment-updater"
|
||||
}
|
||||
|
||||
rule {
|
||||
verbs = ["create", "update", "get", "patch", "list"]
|
||||
api_groups = ["extensions", "apps", ""]
|
||||
resources = ["deployments", "namespaces", "pods", "services"]
|
||||
}
|
||||
}
|
||||
|
||||
resource "kubernetes_cluster_role_binding" "update_deployment_binding" {
|
||||
metadata {
|
||||
name = "update-deployment-binding"
|
||||
}
|
||||
|
||||
subject {
|
||||
kind = "ServiceAccount"
|
||||
name = "default"
|
||||
namespace = kubernetes_namespace.webhook-handler.metadata[0].name
|
||||
}
|
||||
|
||||
role_ref {
|
||||
api_group = "rbac.authorization.k8s.io"
|
||||
kind = "ClusterRole"
|
||||
name = "deployment-updater"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
resource "kubernetes_secret" "ssh-key" {
|
||||
metadata {
|
||||
name = "ssh-key"
|
||||
namespace = kubernetes_namespace.webhook-handler.metadata[0].name
|
||||
|
||||
annotations = {
|
||||
"reloader.stakater.com/match" = "true"
|
||||
}
|
||||
}
|
||||
data = {
|
||||
"id_rsa" = var.webhook_handler_ssh_key
|
||||
}
|
||||
type = "generic"
|
||||
}
|
||||
resource "kubernetes_deployment" "webhook_handler" {
|
||||
metadata {
|
||||
name = "webhook-handler"
|
||||
namespace = kubernetes_namespace.webhook-handler.metadata[0].name
|
||||
labels = {
|
||||
app = "webhook-handler"
|
||||
tier = local.tiers.aux
|
||||
}
|
||||
annotations = {
|
||||
"reloader.stakater.com/search" = "true"
|
||||
}
|
||||
}
|
||||
spec {
|
||||
replicas = 1
|
||||
selector {
|
||||
match_labels = {
|
||||
app = "webhook-handler"
|
||||
}
|
||||
}
|
||||
template {
|
||||
metadata {
|
||||
labels = {
|
||||
app = "webhook-handler"
|
||||
}
|
||||
}
|
||||
spec {
|
||||
container {
|
||||
# security_context {
|
||||
# run_as_user = 1000
|
||||
# }
|
||||
# lifecycle {
|
||||
# post_start {
|
||||
# exec {
|
||||
# # Must be kept in sycn with webhook_handler dockerfile
|
||||
# command = ["echo", "\"$SSH_KEY\"", ">", "/opt/id_rsa", "&&", "chown", "appuser", "/opt/id_rsa", "&&", "chmod", "600", "/opt/id_rsa"]
|
||||
# }
|
||||
# }
|
||||
# }
|
||||
image = "viktorbarzin/webhook-handler:latest"
|
||||
name = "webhook-handler"
|
||||
resources {
|
||||
limits = {
|
||||
cpu = "0.5"
|
||||
memory = "512Mi"
|
||||
}
|
||||
requests = {
|
||||
cpu = "250m"
|
||||
memory = "50Mi"
|
||||
}
|
||||
}
|
||||
port {
|
||||
container_port = 80
|
||||
}
|
||||
volume_mount {
|
||||
name = "id-rsa"
|
||||
mount_path = "/opt/id_rsa"
|
||||
sub_path = "id_rsa"
|
||||
}
|
||||
env {
|
||||
name = "WEBHOOKSECRET"
|
||||
value = var.webhook_handler_secret
|
||||
}
|
||||
env {
|
||||
name = "FB_APP_SECRET"
|
||||
value = var.webhook_handler_fb_app_secret
|
||||
}
|
||||
env {
|
||||
name = "FB_VERIFY_TOKEN"
|
||||
value = var.webhook_handler_fb_verify_token
|
||||
}
|
||||
env {
|
||||
name = "FB_PAGE_TOKEN"
|
||||
value = var.webhook_handler_fb_page_token
|
||||
}
|
||||
env {
|
||||
name = "CONFIG"
|
||||
value = "./chatbot/config/viktorwebservices.yaml"
|
||||
}
|
||||
env {
|
||||
name = "GIT_USER"
|
||||
value = var.webhook_handler_git_user
|
||||
}
|
||||
env {
|
||||
name = "GIT_TOKEN"
|
||||
value = var.webhook_handler_git_token
|
||||
}
|
||||
env {
|
||||
name = "SSH_KEY"
|
||||
value = "/opt/id_rsa"
|
||||
}
|
||||
}
|
||||
volume {
|
||||
name = "id-rsa"
|
||||
secret {
|
||||
secret_name = "ssh-key"
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
resource "kubernetes_service" "webhook_handler" {
|
||||
metadata {
|
||||
name = "webhook-handler"
|
||||
namespace = kubernetes_namespace.webhook-handler.metadata[0].name
|
||||
labels = {
|
||||
"app" = "webhook-handler"
|
||||
}
|
||||
}
|
||||
|
||||
spec {
|
||||
selector = {
|
||||
app = "webhook-handler"
|
||||
}
|
||||
port {
|
||||
port = "80"
|
||||
target_port = "3000"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module "ingress" {
|
||||
source = "../../modules/kubernetes/ingress_factory"
|
||||
namespace = kubernetes_namespace.webhook-handler.metadata[0].name
|
||||
name = "webhook-handler"
|
||||
host = "webhook"
|
||||
tls_secret_name = var.tls_secret_name
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,201 +0,0 @@
|
|||
|
||||
variable "tls_secret_name" {}
|
||||
variable "tier" { type = string }
|
||||
variable "webhook_secret" {}
|
||||
variable "fb_verify_token" {}
|
||||
variable "fb_page_token" {}
|
||||
variable "fb_app_secret" {}
|
||||
variable "git_user" {}
|
||||
variable "git_token" {}
|
||||
variable "ssh_key" {}
|
||||
|
||||
resource "kubernetes_namespace" "webhook-handler" {
|
||||
metadata {
|
||||
name = "webhook-handler"
|
||||
labels = {
|
||||
tier = var.tier
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module "tls_secret" {
|
||||
source = "../../../modules/kubernetes/setup_tls_secret"
|
||||
namespace = kubernetes_namespace.webhook-handler.metadata[0].name
|
||||
tls_secret_name = var.tls_secret_name
|
||||
}
|
||||
|
||||
resource "kubernetes_cluster_role" "deployment_updater" {
|
||||
metadata {
|
||||
name = "deployment-updater"
|
||||
}
|
||||
|
||||
rule {
|
||||
verbs = ["create", "update", "get", "patch", "list"]
|
||||
api_groups = ["extensions", "apps", ""]
|
||||
resources = ["deployments", "namespaces", "pods", "services"]
|
||||
}
|
||||
}
|
||||
|
||||
resource "kubernetes_cluster_role_binding" "update_deployment_binding" {
|
||||
metadata {
|
||||
name = "update-deployment-binding"
|
||||
}
|
||||
|
||||
subject {
|
||||
kind = "ServiceAccount"
|
||||
name = "default"
|
||||
namespace = kubernetes_namespace.webhook-handler.metadata[0].name
|
||||
}
|
||||
|
||||
role_ref {
|
||||
api_group = "rbac.authorization.k8s.io"
|
||||
kind = "ClusterRole"
|
||||
name = "deployment-updater"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
resource "kubernetes_secret" "ssh-key" {
|
||||
metadata {
|
||||
name = "ssh-key"
|
||||
namespace = kubernetes_namespace.webhook-handler.metadata[0].name
|
||||
|
||||
annotations = {
|
||||
"reloader.stakater.com/match" = "true"
|
||||
}
|
||||
}
|
||||
data = {
|
||||
"id_rsa" = var.ssh_key
|
||||
}
|
||||
type = "generic"
|
||||
}
|
||||
resource "kubernetes_deployment" "webhook_handler" {
|
||||
metadata {
|
||||
name = "webhook-handler"
|
||||
namespace = kubernetes_namespace.webhook-handler.metadata[0].name
|
||||
labels = {
|
||||
app = "webhook-handler"
|
||||
tier = var.tier
|
||||
}
|
||||
annotations = {
|
||||
"reloader.stakater.com/search" = "true"
|
||||
}
|
||||
}
|
||||
spec {
|
||||
replicas = 1
|
||||
selector {
|
||||
match_labels = {
|
||||
app = "webhook-handler"
|
||||
}
|
||||
}
|
||||
template {
|
||||
metadata {
|
||||
labels = {
|
||||
app = "webhook-handler"
|
||||
}
|
||||
}
|
||||
spec {
|
||||
container {
|
||||
# security_context {
|
||||
# run_as_user = 1000
|
||||
# }
|
||||
# lifecycle {
|
||||
# post_start {
|
||||
# exec {
|
||||
# # Must be kept in sycn with webhook_handler dockerfile
|
||||
# command = ["echo", "\"$SSH_KEY\"", ">", "/opt/id_rsa", "&&", "chown", "appuser", "/opt/id_rsa", "&&", "chmod", "600", "/opt/id_rsa"]
|
||||
# }
|
||||
# }
|
||||
# }
|
||||
image = "viktorbarzin/webhook-handler:latest"
|
||||
name = "webhook-handler"
|
||||
resources {
|
||||
limits = {
|
||||
cpu = "0.5"
|
||||
memory = "512Mi"
|
||||
}
|
||||
requests = {
|
||||
cpu = "250m"
|
||||
memory = "50Mi"
|
||||
}
|
||||
}
|
||||
port {
|
||||
container_port = 80
|
||||
}
|
||||
volume_mount {
|
||||
name = "id-rsa"
|
||||
mount_path = "/opt/id_rsa"
|
||||
sub_path = "id_rsa"
|
||||
}
|
||||
env {
|
||||
name = "WEBHOOKSECRET"
|
||||
value = var.webhook_secret
|
||||
}
|
||||
env {
|
||||
name = "FB_APP_SECRET"
|
||||
value = var.fb_app_secret
|
||||
}
|
||||
env {
|
||||
name = "FB_VERIFY_TOKEN"
|
||||
value = var.fb_verify_token
|
||||
}
|
||||
env {
|
||||
name = "FB_PAGE_TOKEN"
|
||||
value = var.fb_page_token
|
||||
}
|
||||
env {
|
||||
name = "CONFIG"
|
||||
value = "./chatbot/config/viktorwebservices.yaml"
|
||||
}
|
||||
env {
|
||||
name = "GIT_USER"
|
||||
value = var.git_user
|
||||
}
|
||||
env {
|
||||
name = "GIT_TOKEN"
|
||||
value = var.git_token
|
||||
}
|
||||
env {
|
||||
name = "SSH_KEY"
|
||||
value = "/opt/id_rsa"
|
||||
}
|
||||
}
|
||||
volume {
|
||||
name = "id-rsa"
|
||||
secret {
|
||||
secret_name = "ssh-key"
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
resource "kubernetes_service" "webhook_handler" {
|
||||
metadata {
|
||||
name = "webhook-handler"
|
||||
namespace = kubernetes_namespace.webhook-handler.metadata[0].name
|
||||
labels = {
|
||||
"app" = "webhook-handler"
|
||||
}
|
||||
}
|
||||
|
||||
spec {
|
||||
selector = {
|
||||
app = "webhook-handler"
|
||||
}
|
||||
port {
|
||||
port = "80"
|
||||
target_port = "3000"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module "ingress" {
|
||||
source = "../../../modules/kubernetes/ingress_factory"
|
||||
namespace = kubernetes_namespace.webhook-handler.metadata[0].name
|
||||
name = "webhook-handler"
|
||||
host = "webhook"
|
||||
tls_secret_name = var.tls_secret_name
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue