diff --git a/share/dataset-pg/index.yaml b/share/dataset-pg/index.yaml index e4f84a4..75d065b 100644 --- a/share/dataset-pg/index.yaml +++ b/share/dataset-pg/index.yaml @@ -6,31 +6,6 @@ metadata: name: dataset-pg description: null options: - storage: - default: 8Gi - examples: - - 8Gi - type: string - sub-domain: - default: dataset-pg - examples: - - dataset-pg - type: string - ingress-class: - default: traefik - examples: - - traefik - type: string - replicas: - default: 1 - examples: - - 1 - type: integer - domain-name: - default: your_company.com - examples: - - your_company.com - type: string extentions: default: pool: @@ -137,29 +112,31 @@ options: type: object type: object type: object - databases: - default: [] - items: - properties: - name: - default: db - type: string - type: object - type: array issuer: default: letsencrypt-prod examples: - letsencrypt-prod type: string - roles: - default: [] - items: - properties: - name: - default: alt-account - type: string - type: object - type: array + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + replicas: + default: 1 + examples: + - 1 + type: integer + storage: + default: 8Gi + examples: + - 8Gi + type: string + sub-domain: + default: dataset-pg + examples: + - dataset-pg + type: string backups: default: enable: false @@ -214,6 +191,29 @@ options: default: backup-settings type: string type: object + roles: + default: [] + items: + properties: + name: + default: alt-account + type: string + type: object + type: array + databases: + default: [] + items: + properties: + name: + default: db + type: string + type: object + type: array + ingress-class: + default: traefik + examples: + - traefik + type: string dependencies: - dist: null category: dbo diff --git a/share/dataset-pg/postgrest.tf b/share/dataset-pg/postgrest.tf index 7d03efd..fb1088f 100644 --- a/share/dataset-pg/postgrest.tf +++ b/share/dataset-pg/postgrest.tf @@ -107,7 +107,8 @@ resource "kubectl_manifest" "postgrest_deploy" { successThreshold: 1 timeoutSeconds: 1 EOF - ], var.extentions.postgrest.swagger.enable&&false?[<<-EOF + ], var.extentions.postgrest.swagger.enable?[<<-EOF + - name: swagger securityContext: fsGroup: 1000 @@ -123,24 +124,6 @@ EOF 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 ]:[""])) }