fix
This commit is contained in:
@@ -1,5 +1,12 @@
|
||||
|
||||
resource "time_sleep" "wait_pg_ready" {
|
||||
depends_on = [kubectl_manifest.prj_pg]
|
||||
|
||||
create_duration = "90s"
|
||||
}
|
||||
|
||||
data "kubernetes_secret_v1" "postgresql_password" {
|
||||
depends_on = [ kubectl_manifest.prj_pg ]
|
||||
depends_on = [ time_sleep.wait_pg_ready ]
|
||||
metadata {
|
||||
name = "${var.instance}-${var.component}-superuser"
|
||||
namespace = "${var.namespace}"
|
||||
@@ -52,7 +59,7 @@ data "kubernetes_secret_v1" "password_get" {
|
||||
}
|
||||
|
||||
resource "postgresql_role" "owner" {
|
||||
depends_on = [ kubectl_manifest.prj_pg ]
|
||||
depends_on = [ time_sleep.wait_pg_ready ]
|
||||
count = length(local.sorted-dbs)
|
||||
name = "${local.sorted-dbs[count.index].name}"
|
||||
login = true
|
||||
|
||||
@@ -6,18 +6,49 @@ metadata:
|
||||
name: dataset-pg
|
||||
description: null
|
||||
options:
|
||||
replicas:
|
||||
default: 1
|
||||
storage:
|
||||
default: 8Gi
|
||||
examples:
|
||||
- 1
|
||||
type: integer
|
||||
- 8Gi
|
||||
type: string
|
||||
sub-domain:
|
||||
default: dataset-pg
|
||||
examples:
|
||||
- dataset-pg
|
||||
type: string
|
||||
extentions:
|
||||
default:
|
||||
pool:
|
||||
enable: false
|
||||
postgrest:
|
||||
enable: false
|
||||
image:
|
||||
pullPolicy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: postgrest/postgrest
|
||||
tag: v11.2.1
|
||||
swagger:
|
||||
enable: true
|
||||
pullPolicy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: swaggerapi/swagger-ui
|
||||
tag: v5.9.0
|
||||
examples:
|
||||
- pool:
|
||||
enable: false
|
||||
postgrest:
|
||||
enable: false
|
||||
image:
|
||||
pullPolicy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: postgrest/postgrest
|
||||
tag: v11.2.1
|
||||
swagger:
|
||||
enable: true
|
||||
pullPolicy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: swaggerapi/swagger-ui
|
||||
tag: v5.9.0
|
||||
properties:
|
||||
pool:
|
||||
default:
|
||||
@@ -27,7 +58,108 @@ options:
|
||||
default: false
|
||||
type: boolean
|
||||
type: object
|
||||
postgrest:
|
||||
default:
|
||||
enable: false
|
||||
image:
|
||||
pullPolicy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: postgrest/postgrest
|
||||
tag: v11.2.1
|
||||
swagger:
|
||||
enable: true
|
||||
pullPolicy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: swaggerapi/swagger-ui
|
||||
tag: v5.9.0
|
||||
properties:
|
||||
enable:
|
||||
default: false
|
||||
type: boolean
|
||||
image:
|
||||
default:
|
||||
pullPolicy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: postgrest/postgrest
|
||||
tag: v11.2.1
|
||||
properties:
|
||||
pullPolicy:
|
||||
default: IfNotPresent
|
||||
type: string
|
||||
registry:
|
||||
default: docker.io
|
||||
type: string
|
||||
repository:
|
||||
default: postgrest/postgrest
|
||||
type: string
|
||||
tag:
|
||||
default: v11.2.1
|
||||
type: string
|
||||
type: object
|
||||
swagger:
|
||||
default:
|
||||
enable: true
|
||||
pullPolicy: IfNotPresent
|
||||
registry: docker.io
|
||||
repository: swaggerapi/swagger-ui
|
||||
tag: v5.9.0
|
||||
properties:
|
||||
enable:
|
||||
default: true
|
||||
type: boolean
|
||||
pullPolicy:
|
||||
default: IfNotPresent
|
||||
type: string
|
||||
registry:
|
||||
default: docker.io
|
||||
type: string
|
||||
repository:
|
||||
default: swaggerapi/swagger-ui
|
||||
type: string
|
||||
tag:
|
||||
default: v5.9.0
|
||||
type: string
|
||||
type: object
|
||||
type: object
|
||||
type: object
|
||||
databases:
|
||||
default: []
|
||||
items:
|
||||
properties:
|
||||
name:
|
||||
default: db
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
replicas:
|
||||
default: 1
|
||||
examples:
|
||||
- 1
|
||||
type: integer
|
||||
ingress-class:
|
||||
default: traefik
|
||||
examples:
|
||||
- traefik
|
||||
type: string
|
||||
domain-name:
|
||||
default: your_company.com
|
||||
examples:
|
||||
- your_company.com
|
||||
type: string
|
||||
roles:
|
||||
default: []
|
||||
items:
|
||||
properties:
|
||||
name:
|
||||
default: alt-account
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
issuer:
|
||||
default: letsencrypt-prod
|
||||
examples:
|
||||
- letsencrypt-prod
|
||||
type: string
|
||||
backups:
|
||||
default:
|
||||
enable: false
|
||||
@@ -82,29 +214,6 @@ options:
|
||||
default: backup-settings
|
||||
type: string
|
||||
type: object
|
||||
databases:
|
||||
default: []
|
||||
items:
|
||||
properties:
|
||||
name:
|
||||
default: db
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
storage:
|
||||
default: 8Gi
|
||||
examples:
|
||||
- 8Gi
|
||||
type: string
|
||||
roles:
|
||||
default: []
|
||||
items:
|
||||
properties:
|
||||
name:
|
||||
default: alt-account
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
dependencies:
|
||||
- dist: null
|
||||
category: dbo
|
||||
@@ -116,4 +225,5 @@ providers:
|
||||
postgresql: true
|
||||
restapi: null
|
||||
http: null
|
||||
gitea: null
|
||||
tfaddtype: null
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
locals {
|
||||
dns-name = "${var.instance}.${var.sub-domain}.${var.domain-name}"
|
||||
pg-labels = merge(local.common-labels, {
|
||||
"app.kubernetes.io/component" = "postgresql"
|
||||
})
|
||||
@@ -21,6 +22,10 @@ resource "kubectl_manifest" "prj_pg" {
|
||||
size: "${var.storage}"
|
||||
monitoring:
|
||||
enablePodMonitor: true
|
||||
bootstrap:
|
||||
initdb:
|
||||
database: "${var.instance}"
|
||||
owner: "${var.instance}"
|
||||
EOF
|
||||
], var.backups.enable?[<<-EOF
|
||||
backup:
|
||||
|
||||
208
share/dataset-pg/postgrest.tf
Normal file
208
share/dataset-pg/postgrest.tf
Normal file
@@ -0,0 +1,208 @@
|
||||
locals {
|
||||
prest-labels = merge(local.common-labels, {
|
||||
"app.kubernetes.io/component" = "postgrest"
|
||||
})
|
||||
prest-dns-name = "api.${local.dns-name}"
|
||||
prest-service = {
|
||||
"name" = "${var.instance}-postgrest"
|
||||
"port" = {
|
||||
"number" = 80
|
||||
}
|
||||
}
|
||||
swagger-service = {
|
||||
"name" = "${var.instance}-swagger"
|
||||
"port" = {
|
||||
"number" = 80
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
resource "kubectl_manifest" "postgrest_config" {
|
||||
yaml_body = <<-EOF
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: "${var.component}-${var.instance}-postgrest"
|
||||
namespace: "${var.namespace}"
|
||||
labels: ${jsonencode(local.prest-labels)}
|
||||
data:
|
||||
PGDATABASE: "${var.instance}"
|
||||
PGHOST: "${var.instance}-${var.component}-pg-rw.${var.namespace}.svc"
|
||||
PGPORT: 5432
|
||||
PGRST_OPENAPI_SERVER_PROXY_URI: "https://${local.prest-dns-name}"
|
||||
API_URL: "https://${local.prest-dns-name}"
|
||||
EOF
|
||||
}
|
||||
|
||||
|
||||
resource "kubectl_manifest" "postgrest_deploy" {
|
||||
count = var.extentions.postgrest.enable ? 1:0
|
||||
yaml_body = join("", concat([<<-EOF
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: "${var.component}-${var.instance}-postgrest"
|
||||
namespace: "${var.namespace}"
|
||||
labels: ${jsonencode(local.prest-labels)}
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels: ${jsonencode(local.prest-labels)}
|
||||
template:
|
||||
metadata:
|
||||
labels: ${jsonencode(local.prest-labels)}
|
||||
spec:
|
||||
securityContext:
|
||||
fsGroup: 1000
|
||||
runAsGroup: 1000
|
||||
runAsUser: 1000
|
||||
restartPolicy: Always
|
||||
containers:
|
||||
- name: postgrest
|
||||
securityContext:
|
||||
fsGroup: 1000
|
||||
runAsGroup: 1000
|
||||
runAsNonRoot: true
|
||||
runAsUser: 1000
|
||||
env:
|
||||
- name: PGUSER
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
key: username
|
||||
name: "${var.instance}-${var.component}-pg-app"
|
||||
- name: PGPASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
key: password
|
||||
name: "${var.instance}-${var.component}-pg-app"
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: "${var.component}-${var.instance}-postgrest"
|
||||
image: "${var.extentions.postgrest.image.registry}/${var.extentions.postgrest.image.repository}:${var.extentions.postgrest.image.tag}"
|
||||
imagePullPolicy: "${var.extentions.postgrest.image.pullPolicy}"
|
||||
ports:
|
||||
- containerPort: 3000
|
||||
name: http
|
||||
protocol: TCP
|
||||
livenessProbe:
|
||||
failureThreshold: 3
|
||||
httpGet:
|
||||
path: /
|
||||
port: http
|
||||
scheme: HTTP
|
||||
periodSeconds: 10
|
||||
successThreshold: 1
|
||||
timeoutSeconds: 1
|
||||
readinessProbe:
|
||||
failureThreshold: 3
|
||||
httpGet:
|
||||
path: /
|
||||
port: http
|
||||
scheme: HTTP
|
||||
periodSeconds: 10
|
||||
successThreshold: 1
|
||||
timeoutSeconds: 1
|
||||
EOF
|
||||
], var.extentions.postgrest.swagger.enable?[<<-EOF
|
||||
- name: swagger
|
||||
securityContext:
|
||||
fsGroup: 1000
|
||||
runAsGroup: 1000
|
||||
runAsNonRoot: true
|
||||
runAsUser: 1000
|
||||
image: "${var.extentions.postgrest.swagger.registry}/${var.extentions.postgrest.swagger.repository}:${var.extentions.postgrest.swagger.tag}"
|
||||
imagePullPolicy: "${var.extentions.postgrest.swagger.pullPolicy}"
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
name: swagger
|
||||
protocol: TCP
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: "${var.component}-${var.instance}-postgrest"
|
||||
livenessProbe:
|
||||
failureThreshold: 3
|
||||
httpGet:
|
||||
path: /
|
||||
port: swagger
|
||||
scheme: HTTP
|
||||
periodSeconds: 10
|
||||
successThreshold: 1
|
||||
timeoutSeconds: 1
|
||||
readinessProbe:
|
||||
failureThreshold: 3
|
||||
httpGet:
|
||||
path: /
|
||||
port: swagger
|
||||
scheme: HTTP
|
||||
periodSeconds: 10
|
||||
successThreshold: 1
|
||||
timeoutSeconds: 1
|
||||
EOF
|
||||
]:[""]))
|
||||
}
|
||||
|
||||
module "postgrest-service" {
|
||||
count = var.extentions.postgrest.enable ? 1 : 0
|
||||
source = "/dist/modules/service"
|
||||
component = "postgrest"
|
||||
instance = var.instance
|
||||
namespace = var.namespace
|
||||
labels = local.prest-labels
|
||||
target = "http"
|
||||
port = local.prest-service.port.number
|
||||
providers = {
|
||||
kubectl = kubectl
|
||||
}
|
||||
}
|
||||
|
||||
module "postgrest-ingress" {
|
||||
count = var.extentions.postgrest.enable ? 1 : 0
|
||||
source = "/dist/modules/ingress"
|
||||
component = "postgrest"
|
||||
instance = var.instance
|
||||
namespace = var.namespace
|
||||
issuer = var.issuer
|
||||
ingress-class = var.ingress-class
|
||||
labels = local.prest-labels
|
||||
dns-names = [local.prest-dns-name]
|
||||
create-redirect = true
|
||||
middlewares = []
|
||||
service = local.prest-service
|
||||
providers = {
|
||||
kubectl = kubectl
|
||||
}
|
||||
}
|
||||
|
||||
module "swagger-service" {
|
||||
count = var.extentions.postgrest.enable && var.extentions.postgrest.swagger.enable ? 1 : 0
|
||||
source = "/dist/modules/service"
|
||||
component = "swagger"
|
||||
instance = var.instance
|
||||
namespace = var.namespace
|
||||
labels = local.prest-labels
|
||||
target = "swagger"
|
||||
port = local.swagger-service.port.number
|
||||
providers = {
|
||||
kubectl = kubectl
|
||||
}
|
||||
}
|
||||
|
||||
module "swagger-ingress" {
|
||||
count = var.extentions.postgrest.enable && var.extentions.postgrest.swagger.enable ? 1 : 0
|
||||
source = "/dist/modules/ingress"
|
||||
component = "swagger"
|
||||
instance = var.instance
|
||||
namespace = var.namespace
|
||||
issuer = var.issuer
|
||||
ingress-class = var.ingress-class
|
||||
labels = local.prest-labels
|
||||
dns-names = [local.prest-dns-name]
|
||||
middlewares = []
|
||||
create-cert = false
|
||||
sub-path = "ui"
|
||||
secret-component = "postgrest"
|
||||
service = local.swagger-service
|
||||
providers = {
|
||||
kubectl = kubectl
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user