-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #261 from Telecominfraproject/WIFI-13246-CS-postgres
WIFI-13246 Switch to non-HA postgres without pgpool
- Loading branch information
Showing
7 changed files
with
180 additions
and
146 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| {{- define "openwifi.user_creation_script_sql" -}} | ||
| {{- $root := . -}} | ||
| {{- $postgresqlBase := index .Values "postgresql" }} | ||
| {{- $postgresqlEmulatedRoot := (dict "Values" $postgresqlBase "Chart" (dict "Name" "postgresql") "Release" $.Release) }} | ||
| {{ range index .Values "postgresql" "initDbScriptSecret" "services" }} | ||
| CREATE USER {{ index $root "Values" . "configProperties" "storage.type.postgresql.username" }}; | ||
| ALTER USER {{ index $root "Values" . "configProperties" "storage.type.postgresql.username" }} WITH ENCRYPTED PASSWORD '{{ index $root "Values" . "configProperties" "storage.type.postgresql.password" }}'; | ||
| CREATE DATABASE {{ index $root "Values" . "configProperties" "storage.type.postgresql.database" }}; | ||
| GRANT ALL PRIVILEGES ON DATABASE {{ index $root "Values" . "configProperties" "storage.type.postgresql.database" }} TO {{ index $root "Values" . "configProperties" "storage.type.postgresql.username" }}; | ||
| ALTER DATABASE {{ index $root "Values" . "configProperties" "storage.type.postgresql.database" }} OWNER TO {{ index $root "Values" . "configProperties" "storage.type.postgresql.username" }}; | ||
| {{ end }} | ||
| {{- end -}} | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,34 @@ | ||
| # OpenWIFI Gateway (https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/) | ||
| owgw: | ||
| fullnameOverride: owgw | ||
|
|
||
| configProperties: | ||
| openwifi.kafka.enable: "true" | ||
| openwifi.kafka.brokerlist: kafka:9092 | ||
|
|
||
| # OpenWIFI Security (https://github.com/Telecominfraproject/wlan-cloud-ucentralsec) | ||
| owsec: | ||
| fullnameOverride: owsec | ||
|
|
||
| configProperties: | ||
| openwifi.kafka.enable: "true" | ||
| openwifi.kafka.brokerlist: kafka:9092 | ||
|
|
||
| # OpenWIFI Firmware (https://github.com/Telecominfraproject/wlan-cloud-ucentralfms) | ||
| owfms: | ||
| fullnameOverride: owfms | ||
|
|
||
| configProperties: | ||
| openwifi.kafka.enable: "true" | ||
| openwifi.kafka.brokerlist: kafka:9092 | ||
|
|
||
| # OpenWIFI Provisioning (https://github.com/Telecominfraproject/wlan-cloud-owprov/) | ||
| owprov: | ||
| fullnameOverride: owprov | ||
|
|
||
| configProperties: | ||
| openwifi.kafka.enable: "true" | ||
| openwifi.kafka.brokerlist: kafka:9092 | ||
|
|
||
| # OpenWIFI Analytics (https://github.com/Telecominfraproject/wlan-cloud-analytics) | ||
| owanalytics: | ||
| fullnameOverride: owanalytics | ||
|
|
||
| configProperties: | ||
| openwifi.kafka.enable: "true" | ||
| openwifi.kafka.brokerlist: kafka:9092 | ||
|
|
@@ -49,39 +44,32 @@ owprovui: | |
| # OpenWIFI Subscription (https://github.com/Telecominfraproject/wlan-cloud-userportal/) | ||
| owsub: | ||
| fullnameOverride: owsub | ||
|
|
||
| configProperties: | ||
| openwifi.kafka.enable: "true" | ||
| openwifi.kafka.brokerlist: kafka:9092 | ||
|
|
||
| # OpenWIFI radio resource management (https://github.com/Telecominfraproject/wlan-cloud-rrm/) | ||
| owrrm: | ||
| fullnameOverride: owrrm | ||
|
|
||
| mysql: | ||
| enabled: true | ||
|
|
||
| # kafka (https://github.com/bitnami/charts/blob/master/bitnami/kafka/) | ||
| kafka: | ||
| enabled: true | ||
|
|
||
| fullnameOverride: kafka | ||
|
|
||
| image: | ||
| registry: docker.io | ||
| repository: bitnami/kafka | ||
| tag: 2.8.0-debian-10-r43 | ||
|
|
||
| minBrokerId: 100 | ||
|
|
||
| zookeeper: | ||
| fullnameOverride: zookeeper | ||
|
|
||
| # clustersysteminfo check | ||
| clustersysteminfo: | ||
| enabled: false | ||
| delay: 0 # number of seconds to delay clustersysteminfo execution | ||
|
|
||
| images: | ||
| clustersysteminfo: | ||
| repository: tip-tip-wlan-cloud-ucentral.jfrog.io/clustersysteminfo | ||
|
|
@@ -103,51 +91,39 @@ clustersysteminfo: | |
| # limits: | ||
| # cpu: 100m | ||
| # memory: 128Mi | ||
|
|
||
| nodeSelector: {} | ||
|
|
||
| tolerations: [] | ||
|
|
||
| affinity: {} | ||
|
|
||
| public_env_variables: | ||
| FLAGS: "-s --connect-timeout 3" | ||
| OWSEC: owsec-owsec:16001 | ||
| CHECK_RETRIES: 30 | ||
|
|
||
| secret_env_variables: | ||
| OWSEC_DEFAULT_USERNAME: [email protected] | ||
| OWSEC_DEFAULT_PASSWORD: openwifi | ||
| #OWSEC_NEW_PASSWORD: "" # Set this value in order for the check to work. Password must comply https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/#authenticationvalidationexpression | ||
|
|
||
| activeDeadlineSeconds: 2400 | ||
| backoffLimit: 5 | ||
| restartPolicy: OnFailure | ||
|
|
||
| # OpenWIFI Load Simulator (https://github.com/Telecominfraproject/wlan-cloud-owls) | ||
| owls: | ||
| enabled: false | ||
|
|
||
| fullnameOverride: owls | ||
|
|
||
| configProperties: | ||
| openwifi.kafka.enable: "true" | ||
| openwifi.kafka.brokerlist: kafka:9092 | ||
|
|
||
| # OpenWIFI Load Simulator UI (https://github.com/Telecominfraproject/wlan-cloud-owls-ui) | ||
| owlsui: | ||
| enabled: false | ||
|
|
||
| fullnameOverride: owlsui | ||
|
|
||
| # HAproxy (https://github.com/bitnami/charts/tree/master/bitnami/haproxy) | ||
| haproxy: | ||
| enabled: true | ||
|
|
||
| fullnameOverride: proxy | ||
|
|
||
| replicaCount: 3 | ||
|
|
||
| replicaCount: 1 | ||
| service: | ||
| type: LoadBalancer | ||
| ports: | ||
|
|
@@ -428,7 +404,6 @@ haproxy: | |
| # Cert-manager RESTAPI certs | ||
| restapiCerts: | ||
| enabled: false | ||
|
|
||
| services: | ||
| - owgw-owgw | ||
| - owsec-owsec | ||
|
|
@@ -438,9 +413,22 @@ restapiCerts: | |
| - owanalytics-owanalytics | ||
| - owsub-owsub | ||
| - owrrm-owrrm | ||
|
|
||
| clusterDomain: cluster.local | ||
|
|
||
| postgresql: | ||
| enabled: false | ||
| nameOverride: pgsql | ||
| fullnameOverride: pgsql | ||
| initDbScriptSecret: | ||
| enabled: false | ||
| services: | ||
| - owgw | ||
| - owsec | ||
| - owfms | ||
| - owprov | ||
| - owanalytics | ||
| - owsub | ||
|
|
||
| postgresql-ha: | ||
| enabled: false | ||
| nameOverride: pgsql | ||
|
|
||