Skip to content
Merged
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
15 changes: 15 additions & 0 deletions modules/gcp/gke/namespace/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,27 @@ resource "kubernetes_namespace" "argocd" {
resource "kubernetes_namespace" "kafka" {
metadata {
name = "kafka"
labels = {
"istio-injection" = "enabled"
}
}
}

resource "kubernetes_namespace" "etcd" {
metadata {
name = "etcd"
labels = {
"istio-injection" = "enabled"
}
}
}

resource "kubernetes_namespace" "opentelemetry" {
metadata {
name = "opentelemetry"
labels = {
"istio-injection" = "enabled"
}
}
}

Expand All @@ -58,12 +67,18 @@ resource "kubernetes_namespace" "fetch-system" {
resource "kubernetes_namespace" "postgresql" {
metadata {
name = "postgresql"
labels = {
"istio-injection" = "enabled"
}
}
}

resource "kubernetes_namespace" "influxdata" {
metadata {
name = "influxdata"
labels = {
"istio-injection" = "enabled"
}
}
}

Expand Down
8 changes: 7 additions & 1 deletion modules/gcp/iam/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,12 @@ resource "google_service_account" "load_tester_sa" {
description = "Service account for Load Tester"
}

resource "google_project_iam_member" "load_tester_storage" {
project = var.project_id
role = "roles/storage.objectViewer"
member = "serviceAccount:${google_service_account.load_tester_sa.email}"
}

resource "google_storage_bucket_iam_member" "load_tester_role" {
bucket = "${var.project_id}-load-test"
role = "roles/storage.objectUser"
Expand All @@ -167,7 +173,7 @@ resource "google_service_account_iam_binding" "load_tester_workload_identity_bin
role = "roles/iam.workloadIdentityUser"

members = [
"serviceAccount:${var.project_id}.svc.id.goog[monitoring/load-tester-sa]"
"serviceAccount:${var.project_id}.svc.id.goog[fetch-system/load-tester-sa]"
]

depends_on = [google_service_account.load_tester_sa]
Expand Down
5 changes: 5 additions & 0 deletions modules/github/repository/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ resource "github_team_members" "devops_members" {
username = "ikjeong"
role = "maintainer"
}

members {
username = "goboolean-io"
role = "member"
}
}

resource "github_team_repository" "devops_access" {
Expand Down
10 changes: 2 additions & 8 deletions modules/infra/argocd/application/application.tf
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,9 @@ resource "argocd_application" "kustomize_application" {

sync_policy {
automated {
prune = true
prune = false
self_heal = true
allow_empty = true
}

sync_options = ["StatusForceHealth=true"]
}
}
}
Expand Down Expand Up @@ -87,12 +84,9 @@ resource "argocd_application" "helm_application" {

sync_policy {
automated {
prune = true
prune = false
self_heal = true
allow_empty = true
}

sync_options = ["StatusForceHealth=true"]
}
}
}
7 changes: 4 additions & 3 deletions modules/infra/etcd/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -446,8 +446,8 @@ sidecars: []
## @param podAnnotations [object] Annotations for etcd pods
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
##
podAnnotations:
sidecar.istio.io/inject: "true"
podAnnotations: {}


## @param podLabels [object] Extra labels for etcd pods
## Ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
Expand Down Expand Up @@ -600,7 +600,8 @@ service:
extraPorts: []
## @param service.annotations [object] Additional annotations for the etcd service
##
annotations: {}
annotations:
sidecar.istio.io/inject: "true"
## @param service.sessionAffinity Session Affinity for Kubernetes service, can be "None" or "ClientIP"
## If "ClientIP", consecutive client requests will be directed to the same Pod
## ref: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies
Expand Down
6 changes: 3 additions & 3 deletions modules/infra/influxdb/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ image:

## Annotations to be added to InfluxDB pods
##
podAnnotations:
sidecar.istio.io/inject: "true"
podAnnotations: {}

## Labels to be added to InfluxDB pods
##
podLabels: {}
podLabels:
sidecar.istio.io/inject: "true"

nameOverride: ""
fullnameOverride: ""
Expand Down
2 changes: 2 additions & 0 deletions modules/infra/istio/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ resource "helm_release" "istiod" {
namespace = "istio-system"
version = "1.24.2"

values = [file("${path.module}/values.yaml")]

depends_on = [helm_release.istio_base]
timeout = 300
}
Expand Down
Loading