diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 7edbd98..af0373f 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -2,6 +2,7 @@ name: CloudSDK deployment and testing env: PR_NUMBER: ${{ github.event.number }} + HELM_RELEASE_PREFIX: tip-wlan AWS_EKS_NAME: tip-wlan-main AWS_DEFAULT_OUTPUT: json AWS_DEFAULT_REGION: us-east-2 @@ -40,7 +41,7 @@ jobs: - name: Generate Helm values file run: | - ./Toolsmith/helm-values/aws-cicd-pr-deployment.yaml.sh ${{ env.PR_NUMBER }} > pr-deployment.yaml + ./Toolsmith/helm-values/aws-cicd-testing-pr-deployment.yaml.sh ${{ env.PR_NUMBER }} > pr-deployment.yaml - name: Generate certs working-directory: wlan-pki-cert-scripts @@ -54,8 +55,9 @@ jobs: - name: Deploy Cloud SDK run: | + helm dependency update wlan-cloud-helm/${{ env.HELM_RELEASE_PREFIX }} # using a timeout of 20 minutes as the EKS nodes may need to be scaled which takes some time - helm upgrade --install tip-wlan-pr-${{ env.PR_NUMBER }} wlan-cloud-helm/tip-wlan -f pr-deployment.yaml --namespace default --wait --timeout 20m + helm upgrade --install ${{ env.HELM_RELEASE_PREFIX }}-pr-${{ env.PR_NUMBER }} wlan-cloud-helm/tip-wlan -f pr-deployment.yaml --create-namespace --namespace ${{ env.HELM_RELEASE_PREFIX }}-pr-${{ env.PR_NUMBER }} --wait --timeout 20m test: runs-on: ubuntu-latest @@ -94,8 +96,8 @@ jobs: - name: Delete Cloud SDK Helm release run: | - helm delete tip-wlan-pr-${{ env.PR_NUMBER }} --namespace default || true + helm delete ${{ env.HELM_RELEASE_PREFIX }}-pr-${{ env.PR_NUMBER }} --namespace ${{ env.HELM_RELEASE_PREFIX }}-pr-${{ env.PR_NUMBER }} || true - name: Delete namespace run: | - kubectl delete ns tip-pr-${{ env.PR_NUMBER }} --wait=true --ignore-not-found true \ No newline at end of file + kubectl delete namespace ${{ env.HELM_RELEASE_PREFIX }}-pr-${{ env.PR_NUMBER }} --wait=true --ignore-not-found true diff --git a/.gitignore b/.gitignore index 2d11cfe..7ac5137 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,16 @@ *.jks *.pkcs12 *.p12 +*.csr +*.cnf +*.key *.DS_Store + +# local development +*.lock +*.local_dev + +*.zip +*.tgz +stern* +helmfile diff --git a/README.md b/README.md index b183328..854ee91 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,68 @@ # wlan-cloud-helm This repository contains helm charts for various deployment types of the tip wlan cloud services. +# IMPORTANT - CloudSDK Helm charts v0.4 to v1.x migration procedure + +We've introduced breaking changes to how CloudSDK database charts are managed. +If you want to preserve your data when moving from v0.4 to v1.x of the CloudSDK Helm charts, follow the steps outlined below. +If you can re-install your CloudSDK and don't care to loose your data, you can skip the steps and just install the upstream charts version with no changes to the default installation procedure. + +## Prerequisites + +1. Checkout latest wlan-cloud-helm repository +2. Have your certificates for existing installation +3. Helm 3.2+ + +## Procedure + +All of the commands should be run under tip-wlan-helm directory. + +1. Delete your current Helm release. The following commands will remove the pods, however, the PVC (your databases data) **won't be deleted**: +``` +helm list -n default (to look up the name of the release) +helm uninstall -n default tip-wlan (tip-wlan is usually the name of the release) +``` +2. Replace `REPLACEME` with your storage class name in the `tip-wlan/resources/environments/migration.yaml` file. You can check the available storageclasses with the `kubectl get storageclass` command. +3. Update your values file that you used for deploying the original release with the values from `migration.yaml` to preserve existing cassandra\postgres data (or skip that step and use the second upgrade command mentioned in #7) +4. If you want to preserve the PKI certificates from the original Helm installation, copy them to a new location using the command below (or checkout the latest wlan-pki-cert-script repo and use `copy-certs-to-helm.sh %path_to_new_helm_code%` to generate new self-signed keys): +``` +find . -regextype posix-extended -regex '.+(jks|pem|key|pkcs12|p12)$' -exec cp "{}" tip-wlan/resources/certs/ \; +``` +5. Remove the old charts from the helm directory, so that the upgrade command can successfully pull new chart depedencies: +``` +rm -rf tip-wlan/charts/cassandra tip-wlan/charts/kafka tip-wlan/charts/postgresql +``` +6. Pull 3rd party subcharts: +``` +helm dependency update tip-wlan +``` +7. Perform Helm upgrade: +``` +helm upgrade --install tip-wlan tip-wlan/ --namespace tip --create-namespace -f tip-wlan/resources/environments/your_values_with_fixes.yaml +``` + +Alternatively, you can run the upgrade command as follows (the order of the -f arguments is important!): + +``` +helm upgrade --install tip-wlan tip-wlan/ --namespace tip --create-namespace -f tip-wlan/resources/environments/original_values.yaml -f tip-wlan/resources/environments/migration.yaml +``` + +As a precaution you can also run `helm template` with the same arguments as the upgrade command and examine the output before actually installing the chart + # Deploying the wlan-cloud deployment - - Run the following command under tip-wlan-helm directory: - - helm install tip-wlan/ -n default -f tip-wlan/resources/environments/dev.yaml - - More details can be found here: https://telecominfraproject.atlassian.net/wiki/spaces/WIFI/pages/262176803/Pre-requisites+before+deploying+Tip-Wlan+solution +Run the following command under tip-wlan-helm directory: +``` +helm dependency update tip-wlan +helm upgrade --install tip-wlan/ --namespace tip --create-namespace -f tip-wlan/resources/environments/dev.yaml +``` + +More details can be found here: https://telecominfraproject.atlassian.net/wiki/spaces/WIFI/pages/262176803/Pre-requisites+before+deploying+Tip-Wlan+solution # Deleting the wlan-cloud deployment: -- Run the following command: - - helm del tip-wlan -n default - +Run the following command: +``` +helm del tip-wlan -n default +``` (Note: this would not delete the tip namespace and any PVC/PV/Endpoints under this namespace. These are needed so we can reuse the same PVC mount when the pods are restarted.) To get rid of them (PVC/PV/Endpoints), you can use the following script (expects that you are in the `tip` namespace or add `-n tip` to the below set of commands): @@ -92,13 +144,17 @@ done Run minikube: -```minikube start --memory=10g --cpus=4 --driver=virtualbox --extra-config=kubelet.serialize-image-pulls=false --extra-config=kubelet.image-pull-progress-deadline=3m0s --docker-opt=max-concurrent-downloads=10``` +``` +minikube start --memory=10g --cpus=4 --driver=virtualbox --extra-config=kubelet.serialize-image-pulls=false --extra-config=kubelet.image-pull-progress-deadline=3m0s --docker-opt=max-concurrent-downloads=10 +``` Please note that you may choose another driver (parallels, vmwarefusion, hyperkit, vmware, docker, podman) which might be more suitable for your setup. Omitting this option enables auto discovery of available drivers. Deploy CloudSDK chart: -```helm upgrade --install tip-wlan tip-wlan -f tip-wlan/resources/environments/dev-local.yaml -n default``` +``` +helm upgrade --install tip-wlan tip-wlan -f tip-wlan/resources/environments/dev-local.yaml -n default +``` Wait a few minutes, when all pods are in `Running` state, obtain web ui link with `minikube service tip-wlan-wlan-cloud-static-portal -n tip --url`, open in the browser. Importing or trusting certificate might be needed. @@ -173,4 +229,4 @@ xDG3eKlu+dllUtKx/PN6yflbT5xcGgcdmrwzRaWS ``` -2. Double click on it, enter the system admin password, if prompted. \ No newline at end of file +2. Double click on it, enter the system admin password, if prompted. diff --git a/tip-wlan/Chart.yaml b/tip-wlan/Chart.yaml index f994411..66c7b75 100644 --- a/tip-wlan/Chart.yaml +++ b/tip-wlan/Chart.yaml @@ -26,54 +26,55 @@ sources: icon: dependencies: - - name: opensync-gw-static - version: 0.1.0 - condition: opensync-gw-static.enabled - - name: opensync-gw-cloud - version: 0.1.0 - condition: opensync-gw-cloud.enabled - - name: opensync-mqtt-broker - version: 0.1.0 - condition: opensync-mqtt-broker.enabled - - name: wlan-cloud-graphql-gw - version: 0.1.0 - condition: wlan-cloud-graphql-gw.enabled - - name: wlan-cloud-static-portal - version: 0.1.0 - condition: wlan-cloud-static-portal.enabled +- name: opensync-gw-static + version: 0.1.0 + condition: opensync-gw-static.enabled +- name: opensync-gw-cloud + version: 0.1.0 + condition: opensync-gw-cloud.enabled +- name: opensync-mqtt-broker + version: 0.1.0 + condition: opensync-mqtt-broker.enabled +- name: wlan-cloud-graphql-gw + version: 0.1.0 + condition: wlan-cloud-graphql-gw.enabled +- name: wlan-cloud-static-portal + version: 0.1.0 + condition: wlan-cloud-static-portal.enabled ## IntegratedCloudComponent should be disabled for distributed deployment - - name: wlan-integrated-cloud-component-service - version: 0.1.0 - condition: wlan-integrated-cloud-component-service.enabled - - name: wlan-portal-service - version: 0.1.0 - condition: wlan-portal-service.enabled - - name: wlan-prov-service - version: 0.1.0 - condition: wlan-prov-service.enabled - - name: wlan-ssc-service - version: 0.1.0 - condition: wlan-ssc-service.enabled - - name: wlan-spc-service - version: 0.1.0 - condition: wlan-spc-service.enabled - - name: wlan-port-forwarding-gateway-service - version: 0.1.0 - condition: wlan-port-forwarding-gateway-service.enabled - - name: nginx-ingress-controller - version: 0.1.0 - condition: nginx-ingress-controller.enabled - - name: common - version: 0.1.0 - - name: zookeeper - version: 0.1.0 - condition: zookeeper.enabled - - name: kafka - version: 0.1.0 - condition: kafka.enabled - - name: cassandra - version: 0.1.0 - condition: cassandra.enabled - - name: postgresql - version: 8.9.6 - condition: postgresql.enabled +- name: wlan-integrated-cloud-component-service + version: 0.1.0 + condition: wlan-integrated-cloud-component-service.enabled +- name: wlan-portal-service + version: 0.1.0 + condition: wlan-portal-service.enabled +- name: wlan-prov-service + version: 0.1.0 + condition: wlan-prov-service.enabled +- name: wlan-ssc-service + version: 0.1.0 + condition: wlan-ssc-service.enabled +- name: wlan-spc-service + version: 0.1.0 + condition: wlan-spc-service.enabled +- name: wlan-port-forwarding-gateway-service + version: 0.1.0 + condition: wlan-port-forwarding-gateway-service.enabled +- name: nginx-ingress-controller + version: 0.1.0 + condition: nginx-ingress-controller.enabled +- name: common + version: 0.1.0 + +- name: kafka + version: 12.2.0 + repository: https://charts.bitnami.com/bitnami + condition: kafka.enabled +- name: postgresql + version: 10.1.0 + repository: https://charts.bitnami.com/bitnami + condition: postgresql.enabled +- name: cassandra + version: 7.0.1 + repository: https://charts.bitnami.com/bitnami + condition: cassandra.enabled diff --git a/tip-wlan/charts/cassandra/.helmignore b/tip-wlan/charts/cassandra/.helmignore deleted file mode 100644 index f0c1319..0000000 --- a/tip-wlan/charts/cassandra/.helmignore +++ /dev/null @@ -1,21 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj diff --git a/tip-wlan/charts/cassandra/Chart.yaml b/tip-wlan/charts/cassandra/Chart.yaml deleted file mode 100644 index 66eaff4..0000000 --- a/tip-wlan/charts/cassandra/Chart.yaml +++ /dev/null @@ -1,21 +0,0 @@ -name: cassandra -apiVersion: v2 -version: 5.5.3 -appVersion: 3.11.6 -description: Apache Cassandra is a free and open-source distributed database management system - designed to handle large amounts of data across many commodity servers, providing high - availability with no single point of failure. - Cassandra offers robust support for clusters spanning multiple datacenters, with asynchronous - masterless replication allowing low latency operations for all clients. -keywords: - - cassandra - - database - - nosql -icon: https://upload.wikimedia.org/wikipedia/commons/thumb/5/5e/Cassandra_logo.svg/330px-Cassandra_logo.svg.png -sources: - - https://github.com/bitnami/bitnami-docker-cassandra -home: http://cassandra.apache.org -maintainers: - - name: Bitnami - email: containers@bitnami.com -engine: gotpl \ No newline at end of file diff --git a/tip-wlan/charts/cassandra/files/cqlshrc.tip-wlan b/tip-wlan/charts/cassandra/files/cqlshrc.tip-wlan deleted file mode 100644 index 1dabb18..0000000 --- a/tip-wlan/charts/cassandra/files/cqlshrc.tip-wlan +++ /dev/null @@ -1,238 +0,0 @@ -; Licensed to the Apache Software Foundation (ASF) under one -; or more contributor license agreements. See the NOTICE file -; distributed with this work for additional information -; regarding copyright ownership. The ASF licenses this file -; to you under the Apache License, Version 2.0 (the -; "License"); you may not use this file except in compliance -; with the License. You may obtain a copy of the License at -; -; http://www.apache.org/licenses/LICENSE-2.0 -; -; Unless required by applicable law or agreed to in writing, -; software distributed under the License is distributed on an -; "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -; KIND, either express or implied. See the License for the -; specific language governing permissions and limitations -; under the License. -; -; Sample ~/.cqlshrc file. - -[authentication] -;; If Cassandra has auth enabled, fill out these options -username = tip_user -password = tip_password -; keyspace = ks1 - - - -[ui] -;; Whether or not to display query results with colors -color = on - -;; Used for displaying timestamps (and reading them with COPY) -; datetimeformat = %Y-%m-%d %H:%M:%S%z - -;; Display timezone -;timezone = Etc/UTC - -;; The number of digits displayed after the decimal point for single and double precision numbers -;; (note that increasing this to large numbers can result in unusual values) -;float_precision = 5 -;double_precision = 12 - -;; Used for automatic completion and suggestions -; completekey = tab - -;; The encoding used for characters -; encoding = utf8 - -; To use another than the system default browser for cqlsh HELP to open -; the CQL doc HTML, use the 'browser' preference. -; If the field value is empty or not specified, cqlsh will use the -; default browser (specifying 'browser = default' does not work). -; -; Supported browsers are those supported by the Python webbrowser module. -; (https://docs.python.org/2/library/webbrowser.html). -; -; Hint: to use Google Chome, use -; 'browser = open -a /Applications/Google\ Chrome.app %s' on Mac OS X and -; 'browser = /usr/bin/google-chrome-stable %s' on Linux and -; 'browser = C:/Program Files (x86)/Google/Chrome/Application/chrome.exe %s' on Windows. -; -; This setting can be overridden with the --browser command line option. -; -;browser = - -[cql] -;; A version of CQL to use (this should almost never be set) -; version = 3.2.1 - - - -[connection] - -;; The host to connect to -hostname = {{ include "cassandra.service" . }} - -;; The port to connect to (9042 is the native protocol default) -port = 9042 - -;; Always connect using SSL - false by default -ssl = true - -;; A timeout in seconds for opening new connections -; timeout = 10 - -;; A timeout in seconds for executing queries -; request_timeout = 10 - - - -[csv] -;; The size limit for parsed fields -; field_size_limit = 131072 - - - -[tracing] -;; The max number of seconds to wait for a trace to complete -; max_trace_wait = 10.0 - - - -[ssl] -certfile = /opt/tip-wlan/certs/cacert.pem - -;; Optional - true by default. -;validate = true - -;; To be provided when require_client_auth=true -userkey = /opt/tip-wlan/certs/cassandraserverkey_dec.pem - -;; To be provided when require_client_auth=true -usercert = /opt/tip-wlan/certs/cassandraservercert.pem - - - -;; Optional section, overrides default certfile in [ssl] section, if present -; [certfiles] -; 192.168.1.3 = ~/keys/cassandra01.cert -; 192.168.1.4 = ~/keys/cassandra02.cert - - - -;; Options that are common to both COPY TO and COPY FROM -; [copy] - -;; The string placeholder for null values -; nullval = null - -;; For COPY TO, controls whether the first line in the CSV output file will -;; contain the column names. For COPY FROM, specifies whether the first -;; line in the CSV file contains column names. -; header = false - -;; The character that is used as the decimal point separator -; decimalsep = . - -;; The character that is used to separate thousands -;; (defaults to the empty string) -; thousandssep = - -;; The string literal format for boolean values -; boolstyle = True,False - -;; The number of child worker processes to create for -;; COPY tasks. Defaults to a max of 4 for COPY FROM and 16 -;; for COPY TO. However, at most (num_cores - 1) processes -;; will be created. -; numprocesses = - -;; The maximum number of failed attempts to fetch a range of data (when using -;; COPY TO) or insert a chunk of data (when using COPY FROM) before giving up -; maxattempts = 5 - -;; How often status updates are refreshed, in seconds -; reportfrequency = 0.25 - -;; An optional file to output rate statistics to -; ratefile = - - - -;; Options specific to COPY TO -; [copy-to] - -;; The maximum number token ranges to fetch simultaneously -; maxrequests = 6 - -;; The number of rows to fetch in a single page -; pagesize = 1000 - -;; By default the page timeout is 10 seconds per 1000 entries -;; in the page size or 10 seconds if pagesize is smaller -; pagetimeout = 10 - -;; Token range to export. Defaults to exporting the full ring. -; begintoken = -; endtoken = - -; The maximum size of the output file measured in number of lines; -; beyond this maximum the output file will be split into segments. -; -1 means unlimited. -; maxoutputsize = -1 - -;; The encoding used for characters -; encoding = utf8 - - - -;; Options specific to COPY FROM -; [copy-from] - -;; The maximum number of rows to process per second -; ingestrate = 100000 - -;; The maximum number of rows to import (-1 means unlimited) -; maxrows = -1 - -;; A number of initial rows to skip -; skiprows = 0 - -;; A comma-separated list of column names to ignore -; skipcols = - -;; The maximum global number of parsing errors to ignore, -1 means unlimited -; maxparseerrors = -1 - -;; The maximum global number of insert errors to ignore, -1 means unlimited -; maxinserterrors = 1000 - -;; A file to store all rows that could not be imported, by default this is -;; import__.err where is your keyspace and
is your table name. -; errfile = - -;; The min and max number of rows inserted in a single batch -; maxbatchsize = 20 -; minbatchsize = 2 - -;; The number of rows that are passed to child worker processes from -;; the main process at a time -; chunksize = 1000 - - - -;; The options for COPY can also be specified per-table. The following -;; three sections demonstrate this. - -;; Optional table-specific options for COPY -; [copy:mykeyspace.mytable] -; chunksize = 1000 - -;; Optional table-specific options for COPY FROM -; [copy-from:mykeyspace.mytable] -; ingestrate = 20000 - -;; Optional table-specific options for COPY TO -; [copy-to:mykeyspace.mytable] -; pagetimeout = 30 diff --git a/tip-wlan/charts/cassandra/resources/config/certs/README.md b/tip-wlan/charts/cassandra/resources/config/certs/README.md deleted file mode 100644 index 4619ade..0000000 --- a/tip-wlan/charts/cassandra/resources/config/certs/README.md +++ /dev/null @@ -1 +0,0 @@ -Contains certs needed for this service to start. Please refer to page: https://telecominfraproject.atlassian.net/wiki/spaces/WIFI/pages/262176803/Pre-requisites+before+deploying+Tip-Wlan+solution \ No newline at end of file diff --git a/tip-wlan/charts/cassandra/resources/config/cqlshrc.default b/tip-wlan/charts/cassandra/resources/config/cqlshrc.default deleted file mode 100644 index 3443fcf..0000000 --- a/tip-wlan/charts/cassandra/resources/config/cqlshrc.default +++ /dev/null @@ -1,238 +0,0 @@ -; Licensed to the Apache Software Foundation (ASF) under one -; or more contributor license agreements. See the NOTICE file -; distributed with this work for additional information -; regarding copyright ownership. The ASF licenses this file -; to you under the Apache License, Version 2.0 (the -; "License"); you may not use this file except in compliance -; with the License. You may obtain a copy of the License at -; -; http://www.apache.org/licenses/LICENSE-2.0 -; -; Unless required by applicable law or agreed to in writing, -; software distributed under the License is distributed on an -; "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -; KIND, either express or implied. See the License for the -; specific language governing permissions and limitations -; under the License. -; -; Sample ~/.cqlshrc file. - -[authentication] -;; If Cassandra has auth enabled, fill out these options -username = cassandra -password = cassandra -; keyspace = ks1 - - - -[ui] -;; Whether or not to display query results with colors -color = on - -;; Used for displaying timestamps (and reading them with COPY) -; datetimeformat = %Y-%m-%d %H:%M:%S%z - -;; Display timezone -;timezone = Etc/UTC - -;; The number of digits displayed after the decimal point for single and double precision numbers -;; (note that increasing this to large numbers can result in unusual values) -;float_precision = 5 -;double_precision = 12 - -;; Used for automatic completion and suggestions -; completekey = tab - -;; The encoding used for characters -; encoding = utf8 - -; To use another than the system default browser for cqlsh HELP to open -; the CQL doc HTML, use the 'browser' preference. -; If the field value is empty or not specified, cqlsh will use the -; default browser (specifying 'browser = default' does not work). -; -; Supported browsers are those supported by the Python webbrowser module. -; (https://docs.python.org/2/library/webbrowser.html). -; -; Hint: to use Google Chome, use -; 'browser = open -a /Applications/Google\ Chrome.app %s' on Mac OS X and -; 'browser = /usr/bin/google-chrome-stable %s' on Linux and -; 'browser = C:/Program Files (x86)/Google/Chrome/Application/chrome.exe %s' on Windows. -; -; This setting can be overridden with the --browser command line option. -; -;browser = - -[cql] -;; A version of CQL to use (this should almost never be set) -; version = 3.2.1 - - - -[connection] - -;; The host to connect to -hostname = tip-wlan-cassandra-headless - -;; The port to connect to (9042 is the native protocol default) -port = 9042 - -;; Always connect using SSL - false by default -ssl = true - -;; A timeout in seconds for opening new connections -; timeout = 10 - -;; A timeout in seconds for executing queries -; request_timeout = 10 - - - -[csv] -;; The size limit for parsed fields -; field_size_limit = 131072 - - - -[tracing] -;; The max number of seconds to wait for a trace to complete -; max_trace_wait = 10.0 - - - -[ssl] -certfile = /opt/tip-wlan/certs/cacert.pem - -;; Optional - true by default. -;validate = true - -;; To be provided when require_client_auth=true -userkey = /opt/tip-wlan/certs/cassandraserverkey_dec.pem - -;; To be provided when require_client_auth=true -usercert = /opt/tip-wlan/certs/cassandraservercert.pem - - - -;; Optional section, overrides default certfile in [ssl] section, if present -; [certfiles] -; 192.168.1.3 = ~/keys/cassandra01.cert -; 192.168.1.4 = ~/keys/cassandra02.cert - - - -;; Options that are common to both COPY TO and COPY FROM -; [copy] - -;; The string placeholder for null values -; nullval = null - -;; For COPY TO, controls whether the first line in the CSV output file will -;; contain the column names. For COPY FROM, specifies whether the first -;; line in the CSV file contains column names. -; header = false - -;; The character that is used as the decimal point separator -; decimalsep = . - -;; The character that is used to separate thousands -;; (defaults to the empty string) -; thousandssep = - -;; The string literal format for boolean values -; boolstyle = True,False - -;; The number of child worker processes to create for -;; COPY tasks. Defaults to a max of 4 for COPY FROM and 16 -;; for COPY TO. However, at most (num_cores - 1) processes -;; will be created. -; numprocesses = - -;; The maximum number of failed attempts to fetch a range of data (when using -;; COPY TO) or insert a chunk of data (when using COPY FROM) before giving up -; maxattempts = 5 - -;; How often status updates are refreshed, in seconds -; reportfrequency = 0.25 - -;; An optional file to output rate statistics to -; ratefile = - - - -;; Options specific to COPY TO -; [copy-to] - -;; The maximum number token ranges to fetch simultaneously -; maxrequests = 6 - -;; The number of rows to fetch in a single page -; pagesize = 1000 - -;; By default the page timeout is 10 seconds per 1000 entries -;; in the page size or 10 seconds if pagesize is smaller -; pagetimeout = 10 - -;; Token range to export. Defaults to exporting the full ring. -; begintoken = -; endtoken = - -; The maximum size of the output file measured in number of lines; -; beyond this maximum the output file will be split into segments. -; -1 means unlimited. -; maxoutputsize = -1 - -;; The encoding used for characters -; encoding = utf8 - - - -;; Options specific to COPY FROM -; [copy-from] - -;; The maximum number of rows to process per second -; ingestrate = 100000 - -;; The maximum number of rows to import (-1 means unlimited) -; maxrows = -1 - -;; A number of initial rows to skip -; skiprows = 0 - -;; A comma-separated list of column names to ignore -; skipcols = - -;; The maximum global number of parsing errors to ignore, -1 means unlimited -; maxparseerrors = -1 - -;; The maximum global number of insert errors to ignore, -1 means unlimited -; maxinserterrors = 1000 - -;; A file to store all rows that could not be imported, by default this is -;; import__
.err where is your keyspace and
is your table name. -; errfile = - -;; The min and max number of rows inserted in a single batch -; maxbatchsize = 20 -; minbatchsize = 2 - -;; The number of rows that are passed to child worker processes from -;; the main process at a time -; chunksize = 1000 - - - -;; The options for COPY can also be specified per-table. The following -;; three sections demonstrate this. - -;; Optional table-specific options for COPY -; [copy:mykeyspace.mytable] -; chunksize = 1000 - -;; Optional table-specific options for COPY FROM -; [copy-from:mykeyspace.mytable] -; ingestrate = 20000 - -;; Optional table-specific options for COPY TO -; [copy-to:mykeyspace.mytable] -; pagetimeout = 30 diff --git a/tip-wlan/charts/cassandra/templates/NOTES.txt b/tip-wlan/charts/cassandra/templates/NOTES.txt deleted file mode 100644 index cbfe612..0000000 --- a/tip-wlan/charts/cassandra/templates/NOTES.txt +++ /dev/null @@ -1,65 +0,0 @@ -** Please be patient while the chart is being deployed ** - -Cassandra can be accessed through the following URLs from within the cluster: - - - CQL: {{ template "common.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.cluster.domain }}:{{ .Values.service.port }} - - Thrift: {{ template "common.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.cluster.domain }}:{{ .Values.service.thriftPort }} - -To get your password run: - - export CASSANDRA_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "common.fullname" . }} -o jsonpath="{.data.cassandra-password}" | base64 --decode) - -Check the cluster status by running: - - kubectl exec -it --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ template "common.name" . }},release={{ .Release.Name }} -o jsonpath='{.items[0].metadata.name}') nodetool status - -To connect to your Cassandra cluster using CQL: - -1. Run a Cassandra pod that you can use as a client: - - kubectl run --namespace {{ .Release.Namespace }} {{ template "common.fullname" . }}-client --rm --tty -i --restart='Never' \ - --env CASSANDRA_PASSWORD=$CASSANDRA_PASSWORD \ - {{ if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}--labels="{{ template "common.name" . }}-client=true"{{ end }} \ - --image {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }} -- bash - -2. Connect using the cqlsh client: - - cqlsh -u {{ .Values.dbUser.user }} -p $CASSANDRA_PASSWORD {{ template "common.fullname" . }} - -{{ if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }} -Note: Since NetworkPolicy is enabled, only pods with label -"{{ template "common.fullname" . }}-client=true" -will be able to connect to Cassandra. -{{- else -}} - -To connect to your database from outside the cluster execute the following commands: - -{{- if contains "NodePort" .Values.service.type }} - - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "common.fullname" . }}) - - cqlsh -u {{ .Values.dbUser.user }} -p $CASSANDRA_PASSWORD $NODE_IP $NODE_PORT - -{{- else if contains "LoadBalancer" .Values.service.type }} - - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "common.fullname" . }}' - - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "common.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - cqlsh -u {{ .Values.dbUser.user }} -p $CASSANDRA_PASSWORD $SERVICE_IP - -{{- else if contains "ClusterIP" .Values.service.type }} - - kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "common.fullname" . }} {{ .Values.service.port }}:{{ .Values.service.port }} & - cqlsh -u {{ .Values.dbUser.user }} -p $CASSANDRA_PASSWORD 127.0.0.1 {{ .Values.service.port }} - -{{- end }} -{{- end }} - -{{- if and (contains "bitnami/" .Values.image.repository) (not (.Values.image.tag | toString | regexFind "-r\\d+$|sha256:")) }} - -WARNING: Rolling tag detected ({{ .Values.image.repository }}:{{ .Values.image.tag }}), please note that it is strongly recommended to avoid using rolling tags in a production environment. -+info https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/ - -{{- end }} diff --git a/tip-wlan/charts/cassandra/templates/_helpers.tpl b/tip-wlan/charts/cassandra/templates/_helpers.tpl deleted file mode 100644 index 2ee2da9..0000000 --- a/tip-wlan/charts/cassandra/templates/_helpers.tpl +++ /dev/null @@ -1,71 +0,0 @@ -{{/* vim: set filetype=mustache: */}} - -{{/* -Return the appropriate apiVersion for networkpolicy. -*/}} -{{- define "networkPolicy.apiVersion" -}} -{{- if semverCompare ">=1.4-0, <1.7-0" .Capabilities.KubeVersion.GitVersion -}} -{{- print "extensions/v1beta1" -}} -{{- else -}} -{{- print "networking.k8s.io/v1" -}} -{{- end -}} -{{- end -}} - -{{/* -Return the proper metrics image name -*/}} -{{- define "cassandra.metrics.image" -}} -{{- $registryName := .Values.metrics.image.registry -}} -{{- $repositoryName := .Values.metrics.image.repository -}} -{{- $tag := .Values.metrics.image.tag | toString -}} -{{/* -Helm 2.11 supports the assignment of a value to a variable defined in a different scope, -but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. -Also, we can't use a single if because lazy evaluation is not an option -*/}} -{{- if .Values.global }} - {{- if .Values.global.imageRegistry }} - {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} - {{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} - {{- end -}} -{{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} -{{- end -}} -{{- end -}} - -{{/* -Return the proper image name (for the init container volume-permissions image) -*/}} -{{- define "cassandra.volumePermissions.image" -}} -{{- $registryName := .Values.volumePermissions.image.registry -}} -{{- $repositoryName := .Values.volumePermissions.image.repository -}} -{{- $tag := .Values.volumePermissions.image.tag | toString -}} -{{/* -Helm 2.11 supports the assignment of a value to a variable defined in a different scope, -but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. -Also, we can't use a single if because lazy evaluation is not an option -*/}} -{{- if .Values.global }} - {{- if .Values.global.imageRegistry }} - {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} - {{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} - {{- end -}} -{{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} -{{- end -}} -{{- end -}} - -{{/* -Renders a value that contains template. -Usage: -{{ include "cassandra.tplValue" ( dict "value" .Values.path.to.the.Value "context" $) }} -*/}} -{{- define "cassandra.tplValue" -}} - {{- if typeIs "string" .value }} - {{- tpl .value .context }} - {{- else }} - {{- tpl (.value | toYaml) .context }} - {{- end }} -{{- end -}} diff --git a/tip-wlan/charts/cassandra/templates/configmap.yaml b/tip-wlan/charts/cassandra/templates/configmap.yaml deleted file mode 100644 index d772214..0000000 --- a/tip-wlan/charts/cassandra/templates/configmap.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: cassandra-configurations-override - namespace: {{ include "common.namespace" . }} -data: -{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }} - cqlshrc.tip-wlan: | - {{ tpl (.Files.Get "files/cqlshrc.tip-wlan") . | nindent 4 }} diff --git a/tip-wlan/charts/cassandra/templates/headless-svc.yaml b/tip-wlan/charts/cassandra/templates/headless-svc.yaml deleted file mode 100644 index 0e8c5b9..0000000 --- a/tip-wlan/charts/cassandra/templates/headless-svc.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "cassandra.service" . }} - namespace: {{ include "common.namespace" . }} - labels: {{- include "common.labels" . | nindent 4 }} - annotations: {{ include "cassandra.tplValue" ( dict "value" .Values.service.annotations "context" $) | nindent 4 }} -spec: - clusterIP: None - publishNotReadyAddresses: true - ports: - - name: intra - port: 7000 - targetPort: intra - - name: tls - port: 7001 - targetPort: tls - - name: jmx - port: 7199 - targetPort: jmx - - name: cql - port: {{ .Values.service.port }} - targetPort: cql - {{- if .Values.cluster.enableRPC }} - - name: thrift - port: {{ .Values.service.thriftPort }} - targetPort: thrift - {{- end }} - selector: {{- include "common.selectorLabels" . | nindent 4 }} diff --git a/tip-wlan/charts/cassandra/templates/networkpolicy.yaml b/tip-wlan/charts/cassandra/templates/networkpolicy.yaml deleted file mode 100644 index 05bd062..0000000 --- a/tip-wlan/charts/cassandra/templates/networkpolicy.yaml +++ /dev/null @@ -1,38 +0,0 @@ -{{- if .Values.networkPolicy.enabled }} -kind: NetworkPolicy -apiVersion: {{ include "networkPolicy.apiVersion" . }} -metadata: - name: {{ include "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: {{- include "common.labels" . | nindent 4 }} -spec: - podSelector: - matchLabels: {{- include "common.selectorLabels" . | nindent 6 }} - ingress: - # Allow inbound connections - # CQL and Thrift ports - - ports: - - port: {{ .Values.service.port }} - - port: {{ .Values.service.thriftPort }} - from: - {{- if not .Values.networkPolicy.allowExternal }} - - podSelector: - matchLabels: - {{ include "common.fullname" . }}-client: "true" - {{- end }} - - podSelector: - matchLabels: {{- include "common.selectorLabels" . | nindent 14 }} - # Internal ports - - ports: - - port: intra - - port: tls - - port: jmx - from: - - podSelector: - matchLabels: {{- include "common.selectorLabels" . | nindent 14 }} - {{- if .Values.metrics.enabled }} - # Allow prometheus scrapes for metrics - - ports: - - port: 8080 - {{- end }} -{{- end }} diff --git a/tip-wlan/charts/cassandra/templates/secret.yaml b/tip-wlan/charts/cassandra/templates/secret.yaml deleted file mode 100644 index 9231f40..0000000 --- a/tip-wlan/charts/cassandra/templates/secret.yaml +++ /dev/null @@ -1,40 +0,0 @@ -{{- if (not .Values.dbUser.existingSecret) -}} -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: {{- include "common.labels" . | nindent 4 }} -type: Opaque -data: - {{- if .Values.dbUser.password }} - cassandra-password: {{ .Values.dbUser.password | b64enc | quote }} - {{- else if (not .Values.dbUser.forcePassword) }} - cassandra-password: {{ randAlphaNum 10 | b64enc | quote }} - {{ else }} - cassandra-password: {{ required "A Cassandra Password is required!" .Values.dbUser.password }} - {{- end }} -{{- end }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: cassandra-ssl-certs - namespace: {{ include "common.namespace" . }} -type: Opaque -data: - truststore: {{ .Files.Get "resources/config/certs/truststore.jks" | b64enc }} - truststore-password: {{ .Values.creds.sslTruststorePassword | b64enc }} - keystore: {{ .Files.Get "resources/config/certs/cassandra_server_keystore.jks" | b64enc }} - keystore-password: {{ .Values.creds.sslKeystorePassword | b64enc }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "common.fullname" . }}-client-certs - namespace: {{ include "common.namespace" . }} -type: Opaque -data: -{{ tpl (.Files.Glob "resources/config/certs/*").AsSecrets . | indent 2 }} - keystore_creds: {{ .Values.creds.sslKeystorePassword | b64enc }} - truststore_creds: {{ .Values.creds.sslTruststorePassword | b64enc }} diff --git a/tip-wlan/charts/cassandra/templates/service.yaml b/tip-wlan/charts/cassandra/templates/service.yaml deleted file mode 100644 index dd6599a..0000000 --- a/tip-wlan/charts/cassandra/templates/service.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: {{- include "common.labels" . | nindent 4 }} - annotations: {{ include "cassandra.tplValue" ( dict "value" .Values.service.annotations "context" $) | nindent 4 }} -spec: - type: {{ .Values.service.type }} - {{- if and (eq .Values.service.type "LoadBalancer") (not (empty .Values.service.loadBalancerIP)) }} - loadBalancerIP: {{ .Values.service.loadBalancerIP }} - {{- end }} - ports: - - name: cql - port: {{ .Values.service.port }} - targetPort: cql - {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.cql)) }} - nodePort: {{ .Values.service.nodePorts.cql }} - {{- else if eq .Values.service.type "ClusterIP" }} - nodePort: null - {{- end }} - {{- if .Values.cluster.enableRPC }} - - name: thrift - port: {{ .Values.service.thriftPort }} - targetPort: thrift - {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.thrift)) }} - nodePort: {{ .Values.service.nodePorts.thrift }} - {{- else if eq .Values.service.type "ClusterIP" }} - nodePort: null - {{- end }} - {{- end }} - selector: {{- include "common.selectorLabels" . | nindent 4 }} diff --git a/tip-wlan/charts/cassandra/templates/statefulset.yaml b/tip-wlan/charts/cassandra/templates/statefulset.yaml deleted file mode 100644 index 072c452..0000000 --- a/tip-wlan/charts/cassandra/templates/statefulset.yaml +++ /dev/null @@ -1,306 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ include "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: {{- include "common.labels" . | nindent 4 }} -spec: - selector: - matchLabels: {{- include "common.selectorLabels" . | nindent 6 }} - serviceName: {{ include "common.fullname" . }}-headless - replicas: {{ .Values.cluster.replicaCount }} - updateStrategy: - type: {{ .Values.statefulset.updateStrategy }} - {{- if (eq "Recreate" .Values.statefulset.updateStrategy) }} - rollingUpdate: null - {{- else if .Values.statefulset.rollingUpdatePartition }} - rollingUpdate: - partition: {{ .Values.statefulset.rollingUpdatePartition }} - {{- end }} - template: - metadata: - labels: {{- include "common.labels" . | nindent 8 }} - {{- if .Values.podLabels }} - {{- toYaml .Values.podLabels | nindent 8 }} - {{- end }} - {{- if or .Values.podAnnotations (and .Values.metrics.enabled .Values.metrics.podAnnotations) }} - annotations: - {{- if .Values.podAnnotations }} - {{- toYaml .Values.podAnnotations | nindent 8 }} - {{- end }} - {{- if .Values.metrics.podAnnotations }} - {{- toYaml .Values.metrics.podAnnotations | nindent 8 }} - {{- end }} - {{- end }} - spec: - {{- if .Values.affinity }} - affinity: {{- include "cassandra.tplValue" (dict "value" .Values.affinity "context" $) | nindent 8 }} - {{- end }} - {{- if .Values.nodeSelector }} - nodeSelector: {{- include "cassandra.tplValue" (dict "value" .Values.nodeSelector "context" $) | nindent 8 }} - {{- end }} - {{- if .Values.tolerations }} - tolerations: {{- include "cassandra.tplValue" (dict "value" .Values.tolerations "context" $) | nindent 8 }} - {{- end }} - {{- if .Values.securityContext.enabled }} - securityContext: - fsGroup: {{ .Values.securityContext.fsGroup }} - runAsUser: {{ .Values.securityContext.runAsUser }} - {{- end }} - {{- if and .Values.volumePermissions.enabled .Values.persistence.enabled }} - initContainers: - - name: volume-permissions - image: {{ include "cassandra.volumePermissions.image" . }} - imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} - command: - - /bin/bash - - -ec - - | - chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} /bitnami/cassandra - securityContext: - runAsUser: 0 - {{- if .Values.volumePermissions.resources }} - resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }} - {{- end }} - volumeMounts: - - name: data - mountPath: /bitnami/cassandra - {{- end }} - containers: - - name: cassandra - command: - - bash - - -ec - # Node 0 is the password seeder - - | - if [[ $HOSTNAME =~ (.*)-0$ ]]; then - echo "Setting node as password seeder" - export CASSANDRA_PASSWORD_SEEDER=yes - else - # Only node 0 will execute the startup initdb scripts - export CASSANDRA_IGNORE_INITDB_SCRIPTS=1 - fi - {{ .Values.entrypoint }} {{ .Values.cmd }} - image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }} - imagePullPolicy: {{ .Values.image.pullPolicy | quote }} - env: - - name: BITNAMI_DEBUG - value: {{ ternary "true" "false" .Values.image.debug | quote }} - - name: CASSANDRA_CLUSTER_NAME - value: {{ .Values.cluster.name }} - - name: CASSANDRA_SEEDS - {{- $global := . }} - {{- $replicas := .Values.cluster.seedCount | int }} - {{- $domain := .Values.cluster.domain }} - value: "{{- range $i, $e := until $replicas }}{{ include "common.fullname" $global }}-{{ $i }}.{{ include "common.fullname" $global }}-headless.{{ $global.Values.global.nsPrefix }}.svc.{{ $domain }}{{- if (lt ( add1 $i ) $replicas ) }},{{- end }}{{- end }}" - - name: CASSANDRA_PASSWORD - valueFrom: - secretKeyRef: - name: {{ if .Values.dbUser.existingSecret }}{{ .Values.dbUser.existingSecret }}{{- else }}{{ include "common.fullname" . }}{{- end }} - key: cassandra-password - - name: POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - - name: CASSANDRA_USER - value: {{ .Values.dbUser.user | quote }} - - name: CASSANDRA_NUM_TOKENS - value: {{ .Values.cluster.numTokens | quote }} - - name: CASSANDRA_DATACENTER - value: {{ .Values.cluster.datacenter }} - - name: CASSANDRA_ENDPOINT_SNITCH - value: {{ .Values.cluster.endpointSnitch }} - {{- if .Values.tlsEncryptionSecretName }} - - name: CASSANDRA_INTERNODE_ENCRYPTION - value: {{ .Values.cluster.internodeEncryption | quote }} - - name: CASSANDRA_CLIENT_ENCRYPTION - value: {{ .Values.cluster.clientEncryption | quote }} - - name: CASSANDRA_TRUSTSTORE_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.tlsEncryptionSecretName }} - key: truststore-password - - name: CASSANDRA_KEYSTORE_PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.tlsEncryptionSecretName }} - key: keystore-password - {{- end }} - - name: CASSANDRA_RACK - value: {{ .Values.cluster.rack }} - {{- if .Values.jvm.maxHeapSize }} - - name: MAX_HEAP_SIZE - value: {{ .Values.jvm.maxHeapSize | quote }} - {{- end }} - {{- if .Values.jvm.newHeapSize }} - - name: HEAP_NEWSIZE - value: {{ .Values.jvm.newHeapSize | quote }} - {{- end }} - {{- if .Values.jvm.extraOpts }} - - name: JVM_EXTRA_OPTS - value: {{ .Values.jvm.extraOpts | quote }} - {{- end }} - - name: CASSANDRA_ENABLE_RPC - value: {{ .Values.cluster.enableRPC | quote }} - {{- if .Values.cluster.enableUDF }} - - name: CASSANDRA_ENABLE_USER_DEFINED_FUNCTIONS - value: {{ .Values.cluster.enableUDF | quote }} - {{- end }} - {{- if .Values.livenessProbe.enabled }} - livenessProbe: - exec: - command: ["/bin/sh", "-c", "nodetool status"] - initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.livenessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} - successThreshold: {{ .Values.livenessProbe.successThreshold }} - failureThreshold: {{ .Values.livenessProbe.failureThreshold }} - {{- end }} - {{- if .Values.readinessProbe.enabled }} - readinessProbe: - exec: - command: ["/bin/sh", "-c", "nodetool status | grep -E \"^UN\\s+${POD_IP}\""] - initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.readinessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} - successThreshold: {{ .Values.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.readinessProbe.failureThreshold }} - {{- end }} - {{- if not .Values.persistence.enabled }} - lifecycle: - preStop: - exec: - command: - - bash - - -ec - - nodetool decommission - {{- end }} - ports: - - name: intra - containerPort: 7000 - - name: tls - containerPort: 7001 - - name: jmx - containerPort: 7199 - - name: cql - containerPort: 9042 - {{- if .Values.cluster.enableRPC }} - - name: thrift - containerPort: 9160 - {{- end }} - {{- if .Values.resources }} - resources: {{ toYaml .Values.resources | nindent 12 }} - {{- end }} - volumeMounts: - - name: data - mountPath: /bitnami/cassandra - {{- if .Values.tlsEncryptionSecretName }} - - name: encryption-secrets - mountPath: /bitnami/cassandra/secrets - {{- end }} - {{- if .Values.initDBConfigMap }} - - name: init-db-cm - mountPath: /docker-entrypoint-initdb.d/configmap - {{- end }} - {{- if .Values.initDBSecret }} - - name: init-db-secret - mountPath: /docker-entrypoint-initdb.d/secret - {{- end }} - {{ if .Values.existingConfiguration }} - - name: configurations - mountPath: /bitnami/cassandra/conf - {{- end }} - - mountPath: /opt/tip-wlan/certs/cacert.pem - name: cassandra-client-certificates - subPath: cacert.pem - - mountPath: /opt/tip-wlan/certs/cassandraservercert.pem - name: cassandra-client-certificates - subPath: cassandraservercert.pem - - mountPath: /opt/tip-wlan/certs/cassandraserverkey_dec.pem - name: cassandra-client-certificates - subPath: cassandraserverkey_dec.pem - {{- if .Values.metrics.enabled }} - - name: metrics - image: {{ include "cassandra.metrics.image" . }} - imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} - ports: - - name: metrics - containerPort: 8080 - protocol: TCP - - name: jmx - containerPort: 5555 - {{- if .Values.metrics.resources }} - resources: {{- toYaml .Values.metrics.resources | nindent 12 }} - {{- end }} - livenessProbe: - tcpSocket: - port: metrics - readinessProbe: - httpGet: - path: /metrics - port: metrics - initialDelaySeconds: 20 - timeoutSeconds: 45 - {{- end }} - {{- if .Values.image.pullSecrets }} - imagePullSecrets: - - name: {{ .Values.image.pullSecrets }} - {{- end }} - volumes: - - name: cassandra-client-certificates - secret: - secretName: {{ include "common.fullname" . }}-client-certs - {{- if .Values.tlsEncryptionSecretName }} - - name: encryption-secrets - secret: - secretName: {{ .Values.tlsEncryptionSecretName }} - items: - - key: keystore - path: keystore - - key: truststore - path: truststore - {{- end }} - {{- if .Values.existingConfiguration }} - - name: configurations - configMap: - name: {{ tpl .Values.existingConfiguration $ }} - {{- end }} - {{- if .Values.initDBConfigMap }} - - name: init-db-cm - configMap: - name: {{ tpl .Values.initDBConfigMap $ }} - {{- end }} - {{- if .Values.initDBSecret }} - - name: init-db-secret - configMap: - name: {{ tpl .Values.initDBSecret $ }} - {{- end }} -{{- if not .Values.persistence.enabled }} - - name: data - emptyDir: {} -{{- else }} - volumeClaimTemplates: - - metadata: - name: data - labels: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} - {{- if .Values.persistence.annotations }} - annotations: {{- toYaml .Values.persistence.annotations | nindent 10 }} - {{- end }} - spec: - accessModes: - {{- range .Values.persistence.accessModes }} - - {{ . | quote }} - {{- end }} - resources: - requests: - storage: {{ .Values.persistence.size | quote }} - {{- if .Values.persistence.storageClass }} - {{- if (eq "-" .Values.persistence.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ .Values.persistence.storageClass }}" - {{- end }} - {{- end }} -{{- end }} diff --git a/tip-wlan/charts/cassandra/templates/tests/test-cassandra-record-insert-del.yaml b/tip-wlan/charts/cassandra/templates/tests/test-cassandra-record-insert-del.yaml deleted file mode 100644 index 87b72e7..0000000 --- a/tip-wlan/charts/cassandra/templates/tests/test-cassandra-record-insert-del.yaml +++ /dev/null @@ -1,54 +0,0 @@ -{{- if .Values.testsEnabled -}} -# NOTE: For the test to work, make sure that the cluster-size remains the same -# if you are doing helm-del and then helm-install with existing pvc. -apiVersion: v1 -kind: Pod -metadata: - name: {{ include "common.fullname" . }}-test-insertion-deletion - namespace: {{ include "common.namespace" . }} - annotations: - "helm.sh/hook": test-success -spec: - containers: - - name: {{ include "common.name" . }}-test-cassandra-basic - image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }} - imagePullPolicy: {{ .Values.image.pullPolicy | default .Values.global.pullPolicy }} - command: - - sh - - -c - - | - cqlsh --cqlshrc /bitnami/cassandra/conf/cqlshrc.tip-wlan -e \ - "CREATE KEYSPACE MYDB WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 }; \ - use MYDB; \ - CREATE TABLE BOOKS (id int PRIMARY KEY, title text, year text); \ - INSERT INTO BOOKS (id, title, year) VALUES (1, 'Power Of Now', '1994'); \ - SELECT * FROM BOOKS; \ - DELETE FROM BOOKS WHERE id=1; \ - SELECT * FROM BOOKS; \ - DROP TABLE BOOKS; \ - DROP KEYSPACE MYDB;" - volumeMounts: - {{ if .Values.existingConfiguration }} - - name: configurations - mountPath: /bitnami/cassandra/conf - {{- end }} - - mountPath: /opt/tip-wlan/certs/cacert.pem - name: cassandra-client-certificates - subPath: cacert.pem - - mountPath: /opt/tip-wlan/certs/cassandraservercert.pem - name: cassandra-client-certificates - subPath: cassandraservercert.pem - - mountPath: /opt/tip-wlan/certs/cassandraserverkey_dec.pem - name: cassandra-client-certificates - subPath: cassandraserverkey_dec.pem - restartPolicy: Never - volumes: - {{- if .Values.existingConfiguration }} - - name: configurations - configMap: - name: {{ tpl .Values.existingConfiguration $ }} - {{- end }} - - name: cassandra-client-certificates - secret: - secretName: {{ include "common.fullname" . }}-client-certs -{{- end }} \ No newline at end of file diff --git a/tip-wlan/charts/cassandra/values.yaml b/tip-wlan/charts/cassandra/values.yaml deleted file mode 100644 index 8b1eee9..0000000 --- a/tip-wlan/charts/cassandra/values.yaml +++ /dev/null @@ -1,330 +0,0 @@ -## Global Docker image parameters -## Please, note that this will override the image parameters, including dependencies, configured to use the global value -## Current available global Docker image parameters: imageRegistry and imagePullSecrets -## -# global: -# imageRegistry: myRegistryName -# imagePullSecrets: -# - myRegistryKeySecretName -# storageClass: myStorageClass - -## Bitnami Cassandra image version -## ref: https://hub.docker.com/r/bitnami/cassandra/tags/ -## -image: - registry: docker.io - repository: bitnami/cassandra - ## Bitnami Cassandra image tag - ## ref: https://github.com/bitnami/bitnami-docker-cassandra#supported-tags-and-respective-dockerfile-links - ## - tag: 3.11.6-debian-10-r138 - ## Specify a imagePullPolicy - ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' - ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images - ## - pullPolicy: Always - ## Optionally specify an array of imagePullSecrets. - ## Secrets must be manually created in the namespace. - ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - ## - # pullSecrets: - # - myRegistryKeySecretName - ## Set to true if you would like to see extra information on logs - ## It turns BASH debugging in minideb-extras-base - ## - debug: false - -## String to partially override cassandra.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override cassandra.fullname template -## -# fullnameOverride: - -## Init containers parameters: -## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section. -## -volumePermissions: - enabled: true - image: - registry: docker.io - repository: bitnami/minideb - tag: buster - pullPolicy: Always - ## Optionally specify an array of imagePullSecrets. - ## Secrets must be manually created in the namespace. - ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - ## - # pullSecrets: - # - myRegistryKeySecretName - ## Init container' resource requests and limits - ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ - ## - resources: - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - limits: {} - # cpu: 100m - # memory: 128Mi - requests: {} - # cpu: 100m - # memory: 128Mi - -## Service parameters -## -service: - ## Service type - ## - type: ClusterIP - ## CQL port - ## - port: 9042 - ## Thrift Client API port - ## - thriftPort: 9160 - ## Specify the nodePort(s) value(s) for the LoadBalancer and NodePort service types. - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport - ## - nodePorts: - cql: "" - thriftPort: "" - ## Set the LoadBalancer service type to internal only. - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer - ## - # loadBalancerIP: - ## Provide any additional annotations which may be required. This can be used to - ## set the LoadBalancer service type to internal only. - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer - ## - annotations: {} - -## Enable persistence using Persistent Volume Claims -## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ -## -persistence: - ## If true, use a Persistent Volume Claim, If false, use emptyDir - ## - enabled: false - ## Persistent Volume Storage Class - ## If defined, storageClassName: - ## If set to "-", storageClassName: "", which disables dynamic provisioning - ## If undefined (the default) or set to null, no storageClassName spec is - ## set, choosing the default provisioner. (gp2 on AWS, standard on - ## GKE, AWS & OpenStack) - ## - storageClass: "-" - ## Persistent Volume Claim annotations - ## - annotations: - ## Persistent Volume Access Mode - ## - accessModes: - - ReadWriteOnce - ## Persistent Volume size - ## - size: 1Gi - -## Cassandra pods' resource requests and limits -## ref: http://kubernetes.io/docs/user-guide/compute-resources/ -## Minimum memory for development is 4GB and 2 CPU cores -## Minimum memory for production is 8GB and 4 CPU cores -## ref: http://docs.datastax.com/en/archived/cassandra/2.0/cassandra/architecture/architecturePlanningHardware_c.html -## -resources: - limits: - cpu: "1" - memory: 8Gi - requests: - cpu: 500m - memory: 3Gi - -## Secret with keystore, keystore password, truststore, truststore password -## -tlsEncryptionSecretName: cassandra-ssl-certs -## ConfigMap with custom cassandra configuration files. This overrides any other Cassandra configuration set in the chart -## -existingConfiguration: cassandra-configurations-override -## Cluster parameters -## -cluster: - name: TipWlanCluster - replicaCount: 3 - seedCount: 2 - numTokens: 256 - datacenter: DC1 - rack: RAC1 - enableRPC: true - endpointSnitch: SimpleSnitch - ## Enable the creation of the Pod Disruption Budget - ## - pdbEnabled: true - ## Minimum number of cluster nodes that will be running. Needs pdbEnabled=true - ## - minAvailable: 1 - ## Maximum number of cluster nodes that may not be running. Needs pdbEnabled=true. - ## - # maxUnavailable: 1 - ## Encryption values. NOTE: They require tlsEncryptionSecretName - ## - internodeEncryption: all - clientEncryption: true - domain: cluster.local - -## JVM Settings -## -jvm: - ## Extra JVM options - ## - extraOpts: - - ## Memory settings: These are calculated automatically - ## unless specified otherwise - ## - # maxHeapSize: 4G - # newHeapSize: 800M - -## Database credentials -## -dbUser: - user: cassandra - forcePassword: false - password: cassandra - # existingSecret: - -## ConfigMap with cql scripts. Useful for creating a keyspace -## and pre-populating data -## -# initDBConfigMap: - -## Secret with cql script (with sensitive data). Useful for creating a keyspace -## and pre-populating data -## -# initDBSecret: - -## Cassandra container's liveness and readiness probes -## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes -## -livenessProbe: - enabled: true - initialDelaySeconds: 60 - periodSeconds: 30 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 5 -readinessProbe: - enabled: true - initialDelaySeconds: 60 - periodSeconds: 10 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 5 - -## Additional pod annotations -## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ -## -podAnnotations: {} - -## Additional pod labels -## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ -## -podLabels: {} - -## Affinity for pod assignment -## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity -## -affinity: {} - -## Node labels for pod assignment. Evaluated as a template. -## Ref: https://kubernetes.io/docs/user-guide/node-selection/ -## -nodeSelector: {} - -## Tolerations for pod assignment -## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ -## -tolerations: [] - -## StatefulSet settings -## -statefulset: - updateStrategy: OnDelete - # rollingUpdatePartition: - -## Pod Security Context -## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ -## -securityContext: - enabled: true - fsGroup: 1001 - runAsUser: 1001 - -## Container entrypoint and cmd (useful for using different images) -## -entrypoint: "/entrypoint.sh" -cmd: "/run.sh" - -## Network policies -## Ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/ -## -networkPolicy: - ## Specifies whether a NetworkPolicy should be created - ## - enabled: false - - ## The Policy model to apply. When set to false, only pods with the correct - ## client label will have network access to the port Redis is listening - ## on. When true, Redis will accept connections from any source - ## (with the correct destination port). - ## - # allowExternal: true - -## Enable/disable the chart's tests. Useful if using this chart as a dependency of -## another chart and you don't want these tests running when trying to develop and -## test your own chart. -testsEnabled: true - -## Cassandra Prometheus exporter configuration -## ref: https://hub.docker.com/r/bitnami/cassandra-exporter/tags/ -## -metrics: - enabled: false - image: - registry: docker.io - pullPolicy: Always - repository: bitnami/cassandra-exporter - tag: 2.3.4-debian-10-r119 - ## Optionally specify an array of imagePullSecrets. - ## Secrets must be manually created in the namespace. - ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - ## - # pullSecrets: - # - myRegistryKeySecretName - ## Cassandra Prometheus exporter resource requests and limits - ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ - ## - resources: - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - limits: {} - # cpu: 100m - # memory: 128Mi - requests: {} - # cpu: 100m - # memory: 128Mi - ## Metrics exporter pod Annotation and Labels - ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ - ## - podAnnotations: - prometheus.io/scrape: "true" - prometheus.io/port: "8080" -creds: - sslKeystorePassword: DUMMY_PASSWORD - sslTruststorePassword: DUMMY_PASSWORD - -cassandra: - url: cassandra-headless diff --git a/tip-wlan/charts/common/templates/_env.tpl b/tip-wlan/charts/common/templates/_env.tpl index ce62ccf..eb2ae57 100644 --- a/tip-wlan/charts/common/templates/_env.tpl +++ b/tip-wlan/charts/common/templates/_env.tpl @@ -1,12 +1,5 @@ -{{/* - Resolve the environment variables to apply to a chart. The default namespace suffix - is the name of the chart. This can be overridden if necessary (eg. for subcharts) - using the following value: - - - .Values.nsPrefix : override namespace prefix -*/}} {{- define "common.namespace" -}} - {{- default .Values.global.nsPrefix -}} + {{- .Release.Namespace -}} {{- end -}} {{- define "common.env" -}} diff --git a/tip-wlan/charts/common/templates/_namespace.tpl b/tip-wlan/charts/common/templates/_namespace.tpl deleted file mode 100644 index 913127a..0000000 --- a/tip-wlan/charts/common/templates/_namespace.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{/* - Resolve the namespace to apply to a chart. The default namespace suffix - is the name of the chart. This can be overridden if necessary (eg. for subcharts) - using the following value: - - - .Values.nsPrefix : override namespace prefix -*/}} -{{- define "common.namespace" -}} - {{- default .Values.global.nsPrefix -}} -{{- end -}} diff --git a/tip-wlan/charts/common/templates/_svc.tpl b/tip-wlan/charts/common/templates/_svc.tpl index 6ea4454..e2c2365 100644 --- a/tip-wlan/charts/common/templates/_svc.tpl +++ b/tip-wlan/charts/common/templates/_svc.tpl @@ -16,7 +16,7 @@ else use user-provided URL {{- $zookeeperService := printf "%s-%s" .Release.Name .Values.zookeeper.url }} {{- default $zookeeperService }} {{- end -}} -{{- end -}} +{{- end -}} {{/* Resolve the Kafka service-name to apply to a chart. @@ -67,7 +67,6 @@ else use user-provided URL {{- printf "%s-%s:%.f" .Release.Name .Values.opensyncgw.url .Values.opensyncgw.port | trunc 63 -}} {{- end -}} - {{/* Resolve the pvc name that's would mounted to 2 charts - Portal and Opensync-gw */}} @@ -80,4 +79,4 @@ else use user-provided URL */}} {{- define "filestore.dir.name" -}} {{- printf "%s" .Values.filestore.internal | trunc 63 -}} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/tip-wlan/charts/kafka/Chart.yaml b/tip-wlan/charts/kafka/Chart.yaml deleted file mode 100755 index f95a356..0000000 --- a/tip-wlan/charts/kafka/Chart.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v2 -description: Apache Kafka is publish-subscribe messaging -name: kafka -version: 0.1.0 -appVersion: 1.0.0 -dependencies: - - name: zookeeper - version: 0.1.0 diff --git a/tip-wlan/charts/kafka/resources/config/certs/README.md b/tip-wlan/charts/kafka/resources/config/certs/README.md deleted file mode 100644 index e0cedbb..0000000 --- a/tip-wlan/charts/kafka/resources/config/certs/README.md +++ /dev/null @@ -1,2 +0,0 @@ -Contains certs needed for this service to start. -Please refer to page: https://telecominfraproject.atlassian.net/wiki/spaces/WIFI/pages/262176803/Pre-requisites+before+deploying+Tip-Wlan+solution \ No newline at end of file diff --git a/tip-wlan/charts/kafka/templates/NOTES.txt b/tip-wlan/charts/kafka/templates/NOTES.txt deleted file mode 100644 index a3e236f..0000000 --- a/tip-wlan/charts/kafka/templates/NOTES.txt +++ /dev/null @@ -1,67 +0,0 @@ -### Connecting to Kafka from inside Kubernetes - -You can connect to Kafka by running a simple pod in the K8s cluster like this with a configuration like this: - - apiVersion: v1 - kind: Pod - metadata: - name: testclient - namespace: {{ .Release.Namespace }} - spec: - containers: - - name: kafka - image: {{ .Values.image }}:{{ .Values.imageTag }} - command: - - sh - - -c - - "exec tail -f /dev/null" - -Once you have the testclient pod above running, you can list all kafka -topics with: - - kubectl -n {{ .Release.Namespace }} exec testclient -- kafka-topics --zookeeper {{ .Release.Name }}-zookeeper:2181 --list - -To create a new topic: - - kubectl -n {{ .Release.Namespace }} exec testclient -- kafka-topics --zookeeper {{ .Release.Name }}-zookeeper:2181 --topic test1 --create --partitions 1 --replication-factor 1 - -To listen for messages on a topic: - - kubectl -n {{ .Release.Namespace }} exec -ti testclient -- kafka-console-consumer --bootstrap-server {{ include "common.fullname" . }}:9092 --topic test1 --from-beginning - -To stop the listener session above press: Ctrl+C - -To start an interactive message producer session: - kubectl -n {{ .Release.Namespace }} exec -ti testclient -- kafka-console-producer --broker-list {{ include "common.fullname" . }}-headless:9092 --topic test1 - -To create a message in the above session, simply type the message and press "enter" -To end the producer session try: Ctrl+C - -If you specify "zookeeper.connect" in configurationOverrides, please replace "{{ .Release.Name }}-zookeeper:2181" with the value of "zookeeper.connect", or you will get error. - -{{ if .Values.external.enabled }} -### Connecting to Kafka from outside Kubernetes - -You have enabled the external access feature of this chart. - -**WARNING:** By default this feature allows Kafka clients outside Kubernetes to -connect to Kafka via NodePort(s) in `PLAINTEXT`. - -Please see this chart's README.md for more details and guidance. - -If you wish to connect to Kafka from outside please configure your external Kafka -clients to point at the following brokers. Please allow a few minutes for all -associated resources to become healthy. - {{ $fullName := include "common.fullname" . }} - {{- $replicas := .Values.replicas | int }} - {{- $servicePort := .Values.external.servicePort | int}} - {{- $root := . }} - {{- range $i, $e := until $replicas }} - {{- $externalListenerPort := add $root.Values.external.firstListenerPort $i }} - {{- if $root.Values.external.distinct }} -{{ printf "%s-%d.%s:%d" $root.Release.Name $i $root.Values.external.domain $servicePort | indent 2 }} - {{- else }} -{{ printf "%s.%s:%d" $root.Release.Name $root.Values.external.domain $externalListenerPort | indent 2 }} - {{- end }} - {{- end }} -{{- end }} diff --git a/tip-wlan/charts/kafka/templates/_helpers.tpl b/tip-wlan/charts/kafka/templates/_helpers.tpl deleted file mode 100644 index 5cdf36f..0000000 --- a/tip-wlan/charts/kafka/templates/_helpers.tpl +++ /dev/null @@ -1,89 +0,0 @@ -{{/* -Form the Zookeeper URL. If zookeeper is installed as part of this chart, use k8s service discovery, -else use user-provided URL -*/}} -{{- define "zookeeper.url" }} -{{- $port := .Values.zookeeper.port | toString }} -{{- if .Values.zookeeper.enabled -}} -{{- printf "%s:%s" (include "kafka.zookeeper.fullname" .) $port }} -{{- else -}} -{{- $zookeeperConnect := printf "%s-%s:%s" .Release.Name .Values.zookeeper.url $port }} -{{- $zookeeperConnectOverride := index .Values "configurationOverrides" "zookeeper.connect" }} -{{- default $zookeeperConnect $zookeeperConnectOverride }} -{{- end -}} -{{- end -}} - -{{/* -Derive offsets.topic.replication.factor in following priority order: configurationOverrides, replicas -*/}} -{{- define "kafka.replication.factor" }} -{{- $replicationFactorOverride := index .Values "configurationOverrides" "offsets.topic.replication.factor" }} -{{- default .Values.replicas $replicationFactorOverride }} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "kafka.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create unified labels for kafka components -*/}} - -{{- define "kafka.common.matchLabels" -}} -app.kubernetes.io/name: {{ include "common.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end -}} - -{{- define "kafka.common.metaLabels" -}} -helm.sh/chart: {{ include "kafka.chart" . }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} - -{{- define "kafka.broker.matchLabels" -}} -app.kubernetes.io/component: kafka-broker -{{ include "kafka.common.matchLabels" . }} -{{- end -}} - -{{- define "kafka.broker.labels" -}} -{{ include "kafka.common.metaLabels" . }} -{{ include "kafka.broker.matchLabels" . }} -{{- end -}} - -{{- define "kafka.config.matchLabels" -}} -app.kubernetes.io/component: kafka-config -{{ include "kafka.common.matchLabels" . }} -{{- end -}} - -{{- define "kafka.config.labels" -}} -{{ include "kafka.common.metaLabels" . }} -{{ include "kafka.config.matchLabels" . }} -{{- end -}} - -{{- define "kafka.monitor.matchLabels" -}} -app.kubernetes.io/component: kafka-monitor -{{ include "kafka.common.matchLabels" . }} -{{- end -}} - -{{- define "kafka.monitor.labels" -}} -{{ include "kafka.common.metaLabels" . }} -{{ include "kafka.monitor.matchLabels" . }} -{{- end -}} - -{{- define "serviceMonitor.namespace" -}} -{{- if .Values.prometheus.operator.serviceMonitor.releaseNamespace -}} -{{ .Release.Namespace }} -{{- else -}} -{{ .Values.prometheus.operator.serviceMonitor.namespace }} -{{- end -}} -{{- end -}} - -{{- define "prometheusRule.namespace" -}} -{{- if .Values.prometheus.operator.prometheusRule.releaseNamespace -}} -{{ .Release.Namespace }} -{{- else -}} -{{ .Values.prometheus.operator.prometheusRule.namespace }} -{{- end -}} -{{- end -}} diff --git a/tip-wlan/charts/kafka/templates/configmap-config.yaml b/tip-wlan/charts/kafka/templates/configmap-config.yaml deleted file mode 100644 index 9416d6b..0000000 --- a/tip-wlan/charts/kafka/templates/configmap-config.yaml +++ /dev/null @@ -1,59 +0,0 @@ -{{- if .Values.topics -}} -{{- $zk := include "zookeeper.url" . -}} -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - {{- include "kafka.config.labels" . | nindent 4 }} - name: {{ include "common.fullname" . }}-config - namespace: {{ include "common.namespace" . }} -data: - runtimeConfig.sh: | - #!/bin/bash - set -e - cd /usr/bin - until kafka-configs --zookeeper {{ $zk }} --entity-type topics --describe || (( count++ >= 6 )) - do - echo "Waiting for Zookeeper..." - sleep 20 - done - until nc -z {{ template "common.fullname" . }} 9092 || (( retries++ >= 6 )) - do - echo "Waiting for Kafka..." - sleep 20 - done - echo "Applying runtime configuration using {{ .Values.image }}:{{ .Values.imageTag }}" - {{- range $n, $topic := .Values.topics }} - {{- if and $topic.partitions $topic.replicationFactor $topic.reassignPartitions }} - cat << EOF > {{ $topic.name }}-increase-replication-factor.json - {"version":1, "partitions":[ - {{- $partitions := (int $topic.partitions) }} - {{- $replicas := (int $topic.replicationFactor) }} - {{- range $i := until $partitions }} - {"topic":"{{ $topic.name }}","partition":{{ $i }},"replicas":[{{- range $j := until $replicas }}{{ $j }}{{- if ne $j (sub $replicas 1) }},{{- end }}{{- end }}]}{{- if ne $i (sub $partitions 1) }},{{- end }} - {{- end }} - ]} - EOF - kafka-reassign-partitions --zookeeper {{ $zk }} --reassignment-json-file {{ $topic.name }}-increase-replication-factor.json --execute - kafka-reassign-partitions --zookeeper {{ $zk }} --reassignment-json-file {{ $topic.name }}-increase-replication-factor.json --verify - {{- else if and $topic.partitions $topic.replicationFactor }} - kafka-topics --zookeeper {{ $zk }} --create --if-not-exists --force --topic {{ $topic.name }} --partitions {{ $topic.partitions }} --replication-factor {{ $topic.replicationFactor }} - {{- else if $topic.partitions }} - kafka-topics --zookeeper {{ $zk }} --alter --force --topic {{ $topic.name }} --partitions {{ $topic.partitions }} || true - {{- end }} - {{- if $topic.defaultConfig }} - kafka-configs --zookeeper {{ $zk }} --entity-type topics --entity-name {{ $topic.name }} --alter --force --delete-config {{ nospace $topic.defaultConfig }} || true - {{- end }} - {{- if $topic.config }} - kafka-configs --zookeeper {{ $zk }} --entity-type topics --entity-name {{ $topic.name }} --alter --force --add-config {{ nospace $topic.config }} - {{- end }} - kafka-configs --zookeeper {{ $zk }} --entity-type topics --entity-name {{ $topic.name }} --describe - {{- if $topic.acls }} - {{- range $a, $acl := $topic.acls }} - {{ if and $acl.user $acl.operations }} - kafka-acls --authorizer-properties zookeeper.connect={{ $zk }} --force --add --allow-principal User:{{ $acl.user }}{{- range $operation := $acl.operations }} --operation {{ $operation }} {{- end }} --topic {{ $topic.name }} {{ $topic.extraParams }} - {{- end }} - {{- end }} - {{- end }} - {{- end }} -{{- end -}} diff --git a/tip-wlan/charts/kafka/templates/configmap.yaml b/tip-wlan/charts/kafka/templates/configmap.yaml deleted file mode 100644 index 03cf29f..0000000 --- a/tip-wlan/charts/kafka/templates/configmap.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-clientconfig - namespace: {{ include "common.namespace" . }} -data: - admin-client.properties: | - ssl.endpoint.identification.algorithm= - security.protocol=SSL - ssl.key.password={{ .Values.creds.sslKeyPassword | b64enc }} - ssl.keystore.location=/etc/kafka/secrets/kafka-server.pkcs12 - ssl.keystore.password={{ .Values.creds.sslKeystorePassword | b64enc }} - ssl.keystore.type=PKCS12 - ssl.truststore.location=/etc/kafka/secrets/truststore.jks - ssl.truststore.password={{ .Values.creds.sslTruststorePassword | b64enc }} - ssl.truststore.type=JKS - bootstrap.servers={{ include "kafka.service" . }}:9093 diff --git a/tip-wlan/charts/kafka/templates/job-config.yaml b/tip-wlan/charts/kafka/templates/job-config.yaml deleted file mode 100644 index 53a51f1..0000000 --- a/tip-wlan/charts/kafka/templates/job-config.yaml +++ /dev/null @@ -1,31 +0,0 @@ -{{- if .Values.topics -}} -{{- $scriptHash := include (print $.Template.BasePath "/configmap-config.yaml") . | sha256sum | trunc 8 -}} -apiVersion: batch/v1 -kind: Job -metadata: - name: "{{ include "common.fullname" . }}-config-{{ $scriptHash }}" - namespace: {{ include "common.namespace" . }} - labels: - {{- include "kafka.config.labels" . | nindent 4 }} -spec: - backoffLimit: {{ .Values.configJob.backoffLimit }} - template: - metadata: - labels: - {{- include "kafka.config.matchLabels" . | nindent 8 }} - spec: - restartPolicy: OnFailure - volumes: - - name: config-volume - configMap: - name: {{ include "common.fullname" . }}-config - defaultMode: 0744 - containers: - - name: {{ include "common.fullname" . }}-config - image: "{{ .Values.image }}:{{ .Values.imageTag }}" - imagePullPolicy: {{ .Values.imagePullPolicy | default .Values.global.pullPolicy }} - command: ["/usr/local/script/runtimeConfig.sh"] - volumeMounts: - - name: config-volume - mountPath: "/usr/local/script" -{{- end -}} diff --git a/tip-wlan/charts/kafka/templates/secret.yaml b/tip-wlan/charts/kafka/templates/secret.yaml deleted file mode 100644 index b3b6131..0000000 --- a/tip-wlan/charts/kafka/templates/secret.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "common.fullname" . }}-certs - namespace: {{ include "common.namespace" . }} - labels: - app: {{ template "common.name" . }} - chart: {{ template "common.chart" . }} - release: {{ .Release.Name | quote }} -type: Opaque -data: - truststore_creds: {{ .Values.creds.sslTruststorePassword | b64enc }} - keystore_creds: {{ .Values.creds.sslKeystorePassword | b64enc }} - key_creds: {{ .Values.creds.sslKeyPassword | b64enc }} - truststore.jks: {{ .Files.Get "resources/config/certs/truststore.jks" | b64enc }} - kafka-server.pkcs12: {{ .Files.Get "resources/config/certs/kafka-server.pkcs12" | b64enc }} - README: {{ .Files.Get "resources/config/certs/README.md" | b64enc }} diff --git a/tip-wlan/charts/kafka/templates/service-brokers.yaml b/tip-wlan/charts/kafka/templates/service-brokers.yaml deleted file mode 100644 index 99dfba7..0000000 --- a/tip-wlan/charts/kafka/templates/service-brokers.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: - {{- include "kafka.broker.labels" . | nindent 4 }} -spec: - ports: - - name: broker - port: {{ .Values.headless.sslPort }} - targetPort: kafka - selector: - {{- include "kafka.broker.matchLabels" . | nindent 4 }} diff --git a/tip-wlan/charts/kafka/templates/service-headless.yaml b/tip-wlan/charts/kafka/templates/service-headless.yaml deleted file mode 100644 index 046379d..0000000 --- a/tip-wlan/charts/kafka/templates/service-headless.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "kafka.service" . }} - namespace: {{ include "common.namespace" . }} - labels: - {{- include "kafka.broker.labels" . | nindent 4 }} - annotations: - service.alpha.kubernetes.io/tolerate-unready-endpoints: "true" -{{- if .Values.headless.annotations }} -{{ .Values.headless.annotations | toYaml | trimSuffix "\n" | indent 4 }} -{{- end }} -spec: - ports: -# - name: broker -# port: {{ .Values.headless.port }} -# {{- if .Values.headless.targetPort }} -# targetPort: {{ .Values.headless.targetPort }} -# {{- end }} - - name: broker - port: {{ .Values.headless.sslPort }} -{{- if .Values.headless.targetSslPort }} - targetPort: {{ .Values.headless.targetSslPort }} -{{- end }} - clusterIP: None - selector: - {{- include "kafka.broker.matchLabels" . | nindent 4 }} diff --git a/tip-wlan/charts/kafka/templates/statefulset.yaml b/tip-wlan/charts/kafka/templates/statefulset.yaml deleted file mode 100644 index c61ea9d..0000000 --- a/tip-wlan/charts/kafka/templates/statefulset.yaml +++ /dev/null @@ -1,252 +0,0 @@ -{{- $advertisedListenersOverride := first (pluck "advertised.listeners" .Values.configurationOverrides) }} -{{- $zk := include "zookeeper.service" . -}} -{{- $kafka := include "kafka.service" . -}} -{{- $ns := include "common.namespace" . -}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ include "common.fullname" . }} - namespace: {{ $ns }} - labels: - {{- include "kafka.broker.labels" . | nindent 4 }} -spec: - selector: - matchLabels: - {{- include "kafka.broker.matchLabels" . | nindent 6 }} - serviceName: {{ $kafka }} - podManagementPolicy: {{ .Values.podManagementPolicy }} - updateStrategy: -{{ toYaml .Values.updateStrategy | indent 4 }} - replicas: {{ default 3 .Values.replicas }} - template: - metadata: - annotations: -{{- if .Values.podAnnotations }} -{{ toYaml .Values.podAnnotations | indent 8 }} -{{- end }} - labels: - {{- include "kafka.broker.labels" . | nindent 8 }} - {{- if .Values.podLabels }} - ## Custom pod labels -{{ toYaml .Values.podLabels | indent 8 }} - {{- end }} - spec: -{{- if .Values.schedulerName }} - schedulerName: "{{ .Values.schedulerName }}" -{{- end }} -{{- if .Values.serviceAccountName }} - serviceAccountName: {{ .Values.serviceAccountName }} -{{- end }} -{{- if .Values.priorityClassName }} - priorityClassName: "{{ .Values.priorityClassName }}" -{{- end }} -{{- if .Values.tolerations }} - tolerations: -{{ toYaml .Values.tolerations | indent 8 }} -{{- end }} -{{- if .Values.affinity }} - affinity: -{{ toYaml .Values.affinity | indent 8 }} -{{- end }} -{{- if .Values.nodeSelector }} - nodeSelector: -{{ toYaml .Values.nodeSelector | indent 8 }} -{{- end }} - initContainers: - - name: {{ include "common.name" . }}-readiness - image: busybox:1.28 - imagePullPolicy: "{{ .Values.imagePullPolicy }}" - command: ['sh', '-c', "until nslookup {{ $zk }}.{{ $ns }}.svc.cluster.local; do echo waiting for myservice; sleep 2; done"] - containers: - - name: {{ include "common.name" . }}-broker - image: "{{ .Values.image }}:{{ .Values.imageTag }}" - imagePullPolicy: "{{ .Values.imagePullPolicy }}" - livenessProbe: - exec: - command: - - sh - - -ec - - /usr/bin/jps | /bin/grep -q SupportedKafka - {{- if not .Values.livenessProbe }} - initialDelaySeconds: 30 - timeoutSeconds: 5 - {{- else }} - initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 30}} - {{- if .Values.livenessProbe.periodSeconds }} - periodSeconds: {{ .Values.livenessProbe.periodSeconds }} - {{- end }} - timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds | default 5}} - {{- if .Values.livenessProbe.successThreshold }} - successThreshold: {{ .Values.livenessProbe.successThreshold }} - {{- end }} - {{- if .Values.livenessProbe.failureThreshold }} - failureThreshold: {{ .Values.livenessProbe.failureThreshold }} - {{- end }} - {{- end }} - readinessProbe: - tcpSocket: - port: kafka - initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.readinessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} - successThreshold: {{ .Values.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.readinessProbe.failureThreshold }} - ports: - - containerPort: {{ .Values.headless.sslPort }} - name: kafka - {{- if .Values.external.enabled }} - {{- $replicas := .Values.replicas | int }} - {{- $root := . }} - {{- range $i, $e := until $replicas }} - - containerPort: {{ add $root.Values.external.firstListenerPort $i }} - name: external-{{ $i }} - {{- end }} - {{- end }} - {{- if .Values.additionalPorts }} -{{ toYaml .Values.additionalPorts | indent 8 }} - {{- end }} - resources: -{{ toYaml .Values.resources | indent 10 }} - env: - - name: POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: KAFKA_ADVERTISED_LISTENERS - value: "SSL://{{ $kafka }}:9093" - - name: KAFKA_HEAP_OPTS - value: {{ .Values.kafkaHeapOptions }} - - name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR - value: {{ include "kafka.replication.factor" . | quote }} - {{- if not (hasKey .Values.configurationOverrides "zookeeper.connect") }} - - name: KAFKA_ZOOKEEPER_CONNECT - value: {{ include "zookeeper.url" . | quote }} - {{- end }} - {{- if not (hasKey .Values.configurationOverrides "log.dirs") }} - - name: KAFKA_LOG_DIRS - value: {{ printf "%s/%s" .Values.persistence.mountPath .Values.logSubPath | quote }} - {{- end }} - {{- range $key, $value := .Values.configurationOverrides }} - - name: {{ printf "KAFKA_%s" $key | replace "." "_" | upper | quote }} - value: {{ $value | quote }} - {{- end }} - {{- range $secret := .Values.secrets }} - {{- if not $secret.mountPath }} - {{- range $key := $secret.keys }} - - name: {{ (print ($secret.name | replace "-" "_") "_" $key) | upper }} - valueFrom: - secretKeyRef: - name: {{ $secret.name }} - key: {{ $key }} - {{- end }} - {{- end }} - {{- end }} - {{- range $key, $value := .Values.envOverrides }} - - name: {{ printf "%s" $key | replace "." "_" | upper | quote }} - value: {{ $value | quote }} - {{- end }} - # This is required because the Downward API does not yet support identification of - # pod numbering in statefulsets. Thus, we are required to specify a command which - # allows us to extract the pod ID for usage as the Kafka Broker ID. - # See: https://github.com/kubernetes/kubernetes/issues/31218 - command: - - sh - - -exc - - | - unset KAFKA_PORT && \ - export KAFKA_BROKER_ID=${POD_NAME##*-} && \ - {{- if eq .Values.external.type "LoadBalancer" }} - export LOAD_BALANCER_IP=$(echo '{{ .Values.external.loadBalancerIP }}' | tr -d '[]' | cut -d ' ' -f "$(($KAFKA_BROKER_ID + 1))") && \ - {{- end }} - {{- if eq .Values.external.type "NodePort" }} - export KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://${POD_IP}:9092,SSL://{{ $kafka }}:9093{{ if kindIs "string" $advertisedListenersOverride }}{{ printf ",%s" $advertisedListenersOverride }}{{ end }} && \ - {{- else }} - export KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://${POD_NAME}.{{ include "common.fullname" . }}-headless.${POD_NAMESPACE}.svc.cluster.local:9092,SSL://{{ $kafka }}:9093{{ if kindIs "string" $advertisedListenersOverride }}{{ printf ",%s" $advertisedListenersOverride }}{{ end }} && \ - {{- end }} - exec /etc/confluent/docker/run - volumeMounts: - - mountPath: /etc/kafka/secrets/truststore.jks - name: kafka-certificates - subPath: truststore.jks - - mountPath: /etc/kafka/secrets/kafka-server.pkcs12 - name: kafka-certificates - subPath: kafka-server.pkcs12 - - mountPath: /etc/kafka/secrets/key_creds - name: kafka-certificates - subPath: key_creds - - mountPath: /etc/kafka/secrets/keystore_creds - name: kafka-certificates - subPath: keystore_creds - - mountPath: /etc/kafka/secrets/truststore_creds - name: kafka-certificates - subPath: truststore_creds - - mountPath: /etc/kafka/admin-client.properties - name: kafka-client-config - subPath: admin-client.properties - - name: datadir - mountPath: {{ .Values.persistence.mountPath | quote }} - {{- range $secret := .Values.secrets }} - {{- if $secret.mountPath }} - {{- if $secret.keys }} - {{- range $key := $secret.keys }} - - name: {{ include "common.fullname" $ }}-{{ $secret.name }} - mountPath: {{ $secret.mountPath }}/{{ $key }} - subPath: {{ $key }} - readOnly: true - {{- end }} - {{- else }} - - name: {{ include "common.fullname" $ }}-{{ $secret.name }} - mountPath: {{ $secret.mountPath }} - readOnly: true - {{- end }} - {{- end }} - {{- end }} - volumes: - - name: kafka-certificates - secret: - secretName: {{ include "common.fullname" . }}-certs - - name: kafka-client-config - configMap: - name: {{ include "common.fullname" . }}-clientconfig - {{- if not .Values.persistence.enabled }} - - name: datadir - emptyDir: {} - {{- end }} - {{- if .Values.securityContext }} - securityContext: -{{ toYaml .Values.securityContext | indent 8 }} - {{- end }} - {{- range .Values.secrets }} - {{- if .mountPath }} - - name: {{ include "common.fullname" $ }}-{{ .name }} - secret: - secretName: {{ .name }} - {{- end }} - {{- end }} - terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }} - {{- if .Values.persistence.enabled }} - volumeClaimTemplates: - - metadata: - name: datadir - spec: - accessModes: - - {{ .Values.persistence.accessMode | quote }} - resources: - requests: - storage: {{ .Values.persistence.size }} - {{- if .Values.persistence.storageClass }} - {{- if (eq "-" .Values.persistence.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ .Values.persistence.storageClass }}" - {{- end }} - {{- end }} - {{- end }} diff --git a/tip-wlan/charts/kafka/templates/tests/test-topic-create-produce-consume.yaml b/tip-wlan/charts/kafka/templates/tests/test-topic-create-produce-consume.yaml deleted file mode 100644 index 0be161c..0000000 --- a/tip-wlan/charts/kafka/templates/tests/test-topic-create-produce-consume.yaml +++ /dev/null @@ -1,61 +0,0 @@ -{{- if .Values.testsEnabled -}} -apiVersion: v1 -kind: Pod -metadata: - name: {{ include "common.fullname" . }}-test-topic-create-produce-consume - namespace: {{ include "common.namespace" . }} - annotations: - "helm.sh/hook": test-success -spec: - containers: - - name: {{ include "common.name" . }}-test-consume - image: {{ .Values.image }}:{{ .Values.imageTag }} - imagePullPolicy: {{ .Values.imagePullPolicy | default .Values.global.pullPolicy }} - command: - - sh - - -c - - | - # List topics: - echo "##### Listing existing topics #####" - kafka-topics --zookeeper {{ include "zookeeper.url" . }} --list - # Create the topic - echo "##### Create topic helm-test-topic-create-consume-produce #####" - kafka-topics --zookeeper {{ include "zookeeper.url" . }} --topic helm-test-topic-create-consume-produce --create --partitions 1 --replication-factor 1 --if-not-exists - echo "##### Produce the test message #####" - # Create a message - MESSAGE="`date -u`" - # Produce a test message to the topic - echo "$MESSAGE" | kafka-console-producer --broker-list {{ include "common.fullname" . }}-headless:9093 --producer.config /etc/kafka/admin-client.properties --topic helm-test-topic-create-consume-produce - echo "##### Consume the test message from the topic #####" - # Consume a test message from the topic - kafka-console-consumer --bootstrap-server {{ include "common.fullname" . }}-headless:9093 --consumer.config /etc/kafka/admin-client.properties --topic helm-test-topic-create-consume-produce --from-beginning --timeout-ms 2000 --max-messages 1 | grep "$MESSAGE" - echo "##### Listing current topics including our new topic #####" - kafka-topics --zookeeper {{ include "zookeeper.url" . }} --list - # Delete the messages from topic - echo "##### Delete messages from our topic #####" - kafka-configs --zookeeper {{ include "zookeeper.url" . }} --alter --entity-type topics --entity-name helm-test-topic-create-consume-produce --add-config retention.ms=1000 - # Mark topic for deletion - echo "##### Mark our topic for Deletion #####" - kafka-topics --zookeeper {{ include "zookeeper.url" . }} --delete --topic helm-test-topic-create-consume-produce - # List topics: - echo "##### Listing topics after deleting our newly created topic #####" - kafka-topics --zookeeper {{ include "zookeeper.url" . }} --list - volumeMounts: - - mountPath: /etc/kafka/admin-client.properties - name: kafka-client-config - subPath: admin-client.properties - - mountPath: /etc/kafka/secrets/truststore.jks - name: kafka-certificates - subPath: truststore.jks - - mountPath: /etc/kafka/secrets/kafka-server.pkcs12 - name: kafka-certificates - subPath: kafka-server.pkcs12 - restartPolicy: Never - volumes: - - name: kafka-client-config - configMap: - name: {{ include "common.fullname" . }}-clientconfig - - name: kafka-certificates - secret: - secretName: {{ include "common.fullname" . }}-certs -{{- end }} \ No newline at end of file diff --git a/tip-wlan/charts/kafka/values.yaml b/tip-wlan/charts/kafka/values.yaml deleted file mode 100644 index beb4e74..0000000 --- a/tip-wlan/charts/kafka/values.yaml +++ /dev/null @@ -1,369 +0,0 @@ -# ------------------------------------------------------------------------------ -# Kafka: -# ------------------------------------------------------------------------------ - -## The StatefulSet installs 1 pod by default -replicas: 1 - -## The kafka image repository -image: "confluentinc/cp-kafka" -# image: "wurstmeister/kafka" - -## The kafka image tag -imageTag: "5.0.1" # Confluent image for Kafka 2.0.0 -# imageTag: "latest" - -## Specify a imagePullPolicy -## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images -imagePullPolicy: "Always" - -## Configure resource requests and limits -## ref: http://kubernetes.io/docs/user-guide/compute-resources/ -resources: - limits: - cpu: 500m - memory: 2Gi - requests: - cpu: 50m - memory: 1Gi -kafkaHeapOptions: "-Xmx1G -Xms1G" - -## Optional Container Security context -securityContext: {} - -## The StatefulSet Update Strategy which Kafka will use when changes are applied. -## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies -updateStrategy: - type: "OnDelete" - -## Start and stop pods in Parallel or OrderedReady (one-by-one.) Note - Can not change after first release. -## ref: https://kubernetes.io/docs/tutorials/stateful-application/basic-stateful-set/#pod-management-policy -podManagementPolicy: OrderedReady - -## Useful if using any custom authorizer -## Pass in some secrets to use (if required) -# secrets: -# - name: myKafkaSecret -# keys: -# - username -# - password -# # mountPath: /opt/kafka/secret -# - name: myZkSecret -# keys: -# - user -# - pass -# mountPath: /opt/zookeeper/secret - - -## The subpath within the Kafka container's PV where logs will be stored. -## This is combined with `persistence.mountPath`, to create, by default: /opt/kafka/data/logs -logSubPath: "logs" - -## Use an alternate scheduler, e.g. "stork". -## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ -## -# schedulerName: - -## Use an alternate serviceAccount -## Useful when using images in custom repositories -# serviceAccountName: - -## Set a pod priorityClassName -# priorityClassName: high-priority - -## Pod scheduling preferences (by default keep pods within a release on separate nodes). -## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity -## By default we don't set affinity -affinity: {} -## Alternatively, this typical example defines: -## antiAffinity (to keep Kafka pods on separate pods) -## and affinity (to encourage Kafka pods to be collocated with Zookeeper pods) -# affinity: -# podAntiAffinity: -# requiredDuringSchedulingIgnoredDuringExecution: -# - labelSelector: -# matchExpressions: -# - key: app -# operator: In -# values: -# - kafka -# topologyKey: "kubernetes.io/hostname" -# podAffinity: -# preferredDuringSchedulingIgnoredDuringExecution: -# - weight: 50 -# podAffinityTerm: -# labelSelector: -# matchExpressions: -# - key: app -# operator: In -# values: -# - zookeeper -# topologyKey: "kubernetes.io/hostname" - -## Node labels for pod assignment -## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector -nodeSelector: {} - -## Readiness probe config. -## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/ -## -readinessProbe: - initialDelaySeconds: 30 - periodSeconds: 10 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 3 - -## Period to wait for broker graceful shutdown (sigterm) before pod is killed (sigkill) -## ref: https://kubernetes-v1-4.github.io/docs/user-guide/production-pods/#lifecycle-hooks-and-termination-notice -## ref: https://kafka.apache.org/10/documentation.html#brokerconfigs controlled.shutdown.* -terminationGracePeriodSeconds: 60 - -# Tolerations for nodes that have taints on them. -# Useful if you want to dedicate nodes to just run kafka -# https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ -tolerations: [] -# tolerations: -# - key: "key" -# operator: "Equal" -# value: "value" -# effect: "NoSchedule" - -## Headless service. -## -headless: - # annotations: - # targetPort: - port: 9092 - sslPort: 9093 - -## External access. -## -external: - enabled: false - # type can be either NodePort or LoadBalancer - type: NodePort - # annotations: - # service.beta.kubernetes.io/openstack-internal-load-balancer: "true" - dns: - useInternal: false - useExternal: true - # If using external service type LoadBalancer and external dns, set distinct to true below. - # This creates an A record for each statefulset pod/broker. You should then map the - # A record of the broker to the EXTERNAL IP given by the LoadBalancer in your DNS server. - distinct: false - servicePort: 19092 - firstListenerPort: 31090 - domain: cluster.local - loadBalancerIP: [] - loadBalancerSourceRanges: [] - init: - image: "lwolf/kubectl_deployer" - imageTag: "0.4" - imagePullPolicy: "IfNotPresent" - -# Annotation to be added to Kafka pods -podAnnotations: {} - -# Labels to be added to Kafka pods -podLabels: {} - # service: broker - # team: developers - -podDisruptionBudget: {} - # maxUnavailable: 1 # Limits how many Kafka pods may be unavailable due to voluntary disruptions. - -## Configuration Overrides. Specify any Kafka settings you would like set on the StatefulSet -## here in map format, as defined in the official docs. -## ref: https://kafka.apache.org/documentation/#brokerconfigs -## -configurationOverrides: - "confluent.support.metrics.enable": false # Disables confluent metric submission - # "auto.leader.rebalance.enable": true - # "auto.create.topics.enable": true - # "controlled.shutdown.enable": true - # "controlled.shutdown.max.retries": 100 - # "ssl.secret.dir": "/opt/tip-wlan/certs" - # "ssl.keystore.filename": "kafka-server.pkcs12" - # "ssl.key.credentials": "mypassword" - # "ssl.truststore.filename": "kafka_server_keystore.jks" - # "ssl.truststore.credentials": "mypassword" - # advertised.listeners: SSL://tip-wlan-kafka-headless:9093 - ssl.client.auth: required - ssl.endpoint.identification.algorithm: "" - security.inter.broker.protocol: SSL - ssl.key.credentials: "key_creds" - ssl.keystore.filename: "kafka-server.pkcs12" - ssl.keystore.credentials: "keystore_creds" - ssl.keystore.type: "PKCS12" - ssl.truststore.filename: "truststore.jks" - ssl.truststore.credentials: "truststore_creds" - ssl.truststore.type: "JKS" - - ## Options required for external access via NodePort - ## ref: - ## - http://kafka.apache.org/documentation/#security_configbroker - ## - https://cwiki.apache.org/confluence/display/KAFKA/KIP-103%3A+Separation+of+Internal+and+External+traffic - ## - ## Setting "advertised.listeners" here appends to "PLAINTEXT://${POD_IP}:9092,", ensure you update the domain - ## If external service type is Nodeport: - # "advertised.listeners": |- - # EXTERNAL://kafka.cluster.local:$((31090 + ${KAFKA_BROKER_ID})) - ## If external service type is LoadBalancer and distinct is true: - # "advertised.listeners": |- - # EXTERNAL://kafka-$((${KAFKA_BROKER_ID})).cluster.local:19092 - ## If external service type is LoadBalancer and distinct is false: - # "advertised.listeners": |- - # EXTERNAL://${LOAD_BALANCER_IP}:31090 - ## Uncomment to define the EXTERNAL Listener protocol - # "listener.security.protocol.map": |- - # PLAINTEXT:PLAINTEXT,EXTERNAL:PLAINTEXT - -## set extra ENVs -# key: "value" -envOverrides: {} - - -## A collection of additional ports to expose on brokers (formatted as normal containerPort yaml) -# Useful when the image exposes metrics (like prometheus, etc.) through a javaagent instead of a sidecar -additionalPorts: {} - -## Persistence configuration. Specify if and how to persist data to a persistent volume. -## -persistence: - enabled: false - - ## The size of the PersistentVolume to allocate to each Kafka Pod in the StatefulSet. For - ## production servers this number should likely be much larger. - ## - size: 1Gi - accessMode: ReadWriteOnce - ## The location within the Kafka container where the PV will mount its storage and Kafka will - ## store its logs. - ## - mountPath: "/opt/kafka/data" - - ## Kafka data Persistent Volume Storage Class - ## If defined, storageClassName: - ## If set to "-", storageClassName: "", which disables dynamic provisioning - ## If undefined (the default) or set to null, no storageClassName spec is - ## set, choosing the default provisioner. (gp2 on AWS, standard on - ## GKE, AWS & OpenStack) - ## - storageClass: "-" - -## Kafka Config job configuration -## -configJob: - ## Specify the number of retries before considering kafka-config job as failed. - ## https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/#pod-backoff-failure-policy - backoffLimit: 6 - -## Topic creation and configuration. -## The job will be run on a deployment only when the config has been changed. -## - If 'partitions' and 'replicationFactor' are specified we create the topic (with --if-not-exists.) -## - If 'partitions', 'replicationFactor' and 'reassignPartitions' are specified we reassign the partitions to -## increase the replication factor of an existing topic. -## - If 'partitions' is specified we 'alter' the number of partitions. This will -## silently and safely fail if the new setting isn’t strictly larger than the old (i.e. a NOOP.) Do be aware of the -## implications for keyed topics (ref: https://docs.confluent.io/current/kafka/post-deployment.html#admin-operations) -## - If 'defaultConfig' is specified it's deleted from the topic configuration. If it isn't present, -## it will silently and safely fail. -## - If 'config' is specified it's added to the topic configuration. -## -## Note: To increase the 'replicationFactor' of a topic, 'reassignPartitions' must be set to true (see above). -## -topics: - # - name: myExistingTopicConfig - # config: "cleanup.policy=compact,delete.retention.ms=604800000" - # - name: myExistingTopicReassignPartitions - # partitions: 8 - # replicationFactor: 5 - # reassignPartitions: true - - name: wlan_service_metrics - partitions: 1 - replicationFactor: 1 - - name: system_events - partitions: 1 - replicationFactor: 1 - - name: customer_events - partitions: 1 - replicationFactor: 1 - # - name: myNewTopicWithConfig - # partitions: 8 - # replicationFactor: 3 - # defaultConfig: "segment.bytes,segment.ms" - # config: "cleanup.policy=compact,delete.retention.ms=604800000" - # - name: myAclTopicPartitions - # partitions: 8 - # acls: - # - user: read - # operations: [ Read ] - # - user: read_and_write - # operations: - # - Read - # - Write - # - user: all - # operations: [ All ] - - ## Enable/disable the chart's tests. Useful if using this chart as a dependency of - ## another chart and you don't want these tests running when trying to develop and - ## test your own chart. -testsEnabled: true - -# ------------------------------------------------------------------------------ -# Zookeeper: -# ------------------------------------------------------------------------------ - -zookeeper: - ## If true, install the Zookeeper chart alongside Kafka - ## ref: https://github.com/kubernetes/charts/tree/master/incubator/zookeeper - enabled: false - - ## Configure Zookeeper resource requests and limits - ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ - resources: - limits: - cpu: 500m - memory: 1Gi - requests: - cpu: 50m - memory: 700Mi - - ## Environmental variables to set in Zookeeper - env: - ## The JVM heap size to allocate to Zookeeper - ZK_HEAP_SIZE: "1G" - - persistence: - enabled: false - ## The amount of PV storage allocated to each Zookeeper pod in the statefulset - # size: "2Gi" - - ## Specify a Zookeeper imagePullPolicy - ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images - image: - PullPolicy: "IfNotPresent" - - ## If the Zookeeper Chart is disabled a URL and port are required to connect - url: "zookeeper-headless" - port: 2181 - - ## Pod scheduling preferences (by default keep pods within a release on separate nodes). - ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity - ## By default we don't set affinity: - affinity: {} # Criteria by which pod label-values influence scheduling for zookeeper pods. - # podAntiAffinity: - # requiredDuringSchedulingIgnoredDuringExecution: - # - topologyKey: "kubernetes.io/hostname" - # labelSelector: - # matchLabels: - # release: zookeeper - -creds: - sslTruststorePassword: DUMMY_PASSWORD - sslKeystorePassword: DUMMY_PASSWORD - sslKeyPassword: DUMMY_PASSWORD - -kafka: - url: kafka-headless diff --git a/tip-wlan/charts/opensync-gw-cloud/resources/config/certs/httpClientConfig.json b/tip-wlan/charts/opensync-gw-cloud/resources/config/certs/httpClientConfig.json index 85dcf9b..fe052e5 100644 --- a/tip-wlan/charts/opensync-gw-cloud/resources/config/certs/httpClientConfig.json +++ b/tip-wlan/charts/opensync-gw-cloud/resources/config/certs/httpClientConfig.json @@ -1,18 +1,21 @@ { -"maxConnectionsTotal":100, -"maxConnectionsPerRoute":10, -"truststoreType":"JKS", -"truststoreProvider":"SUN", -"truststoreFile":"file:/opt/tip-wlan/certs/truststore.jks", -"truststorePass":"mypassword", -"keystoreType":"JKS", -"keystoreProvider":"SUN", -"keystoreFile":"file:/opt/tip-wlan/certs/client_keystore.jks", -"keystorePass":"mypassword", -"keyAlias":"clientkeyalias", -"credentialsList":[ - {"host":"localhost","port":-1,"user":"user","password":"password"} + "maxConnectionsTotal": 100, + "maxConnectionsPerRoute": 10, + "truststoreType": "JKS", + "truststoreProvider": "SUN", + "truststoreFile": "file:/opt/tip-wlan/certs/truststore.jks", + "truststorePass": "mypassword", + "keystoreType": "JKS", + "keystoreProvider": "SUN", + "keystoreFile": "file:/opt/tip-wlan/certs/client_keystore.jks", + "keystorePass": "mypassword", + "keyAlias": "clientkeyalias", + "credentialsList": [ + { + "host": "localhost", + "port": -1, + "user": "user", + "password": "password" + } ] - -} - +} \ No newline at end of file diff --git a/tip-wlan/charts/opensync-gw-static/resources/config/certs/httpClientConfig.json b/tip-wlan/charts/opensync-gw-static/resources/config/certs/httpClientConfig.json index 85dcf9b..fe052e5 100644 --- a/tip-wlan/charts/opensync-gw-static/resources/config/certs/httpClientConfig.json +++ b/tip-wlan/charts/opensync-gw-static/resources/config/certs/httpClientConfig.json @@ -1,18 +1,21 @@ { -"maxConnectionsTotal":100, -"maxConnectionsPerRoute":10, -"truststoreType":"JKS", -"truststoreProvider":"SUN", -"truststoreFile":"file:/opt/tip-wlan/certs/truststore.jks", -"truststorePass":"mypassword", -"keystoreType":"JKS", -"keystoreProvider":"SUN", -"keystoreFile":"file:/opt/tip-wlan/certs/client_keystore.jks", -"keystorePass":"mypassword", -"keyAlias":"clientkeyalias", -"credentialsList":[ - {"host":"localhost","port":-1,"user":"user","password":"password"} + "maxConnectionsTotal": 100, + "maxConnectionsPerRoute": 10, + "truststoreType": "JKS", + "truststoreProvider": "SUN", + "truststoreFile": "file:/opt/tip-wlan/certs/truststore.jks", + "truststorePass": "mypassword", + "keystoreType": "JKS", + "keystoreProvider": "SUN", + "keystoreFile": "file:/opt/tip-wlan/certs/client_keystore.jks", + "keystorePass": "mypassword", + "keyAlias": "clientkeyalias", + "credentialsList": [ + { + "host": "localhost", + "port": -1, + "user": "user", + "password": "password" + } ] - -} - +} \ No newline at end of file diff --git a/tip-wlan/charts/postgresql/.helmignore b/tip-wlan/charts/postgresql/.helmignore deleted file mode 100644 index f0c1319..0000000 --- a/tip-wlan/charts/postgresql/.helmignore +++ /dev/null @@ -1,21 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj diff --git a/tip-wlan/charts/postgresql/Chart.yaml b/tip-wlan/charts/postgresql/Chart.yaml deleted file mode 100644 index cc0c43b..0000000 --- a/tip-wlan/charts/postgresql/Chart.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v2 -name: postgresql -version: 8.9.6 -appVersion: 11.7.0 -description: Chart for PostgreSQL, an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance. -keywords: - - postgresql - - postgres - - database - - sql - - replication - - cluster -home: https://www.postgresql.org/ -icon: https://bitnami.com/assets/stacks/postgresql/img/postgresql-stack-110x117.png -sources: - - https://github.com/bitnami/bitnami-docker-postgresql -maintainers: - - name: Bitnami - email: containers@bitnami.com -engine: gotpl diff --git a/tip-wlan/charts/postgresql/README.md b/tip-wlan/charts/postgresql/README.md deleted file mode 100644 index 5f502b2..0000000 --- a/tip-wlan/charts/postgresql/README.md +++ /dev/null @@ -1,580 +0,0 @@ -# PostgreSQL - -[PostgreSQL](https://www.postgresql.org/) is an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance. - -For HA, please see [this repo](https://github.com/bitnami/charts/tree/master/bitnami/postgresql-ha) - -## TL;DR; - -```console -$ helm repo add bitnami https://charts.bitnami.com/bitnami -$ helm install my-release bitnami/postgresql -``` - -## Introduction - -This chart bootstraps a [PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. - -Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. This chart has been tested to work with NGINX Ingress, cert-manager, fluentd and Prometheus on top of the [BKPR](https://kubeprod.io/). - -## Prerequisites - -- Kubernetes 1.12+ -- Helm 2.11+ or Helm 3.0-beta3+ -- PV provisioner support in the underlying infrastructure - -## Installing the Chart -To install the chart with the release name `my-release`: - -```console -$ helm install my-release bitnami/postgresql -``` - -The command deploys PostgreSQL on the Kubernetes cluster in the default configuration. The [Parameters](#parameters) section lists the parameters that can be configured during installation. - -> **Tip**: List all releases using `helm list` - -## Uninstalling the Chart - -To uninstall/delete the `my-release` deployment: - -```console -$ helm delete my-release -``` - -The command removes all the Kubernetes components associated with the chart and deletes the release. - -## Parameters - -The following tables lists the configurable parameters of the PostgreSQL chart and their default values. - -| Parameter | Description | Default | -|-----------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------| -| `global.imageRegistry` | Global Docker Image registry | `nil` | -| `global.postgresql.postgresqlDatabase` | PostgreSQL database (overrides `postgresqlDatabase`) | `nil` | -| `global.postgresql.postgresqlUsername` | PostgreSQL username (overrides `postgresqlUsername`) | `nil` | -| `global.postgresql.existingSecret` | Name of existing secret to use for PostgreSQL passwords (overrides `existingSecret`) | `nil` | -| `global.postgresql.postgresqlPassword` | PostgreSQL admin password (overrides `postgresqlPassword`) | `nil` | -| `global.postgresql.servicePort` | PostgreSQL port (overrides `service.port`) | `nil` | -| `global.postgresql.replicationPassword` | Replication user password (overrides `replication.password`) | `nil` | -| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) | -| `global.storageClass` | Global storage class for dynamic provisioning | `nil` | -| `image.registry` | PostgreSQL Image registry | `docker.io` | -| `image.repository` | PostgreSQL Image name | `bitnami/postgresql` | -| `image.tag` | PostgreSQL Image tag | `{TAG_NAME}` | -| `image.pullPolicy` | PostgreSQL Image pull policy | `IfNotPresent` | -| `image.pullSecrets` | Specify Image pull secrets | `nil` (does not add image pull secrets to deployed pods) | -| `image.debug` | Specify if debug values should be set | `false` | -| `nameOverride` | String to partially override common.fullname template with a string (will prepend the release name) | `nil` | -| `fullnameOverride` | String to fully override common.fullname template with a string | `nil` | -| `volumePermissions.enabled` | Enable init container that changes volume permissions in the data directory (for cases where the default k8s `runAsUser` and `fsUser` values do not work) | `false` | -| `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | -| `volumePermissions.image.repository` | Init container volume-permissions image name | `bitnami/minideb` | -| `volumePermissions.image.tag` | Init container volume-permissions image tag | `buster` | -| `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `Always` | -| `volumePermissions.securityContext.runAsUser` | User ID for the init container (when facing issues in OpenShift or uid unknown, try value "auto") | `0` | -| `usePasswordFile` | Have the secrets mounted as a file instead of env vars | `false` | -| `ldap.enabled` | Enable LDAP support | `false` | -| `ldap.existingSecret` | Name of existing secret to use for LDAP passwords | `nil` | -| `ldap.url` | LDAP URL beginning in the form `ldap[s]://host[:port]/basedn[?[attribute][?[scope][?[filter]]]]` | `nil` | -| `ldap.server` | IP address or name of the LDAP server. | `nil` | -| `ldap.port` | Port number on the LDAP server to connect to | `nil` | -| `ldap.scheme` | Set to `ldaps` to use LDAPS. | `nil` | -| `ldap.tls` | Set to `1` to use TLS encryption | `nil` | -| `ldap.prefix` | String to prepend to the user name when forming the DN to bind | `nil` | -| `ldap.suffix` | String to append to the user name when forming the DN to bind | `nil` | -| `ldap.search_attr` | Attribute to match agains the user name in the search | `nil` | -| `ldap.search_filter` | The search filter to use when doing search+bind authentication | `nil` | -| `ldap.baseDN` | Root DN to begin the search for the user in | `nil` | -| `ldap.bindDN` | DN of user to bind to LDAP | `nil` | -| `ldap.bind_password` | Password for the user to bind to LDAP | `nil` | -| `replication.enabled` | Enable replication | `false` | -| `replication.user` | Replication user | `repl_user` | -| `replication.password` | Replication user password | `repl_password` | -| `replication.slaveReplicas` | Number of slaves replicas | `1` | -| `replication.synchronousCommit` | Set synchronous commit mode. Allowed values: `on`, `remote_apply`, `remote_write`, `local` and `off` | `off` | -| `replication.numSynchronousReplicas` | Number of replicas that will have synchronous replication. Note: Cannot be greater than `replication.slaveReplicas`. | `0` | -| `replication.applicationName` | Cluster application name. Useful for advanced replication settings | `my_application` | -| `existingSecret` | Name of existing secret to use for PostgreSQL passwords. The secret has to contain the keys `postgresql-postgres-password` which is the password for `postgresqlUsername` when it is different of `postgres`, `postgresql-password` which will override `postgresqlPassword`, `postgresql-replication-password` which will override `replication.password` and `postgresql-ldap-password` which will be sed to authenticate on LDAP. The value is evaluated as a template. | `nil` | -| `postgresqlPostgresPassword` | PostgreSQL admin password (used when `postgresqlUsername` is not `postgres`) | _random 10 character alphanumeric string_ | -| `postgresqlUsername` | PostgreSQL admin user | `postgres` | -| `postgresqlPassword` | PostgreSQL admin password | _random 10 character alphanumeric string_ | -| `postgresqlDatabase` | PostgreSQL database | `nil` | -| `postgresqlDataDir` | PostgreSQL data dir folder | `/bitnami/postgresql` (same value as persistence.mountPath) | -| `extraEnv` | Any extra environment variables you would like to pass on to the pod. The value is evaluated as a template. | `[]` | -| `extraEnvVarsCM` | Name of a Config Map containing extra environment variables you would like to pass on to the pod. The value is evaluated as a template. | `nil` | -| `postgresqlInitdbArgs` | PostgreSQL initdb extra arguments | `nil` | -| `postgresqlInitdbWalDir` | PostgreSQL location for transaction log | `nil` | -| `postgresqlConfiguration` | Runtime Config Parameters | `nil` | -| `postgresqlExtendedConf` | Extended Runtime Config Parameters (appended to main or default configuration) | `nil` | -| `pgHbaConfiguration` | Content of pg_hba.conf | `nil (do not create pg_hba.conf)` | -| `configurationConfigMap` | ConfigMap with the PostgreSQL configuration files (Note: Overrides `postgresqlConfiguration` and `pgHbaConfiguration`). The value is evaluated as a template. | `nil` | -| `extendedConfConfigMap` | ConfigMap with the extended PostgreSQL configuration files. The value is evaluated as a template. | `nil` | -| `initdbScripts` | Dictionary of initdb scripts | `nil` | -| `initdbUser` | PostgreSQL user to execute the .sql and sql.gz scripts | `nil` | -| `initdbPassword` | Password for the user specified in `initdbUser` | `nil` | -| `initdbScriptsConfigMap` | ConfigMap with the initdb scripts (Note: Overrides `initdbScripts`). The value is evaluated as a template. | `nil` | -| `initdbScriptsSecret` | Secret with initdb scripts that contain sensitive information (Note: can be used with `initdbScriptsConfigMap` or `initdbScripts`). The value is evaluated as a template. | `nil` | -| `service.type` | Kubernetes Service type | `ClusterIP` | -| `service.port` | PostgreSQL port | `5432` | -| `service.nodePort` | Kubernetes Service nodePort | `nil` | -| `service.annotations` | Annotations for PostgreSQL service | `{}` (evaluated as a template) | -| `service.loadBalancerIP` | loadBalancerIP if service type is `LoadBalancer` | `nil` | -| `service.loadBalancerSourceRanges` | Address that are allowed when svc is LoadBalancer | `[]` (evaluated as a template) | -| `schedulerName` | Name of the k8s scheduler (other than default) | `nil` | -| `shmVolume.enabled` | Enable emptyDir volume for /dev/shm for master and slave(s) Pod(s) | `true` | -| `shmVolume.chmod.enabled` | Run at init chmod 777 of the /dev/shm (ignored if `volumePermissions.enabled` is `false`) | `true` | -| `persistence.enabled` | Enable persistence using PVC | `true` | -| `persistence.existingClaim` | Provide an existing `PersistentVolumeClaim`, the value is evaluated as a template. | `nil` | -| `persistence.mountPath` | Path to mount the volume at | `/bitnami/postgresql` | -| `persistence.subPath` | Subdirectory of the volume to mount at | `""` | -| `persistence.storageClass` | PVC Storage Class for PostgreSQL volume | `nil` | -| `persistence.accessModes` | PVC Access Mode for PostgreSQL volume | `[ReadWriteOnce]` | -| `persistence.size` | PVC Storage Request for PostgreSQL volume | `8Gi` | -| `persistence.annotations` | Annotations for the PVC | `{}` | -| `commonAnnotations` | Annotations to be added to all deployed resources (rendered as a template) | `{}` | -| `master.nodeSelector` | Node labels for pod assignment (postgresql master) | `{}` | -| `master.affinity` | Affinity labels for pod assignment (postgresql master) | `{}` | -| `master.tolerations` | Toleration labels for pod assignment (postgresql master) | `[]` | -| `master.anotations` | Map of annotations to add to the statefulset (postgresql master) | `{}` | -| `master.labels` | Map of labels to add to the statefulset (postgresql master) | `{}` | -| `master.podAnnotations` | Map of annotations to add to the pods (postgresql master) | `{}` | -| `master.podLabels` | Map of labels to add to the pods (postgresql master) | `{}` | -| `master.priorityClassName` | Priority Class to use for each pod (postgresql master) | `nil` | -| `master.extraInitContainers` | Additional init containers to add to the pods (postgresql master) | `[]` | -| `master.extraVolumeMounts` | Additional volume mounts to add to the pods (postgresql master) | `[]` | -| `master.extraVolumes` | Additional volumes to add to the pods (postgresql master) | `[]` | -| `master.sidecars` | Add additional containers to the pod | `[]` | -| `master.service.type` | Allows using a different service type for Master | `nil` | -| `master.service.nodePort` | Allows using a different nodePort for Master | `nil` | -| `master.service.clusterIP` | Allows using a different clusterIP for Master | `nil` | -| `slave.nodeSelector` | Node labels for pod assignment (postgresql slave) | `{}` | -| `slave.affinity` | Affinity labels for pod assignment (postgresql slave) | `{}` | -| `slave.tolerations` | Toleration labels for pod assignment (postgresql slave) | `[]` | -| `slave.anotations` | Map of annotations to add to the statefulsets (postgresql slave) | `{}` | -| `slave.labels` | Map of labels to add to the statefulsets (postgresql slave) | `{}` | -| `slave.podAnnotations` | Map of annotations to add to the pods (postgresql slave) | `{}` | -| `slave.podLabels` | Map of labels to add to the pods (postgresql slave) | `{}` | -| `slave.priorityClassName` | Priority Class to use for each pod (postgresql slave) | `nil` | -| `slave.extraInitContainers` | Additional init containers to add to the pods (postgresql slave) | `[]` | -| `slave.extraVolumeMounts` | Additional volume mounts to add to the pods (postgresql slave) | `[]` | -| `slave.extraVolumes` | Additional volumes to add to the pods (postgresql slave) | `[]` | -| `slave.sidecars` | Add additional containers to the pod | `[]` | -| `slave.service.type` | Allows using a different service type for Slave | `nil` | -| `slave.service.nodePort` | Allows using a different nodePort for Slave | `nil` | -| `slave.service.clusterIP` | Allows using a different clusterIP for Slave | `nil` | -| `terminationGracePeriodSeconds` | Seconds the pod needs to terminate gracefully | `nil` | -| `resources` | CPU/Memory resource requests/limits | Memory: `256Mi`, CPU: `250m` | -| `securityContext.enabled` | Enable security context | `true` | -| `securityContext.fsGroup` | Group ID for the container | `1001` | -| `securityContext.runAsUser` | User ID for the container | `1001` | -| `serviceAccount.enabled` | Enable service account (Note: Service Account will only be automatically created if `serviceAccount.name` is not set) | `false` | -| `serviceAcccount.name` | Name of existing service account | `nil` | -| `livenessProbe.enabled` | Would you like a livenessProbe to be enabled | `true` | -| `networkPolicy.enabled` | Enable NetworkPolicy | `false` | -| `networkPolicy.allowExternal` | Don't require client label for connections | `true` | -| `networkPolicy.explicitNamespacesSelector` | A Kubernetes LabelSelector to explicitly select namespaces from which ingress traffic could be allowed | `{}` | -| `livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated | 30 | -| `livenessProbe.periodSeconds` | How often to perform the probe | 10 | -| `livenessProbe.timeoutSeconds` | When the probe times out | 5 | -| `livenessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | 6 | -| `livenessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed | 1 | -| `readinessProbe.enabled` | would you like a readinessProbe to be enabled | `true` | -| `readinessProbe.initialDelaySeconds` | Delay before readiness probe is initiated | 5 | -| `readinessProbe.periodSeconds` | How often to perform the probe | 10 | -| `readinessProbe.timeoutSeconds` | When the probe times out | 5 | -| `readinessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | 6 | -| `readinessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed | 1 | -| `metrics.enabled` | Start a prometheus exporter | `false` | -| `metrics.service.type` | Kubernetes Service type | `ClusterIP` | -| `service.clusterIP` | Static clusterIP or None for headless services | `nil` | -| `metrics.service.annotations` | Additional annotations for metrics exporter pod | `{ prometheus.io/scrape: "true", prometheus.io/port: "9187"}` | -| `metrics.service.loadBalancerIP` | loadBalancerIP if redis metrics service type is `LoadBalancer` | `nil` | -| `metrics.serviceMonitor.enabled` | Set this to `true` to create ServiceMonitor for Prometheus operator | `false` | -| `metrics.serviceMonitor.additionalLabels` | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus | `{}` | -| `metrics.serviceMonitor.namespace` | Optional namespace in which to create ServiceMonitor | `nil` | -| `metrics.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used | `nil` | -| `metrics.serviceMonitor.scrapeTimeout` | Scrape timeout. If not set, the Prometheus default scrape timeout is used | `nil` | -| `metrics.prometheusRule.enabled` | Set this to true to create prometheusRules for Prometheus operator | `false` | -| `metrics.prometheusRule.additionalLabels` | Additional labels that can be used so prometheusRules will be discovered by Prometheus | `{}` | -| `metrics.prometheusRule.namespace` | namespace where prometheusRules resource should be created | the same namespace as postgresql | -| `metrics.prometheusRule.rules` | [rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) to be created, check values for an example. | `[]` | -| `metrics.image.registry` | PostgreSQL Exporter Image registry | `docker.io` | -| `metrics.image.repository` | PostgreSQL Exporter Image name | `bitnami/postgres-exporter` | -| `metrics.image.tag` | PostgreSQL Exporter Image tag | `{TAG_NAME}` | -| `metrics.image.pullPolicy` | PostgreSQL Exporter Image pull policy | `IfNotPresent` | -| `metrics.image.pullSecrets` | Specify Image pull secrets | `nil` (does not add image pull secrets to deployed pods) | -| `metrics.customMetrics` | Additional custom metrics | `nil` | -| `metrics.securityContext.enabled` | Enable security context for metrics | `false` | -| `metrics.securityContext.runAsUser` | User ID for the container for metrics | `1001` | -| `metrics.livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated | 30 | -| `metrics.livenessProbe.periodSeconds` | How often to perform the probe | 10 | -| `metrics.livenessProbe.timeoutSeconds` | When the probe times out | 5 | -| `metrics.livenessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | 6 | -| `metrics.livenessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed | 1 | -| `metrics.readinessProbe.enabled` | would you like a readinessProbe to be enabled | `true` | -| `metrics.readinessProbe.initialDelaySeconds` | Delay before liveness probe is initiated | 5 | -| `metrics.readinessProbe.periodSeconds` | How often to perform the probe | 10 | -| `metrics.readinessProbe.timeoutSeconds` | When the probe times out | 5 | -| `metrics.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | 6 | -| `metrics.readinessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed | 1 | -| `updateStrategy` | Update strategy policy | `{type: "RollingUpdate"}` | -| `psp.create` | Create Pod Security Policy | `false` | -| `rbac.create` | Create Role and RoleBinding (required for PSP to work) | `false` | - - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, - -```console -$ helm install my-release \ - --set postgresqlPassword=secretpassword,postgresqlDatabase=my-database \ - bitnami/postgresql -``` - -The above command sets the PostgreSQL `postgres` account password to `secretpassword`. Additionally it creates a database named `my-database`. - -Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, - -```console -$ helm install my-release -f values.yaml bitnami/postgresql -``` - -> **Tip**: You can use the default [values.yaml](values.yaml) - -## Configuration and installation details - -### [Rolling VS Immutable tags](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/) - -It is strongly recommended to use immutable tags in a production environment. This ensures your deployment does not change automatically if the same tag is updated with a different image. - -Bitnami will release a new chart updating its containers if a new version of the main container, significant changes, or critical vulnerabilities exist. - -### Production configuration and horizontal scaling - -This chart includes a `values-production.yaml` file where you can find some parameters oriented to production configuration in comparison to the regular `values.yaml`. You can use this file instead of the default one. - -- Enable replication: -```diff -- replication.enabled: false -+ replication.enabled: true -``` - -- Number of slaves replicas: -```diff -- replication.slaveReplicas: 1 -+ replication.slaveReplicas: 2 -``` - -- Set synchronous commit mode: -```diff -- replication.synchronousCommit: "off" -+ replication.synchronousCommit: "on" -``` - -- Number of replicas that will have synchronous replication: -```diff -- replication.numSynchronousReplicas: 0 -+ replication.numSynchronousReplicas: 1 -``` - -- Start a prometheus exporter: -```diff -- metrics.enabled: false -+ metrics.enabled: true -``` - -To horizontally scale this chart, you can use the `--replicas` flag to modify the number of nodes in your PostgreSQL deployment. Also you can use the `values-production.yaml` file or modify the parameters shown above. - -### Customizing Master and Slave services in a replicated configuration - -At the top level, there is a service object which defines the services for both master and slave. For deeper customization, there are service objects for both the master and slave types individually. This allows you to override the values in the top level service object so that the master and slave can be of different service types and with different clusterIPs / nodePorts. Also in the case you want the master and slave to be of type nodePort, you will need to set the nodePorts to different values to prevent a collision. The values that are deeper in the master.service or slave.service objects will take precedence over the top level service object. - -### Change PostgreSQL version - -To modify the PostgreSQL version used in this chart you can specify a [valid image tag](https://hub.docker.com/r/bitnami/postgresql/tags/) using the `image.tag` parameter. For example, `image.tag=12.0.0` - -### postgresql.conf / pg_hba.conf files as configMap - -This helm chart also supports to customize the whole configuration file. - -Add your custom file to "files/postgresql.conf" in your working directory. This file will be mounted as configMap to the containers and it will be used for configuring the PostgreSQL server. - -Alternatively, you can specify PostgreSQL configuration parameters using the `postgresqlConfiguration` parameter as a dict, using camelCase, e.g. {"sharedBuffers": "500MB"}. - -In addition to these options, you can also set an external ConfigMap with all the configuration files. This is done by setting the `configurationConfigMap` parameter. Note that this will override the two previous options. - -### Allow settings to be loaded from files other than the default `postgresql.conf` - -If you don't want to provide the whole PostgreSQL configuration file and only specify certain parameters, you can add your extended `.conf` files to "files/conf.d/" in your working directory. -Those files will be mounted as configMap to the containers adding/overwriting the default configuration using the `include_dir` directive that allows settings to be loaded from files other than the default `postgresql.conf`. - -Alternatively, you can also set an external ConfigMap with all the extra configuration files. This is done by setting the `extendedConfConfigMap` parameter. Note that this will override the previous option. - -### Initialize a fresh instance - -The [Bitnami PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) image allows you to use your custom scripts to initialize a fresh instance. In order to execute the scripts, they must be located inside the chart folder `files/docker-entrypoint-initdb.d` so they can be consumed as a ConfigMap. - -Alternatively, you can specify custom scripts using the `initdbScripts` parameter as dict. - -In addition to these options, you can also set an external ConfigMap with all the initialization scripts. This is done by setting the `initdbScriptsConfigMap` parameter. Note that this will override the two previous options. If your initialization scripts contain sensitive information such as credentials or passwords, you can use the `initdbScriptsSecret` parameter. - -The allowed extensions are `.sh`, `.sql` and `.sql.gz`. - -### Sidecars - -If you need additional containers to run within the same pod as PostgreSQL (e.g. an additional metrics or logging exporter), you can do so via the `sidecars` config parameter. Simply define your container according to the Kubernetes container spec. - -```yaml -# For the PostgreSQL master -master: - sidecars: - - name: your-image-name - image: your-image - imagePullPolicy: Always - ports: - - name: portname - containerPort: 1234 -# For the PostgreSQL replicas -slave: - sidecars: - - name: your-image-name - image: your-image - imagePullPolicy: Always - ports: - - name: portname - containerPort: 1234 -``` - -### Metrics - -The chart optionally can start a metrics exporter for [prometheus](https://prometheus.io). The metrics endpoint (port 9187) is not exposed and it is expected that the metrics are collected from inside the k8s cluster using something similar as the described in the [example Prometheus scrape configuration](https://github.com/prometheus/prometheus/blob/master/documentation/examples/prometheus-kubernetes.yml). - -The exporter allows to create custom metrics from additional SQL queries. See the Chart's `values.yaml` for an example and consult the [exporters documentation](https://github.com/wrouesnel/postgres_exporter#adding-new-metrics-via-a-config-file) for more details. - -### Use of global variables - -In more complex scenarios, we may have the following tree of dependencies - -``` - +--------------+ - | | - +------------+ Chart 1 +-----------+ - | | | | - | --------+------+ | - | | | - | | | - | | | - | | | - v v v -+-------+------+ +--------+------+ +--------+------+ -| | | | | | -| PostgreSQL | | Sub-chart 1 | | Sub-chart 2 | -| | | | | | -+--------------+ +---------------+ +---------------+ -``` - -The three charts below depend on the parent chart Chart 1. However, subcharts 1 and 2 may need to connect to PostgreSQL as well. In order to do so, subcharts 1 and 2 need to know the PostgreSQL credentials, so one option for deploying could be deploy Chart 1 with the following parameters: - -``` -postgresql.postgresqlPassword=testtest -subchart1.postgresql.postgresqlPassword=testtest -subchart2.postgresql.postgresqlPassword=testtest -postgresql.postgresqlDatabase=db1 -subchart1.postgresql.postgresqlDatabase=db1 -subchart2.postgresql.postgresqlDatabase=db1 -``` - -If the number of dependent sub-charts increases, installing the chart with parameters can become increasingly difficult. An alternative would be to set the credentials using global variables as follows: - -``` -global.postgresql.postgresqlPassword=testtest -global.postgresql.postgresqlDatabase=db1 -``` - -This way, the credentials will be available in all of the subcharts. - -## Persistence - -The [Bitnami PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) image stores the PostgreSQL data and configurations at the `/bitnami/postgresql` path of the container. - -Persistent Volume Claims are used to keep the data across deployments. This is known to work in GCE, AWS, and minikube. -See the [Parameters](#parameters) section to configure the PVC or to disable persistence. - -If you already have data in it, you will fail to sync to standby nodes for all commits, details can refer to [code](https://github.com/bitnami/bitnami-docker-postgresql/blob/8725fe1d7d30ebe8d9a16e9175d05f7ad9260c93/9.6/debian-9/rootfs/libpostgresql.sh#L518-L556). If you need to use those data, please covert them to sql and import after `helm install` finished. - -## NetworkPolicy - -To enable network policy for PostgreSQL, install [a networking plugin that implements the Kubernetes NetworkPolicy spec](https://kubernetes.io/docs/tasks/administer-cluster/declare-network-policy#before-you-begin), and set `networkPolicy.enabled` to `true`. - -For Kubernetes v1.5 & v1.6, you must also turn on NetworkPolicy by setting the DefaultDeny namespace annotation. Note: this will enforce policy for _all_ pods in the namespace: - -```console -$ kubectl annotate namespace default "net.beta.kubernetes.io/network-policy={\"ingress\":{\"isolation\":\"DefaultDeny\"}}" -``` - -With NetworkPolicy enabled, traffic will be limited to just port 5432. - -For more precise policy, set `networkPolicy.allowExternal=false`. This will only allow pods with the generated client label to connect to PostgreSQL. -This label will be displayed in the output of a successful install. - -## Differences between Bitnami PostgreSQL image and [Docker Official](https://hub.docker.com/_/postgres) image - -- The Docker Official PostgreSQL image does not support replication. If you pass any replication environment variable, this would be ignored. The only environment variables supported by the Docker Official image are POSTGRES_USER, POSTGRES_DB, POSTGRES_PASSWORD, POSTGRES_INITDB_ARGS, POSTGRES_INITDB_WALDIR and PGDATA. All the remaining environment variables are specific to the Bitnami PostgreSQL image. -- The Bitnami PostgreSQL image is non-root by default. This requires that you run the pod with `securityContext` and updates the permissions of the volume with an `initContainer`. A key benefit of this configuration is that the pod follows security best practices and is prepared to run on Kubernetes distributions with hard security constraints like OpenShift. -- For OpenShift, one may either define the runAsUser and fsGroup accordingly, or try this more dynamic option: volumePermissions.securityContext.runAsUser="auto",securityContext.enabled=false,shmVolume.chmod.enabled=false - -### Deploy chart using Docker Official PostgreSQL Image - -From chart version 4.0.0, it is possible to use this chart with the Docker Official PostgreSQL image. -Besides specifying the new Docker repository and tag, it is important to modify the PostgreSQL data directory and volume mount point. Basically, the PostgreSQL data dir cannot be the mount point directly, it has to be a subdirectory. - -``` -image.repository=postgres -image.tag=10.6 -postgresqlDataDir=/data/pgdata -persistence.mountPath=/data/ -``` - -## Upgrade - -It's necessary to specify the existing passwords while performing an upgrade to ensure the secrets are not updated with invalid randomly generated passwords. Remember to specify the existing values of the `postgresqlPassword` and `replication.password` parameters when upgrading the chart: - -```bash -$ helm upgrade my-release stable/postgresql \ - --set postgresqlPassword=[POSTGRESQL_PASSWORD] \ - --set replication.password=[REPLICATION_PASSWORD] -``` - -> Note: you need to substitute the placeholders _[POSTGRESQL_PASSWORD]_, and _[REPLICATION_PASSWORD]_ with the values obtained from instructions in the installation notes. - -## 8.0.0 - -Prefixes the port names with their protocols to comply with Istio conventions. - -If you depend on the port names in your setup, make sure to update them to reflect this change. - -## 7.1.0 - -Adds support for LDAP configuration. - -## 7.0.0 - -Helm performs a lookup for the object based on its group (apps), version (v1), and kind (Deployment). Also known as its GroupVersionKind, or GVK. Changing the GVK is considered a compatibility breaker from Kubernetes' point of view, so you cannot "upgrade" those objects to the new GVK in-place. Earlier versions of Helm 3 did not perform the lookup correctly which has since been fixed to match the spec. - -In https://github.com/helm/charts/pull/17281 the `apiVersion` of the statefulset resources was updated to `apps/v1` in tune with the api's deprecated, resulting in compatibility breakage. - -This major version bump signifies this change. - -## 6.5.7 - -In this version, the chart will use PostgreSQL with the Postgis extension included. The version used with Postgresql version 10, 11 and 12 is Postgis 2.5. It has been compiled with the following dependencies: - -- protobuf -- protobuf-c -- json-c -- geos -- proj - -## 5.0.0 - -In this version, the **chart is using PostgreSQL 11 instead of PostgreSQL 10**. You can find the main difference and notable changes in the following links: [https://www.postgresql.org/about/news/1894/](https://www.postgresql.org/about/news/1894/) and [https://www.postgresql.org/about/featurematrix/](https://www.postgresql.org/about/featurematrix/). - -For major releases of PostgreSQL, the internal data storage format is subject to change, thus complicating upgrades, you can see some errors like the following one in the logs: - -```console -Welcome to the Bitnami postgresql container -Subscribe to project updates by watching https://github.com/bitnami/bitnami-docker-postgresql -Submit issues and feature requests at https://github.com/bitnami/bitnami-docker-postgresql/issues -Send us your feedback at containers@bitnami.com - -INFO ==> ** Starting PostgreSQL setup ** -NFO ==> Validating settings in POSTGRESQL_* env vars.. -INFO ==> Initializing PostgreSQL database... -INFO ==> postgresql.conf file not detected. Generating it... -INFO ==> pg_hba.conf file not detected. Generating it... -INFO ==> Deploying PostgreSQL with persisted data... -INFO ==> Configuring replication parameters -INFO ==> Loading custom scripts... -INFO ==> Enabling remote connections -INFO ==> Stopping PostgreSQL... -INFO ==> ** PostgreSQL setup finished! ** - -INFO ==> ** Starting PostgreSQL ** - [1] FATAL: database files are incompatible with server - [1] DETAIL: The data directory was initialized by PostgreSQL version 10, which is not compatible with this version 11.3. -``` - -In this case, you should migrate the data from the old chart to the new one following an approach similar to that described in [this section](https://www.postgresql.org/docs/current/upgrading.html#UPGRADING-VIA-PGDUMPALL) from the official documentation. Basically, create a database dump in the old chart, move and restore it in the new one. - -### 4.0.0 - -This chart will use by default the Bitnami PostgreSQL container starting from version `10.7.0-r68`. This version moves the initialization logic from node.js to bash. This new version of the chart requires setting the `POSTGRES_PASSWORD` in the slaves as well, in order to properly configure the `pg_hba.conf` file. Users from previous versions of the chart are advised to upgrade immediately. - -IMPORTANT: If you do not want to upgrade the chart version then make sure you use the `10.7.0-r68` version of the container. Otherwise, you will get this error - -``` -The POSTGRESQL_PASSWORD environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow the container to be started with blank passwords. This is recommended only for development -``` - -### 3.0.0 - -This releases make it possible to specify different nodeSelector, affinity and tolerations for master and slave pods. -It also fixes an issue with `postgresql.master.fullname` helper template not obeying fullnameOverride. - -#### Breaking changes - -- `affinty` has been renamed to `master.affinity` and `slave.affinity`. -- `tolerations` has been renamed to `master.tolerations` and `slave.tolerations`. -- `nodeSelector` has been renamed to `master.nodeSelector` and `slave.nodeSelector`. - -### 2.0.0 - -In order to upgrade from the `0.X.X` branch to `1.X.X`, you should follow the below steps: - - - Obtain the service name (`SERVICE_NAME`) and password (`OLD_PASSWORD`) of the existing postgresql chart. You can find the instructions to obtain the password in the NOTES.txt, the service name can be obtained by running - -```console -$ kubectl get svc -``` - -- Install (not upgrade) the new version - -```console -$ helm repo update -$ helm install my-release bitnami/postgresql -``` - -- Connect to the new pod (you can obtain the name by running `kubectl get pods`): - -```console -$ kubectl exec -it NAME bash -``` - -- Once logged in, create a dump file from the previous database using `pg_dump`, for that we should connect to the previous postgresql chart: - -```console -$ pg_dump -h SERVICE_NAME -U postgres DATABASE_NAME > /tmp/backup.sql -``` - -After run above command you should be prompted for a password, this password is the previous chart password (`OLD_PASSWORD`). -This operation could take some time depending on the database size. - -- Once you have the backup file, you can restore it with a command like the one below: - -```console -$ psql -U postgres DATABASE_NAME < /tmp/backup.sql -``` - -In this case, you are accessing to the local postgresql, so the password should be the new one (you can find it in NOTES.txt). - -If you want to restore the database and the database schema does not exist, it is necessary to first follow the steps described below. - -```console -$ psql -U postgres -postgres=# drop database DATABASE_NAME; -postgres=# create database DATABASE_NAME; -postgres=# create user USER_NAME; -postgres=# alter role USER_NAME with password 'BITNAMI_USER_PASSWORD'; -postgres=# grant all privileges on database DATABASE_NAME to USER_NAME; -postgres=# alter database DATABASE_NAME owner to USER_NAME; -``` diff --git a/tip-wlan/charts/postgresql/ci/commonAnnotations.yaml b/tip-wlan/charts/postgresql/ci/commonAnnotations.yaml deleted file mode 100644 index a936299..0000000 --- a/tip-wlan/charts/postgresql/ci/commonAnnotations.yaml +++ /dev/null @@ -1,4 +0,0 @@ -commonAnnotations: - helm.sh/hook: "pre-install, pre-upgrade" - helm.sh/hook-weight: "-1" - diff --git a/tip-wlan/charts/postgresql/ci/shmvolume-disabled-values.yaml b/tip-wlan/charts/postgresql/ci/shmvolume-disabled-values.yaml deleted file mode 100644 index 347d3b4..0000000 --- a/tip-wlan/charts/postgresql/ci/shmvolume-disabled-values.yaml +++ /dev/null @@ -1,2 +0,0 @@ -shmVolume: - enabled: false diff --git a/tip-wlan/charts/postgresql/files/README.md b/tip-wlan/charts/postgresql/files/README.md deleted file mode 100644 index 1813a2f..0000000 --- a/tip-wlan/charts/postgresql/files/README.md +++ /dev/null @@ -1 +0,0 @@ -Copy here your postgresql.conf and/or pg_hba.conf files to use it as a config map. diff --git a/tip-wlan/charts/postgresql/files/conf.d/README.md b/tip-wlan/charts/postgresql/files/conf.d/README.md deleted file mode 100644 index 184c187..0000000 --- a/tip-wlan/charts/postgresql/files/conf.d/README.md +++ /dev/null @@ -1,4 +0,0 @@ -If you don't want to provide the whole configuration file and only specify certain parameters, you can copy here your extended `.conf` files. -These files will be injected as a config maps and add/overwrite the default configuration using the `include_dir` directive that allows settings to be loaded from files other than the default `postgresql.conf`. - -More info in the [bitnami-docker-postgresql README](https://github.com/bitnami/bitnami-docker-postgresql#configuration-file). diff --git a/tip-wlan/charts/postgresql/files/docker-entrypoint-initdb.d/README.md b/tip-wlan/charts/postgresql/files/docker-entrypoint-initdb.d/README.md deleted file mode 100644 index cba3809..0000000 --- a/tip-wlan/charts/postgresql/files/docker-entrypoint-initdb.d/README.md +++ /dev/null @@ -1,3 +0,0 @@ -You can copy here your custom `.sh`, `.sql` or `.sql.gz` file so they are executed during the first boot of the image. - -More info in the [bitnami-docker-postgresql](https://github.com/bitnami/bitnami-docker-postgresql#initializing-a-new-instance) repository. \ No newline at end of file diff --git a/tip-wlan/charts/postgresql/files/pg_hba.conf b/tip-wlan/charts/postgresql/files/pg_hba.conf deleted file mode 100644 index 0c40e83..0000000 --- a/tip-wlan/charts/postgresql/files/pg_hba.conf +++ /dev/null @@ -1,4 +0,0 @@ -hostssl replication repl_user 0.0.0.0/0 md5 clientcert=1 -hostssl postgres postgres 0.0.0.0/0 cert clientcert=1 -hostssl postgres postgres ::/0 cert clientcert=1 -hostssl all all 0.0.0.0/0 md5 clientcert=1 \ No newline at end of file diff --git a/tip-wlan/charts/postgresql/resources/config/certs/README.md b/tip-wlan/charts/postgresql/resources/config/certs/README.md deleted file mode 100644 index e0cedbb..0000000 --- a/tip-wlan/charts/postgresql/resources/config/certs/README.md +++ /dev/null @@ -1,2 +0,0 @@ -Contains certs needed for this service to start. -Please refer to page: https://telecominfraproject.atlassian.net/wiki/spaces/WIFI/pages/262176803/Pre-requisites+before+deploying+Tip-Wlan+solution \ No newline at end of file diff --git a/tip-wlan/charts/postgresql/templates/NOTES.txt b/tip-wlan/charts/postgresql/templates/NOTES.txt deleted file mode 100644 index ca92d30..0000000 --- a/tip-wlan/charts/postgresql/templates/NOTES.txt +++ /dev/null @@ -1,60 +0,0 @@ -** Please be patient while the chart is being deployed ** - -PostgreSQL can be accessed via port {{ template "postgresql.port" . }} on the following DNS name from within your cluster: - - {{ template "common.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local - Read/Write connection -{{- if .Values.replication.enabled }} - {{ template "common.fullname" . }}-read.{{ .Release.Namespace }}.svc.cluster.local - Read only connection -{{- end }} - -{{- if and .Values.postgresqlPostgresPassword (not (eq .Values.postgresqlUsername "postgres")) }} - -To get the password for "postgres" run: - - export POSTGRES_ADMIN_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "postgresql.secretName" . }} -o jsonpath="{.data.postgresql-postgres-password}" | base64 --decode) -{{- end }} - -To get the password for "{{ template "postgresql.username" . }}" run: - - export POSTGRES_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "postgresql.secretName" . }} -o jsonpath="{.data.postgresql-password}" | base64 --decode) - -To connect to your database run the following command: - - kubectl run {{ template "common.fullname" . }}-client --rm --tty -i --restart='Never' --namespace {{ .Release.Namespace }} --image {{ template "postgresql.image" . }} --env="PGPASSWORD=$POSTGRES_PASSWORD" {{- if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }} - --labels="{{ template "common.fullname" . }}-client=true" {{- end }} --command -- psql --host {{ template "common.fullname" . }} -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }} -p {{ template "postgresql.port" . }} - -{{ if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }} -Note: Since NetworkPolicy is enabled, only pods with label {{ template "common.fullname" . }}-client=true" will be able to connect to this PostgreSQL cluster. -{{- end }} - -To connect to your database from outside the cluster execute the following commands: - -{{- if contains "NodePort" .Values.service.type }} - - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "common.fullname" . }}) - {{ if (include "postgresql.password" . ) }}PGPASSWORD="$POSTGRES_PASSWORD" {{ end }}psql --host $NODE_IP --port $NODE_PORT -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }} - -{{- else if contains "LoadBalancer" .Values.service.type }} - - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "common.fullname" . }}' - - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "common.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - {{ if (include "postgresql.password" . ) }}PGPASSWORD="$POSTGRES_PASSWORD" {{ end }}psql --host $SERVICE_IP --port {{ template "postgresql.port" . }} -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }} - -{{- else if contains "ClusterIP" .Values.service.type }} - - kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "common.fullname" . }} {{ template "postgresql.port" . }}:{{ template "postgresql.port" . }} & - {{ if (include "postgresql.password" . ) }}PGPASSWORD="$POSTGRES_PASSWORD" {{ end }}psql --host 127.0.0.1 -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }} -p {{ template "postgresql.port" . }} - -{{- end }} - -{{- include "postgresql.validateValues" . -}} - -{{- if and (contains "bitnami/" .Values.image.repository) (not (.Values.image.tag | toString | regexFind "-r\\d+$|sha256:")) }} - -WARNING: Rolling tag detected ({{ .Values.image.repository }}:{{ .Values.image.tag }}), please note that it is strongly recommended to avoid using rolling tags in a production environment. -+info https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/ - -{{- end }} diff --git a/tip-wlan/charts/postgresql/templates/_helpers.tpl b/tip-wlan/charts/postgresql/templates/_helpers.tpl deleted file mode 100644 index a941d7c..0000000 --- a/tip-wlan/charts/postgresql/templates/_helpers.tpl +++ /dev/null @@ -1,370 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "postgresql.master.fullname" -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- $fullname := default (printf "%s-%s" .Release.Name $name) .Values.fullnameOverride -}} -{{- if .Values.replication.enabled -}} -{{- printf "%s-%s" $fullname "master" | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s" $fullname | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} - -{{/* -Return the proper PostgreSQL image name -*/}} -{{- define "postgresql.image" -}} -{{- $registryName := .Values.image.registry -}} -{{- $repositoryName := .Values.image.repository -}} -{{- $tag := .Values.image.tag | toString -}} -{{/* -Helm 2.11 supports the assignment of a value to a variable defined in a different scope, -but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. -Also, we can't use a single if because lazy evaluation is not an option -*/}} -{{- if .Values.global }} - {{- if .Values.global.imageRegistry }} - {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} - {{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} - {{- end -}} -{{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} -{{- end -}} -{{- end -}} - -{{/* -Return PostgreSQL postgres user password -*/}} -{{- define "postgresql.postgres.password" -}} -{{- if .Values.global.postgresql.postgresqlPostgresPassword }} - {{- .Values.global.postgresql.postgresqlPostgresPassword -}} -{{- else if .Values.postgresqlPostgresPassword -}} - {{- .Values.postgresqlPostgresPassword -}} -{{- else -}} - {{- randAlphaNum 10 -}} -{{- end -}} -{{- end -}} - -{{/* -Return PostgreSQL password -*/}} -{{- define "postgresql.password" -}} -{{- if .Values.global.postgresql.postgresqlPassword }} - {{- .Values.global.postgresql.postgresqlPassword -}} -{{- else if .Values.postgresqlPassword -}} - {{- .Values.postgresqlPassword -}} -{{- else -}} - {{- randAlphaNum 10 -}} -{{- end -}} -{{- end -}} - -{{/* -Return PostgreSQL replication password -*/}} -{{- define "postgresql.replication.password" -}} -{{- if .Values.global.postgresql.replicationPassword }} - {{- .Values.global.postgresql.replicationPassword -}} -{{- else if .Values.replication.password -}} - {{- .Values.replication.password -}} -{{- else -}} - {{- randAlphaNum 10 -}} -{{- end -}} -{{- end -}} - -{{/* -Return PostgreSQL username -*/}} -{{- define "postgresql.username" -}} -{{- if .Values.global.postgresql.postgresqlUsername }} - {{- .Values.global.postgresql.postgresqlUsername -}} -{{- else -}} - {{- .Values.postgresqlUsername -}} -{{- end -}} -{{- end -}} - - -{{/* -Return PostgreSQL replication username -*/}} -{{- define "postgresql.replication.username" -}} -{{- if .Values.global.postgresql.replicationUser }} - {{- .Values.global.postgresql.replicationUser -}} -{{- else -}} - {{- .Values.replication.user -}} -{{- end -}} -{{- end -}} - -{{/* -Return PostgreSQL port -*/}} -{{- define "postgresql.port" -}} -{{- if .Values.global.postgresql.servicePort }} - {{- .Values.global.postgresql.servicePort -}} -{{- else -}} - {{- .Values.service.port -}} -{{- end -}} -{{- end -}} - -{{/* -Return PostgreSQL created database -*/}} -{{- define "postgresql.database" -}} -{{- if .Values.global.postgresql.postgresqlDatabase }} - {{- .Values.global.postgresql.postgresqlDatabase -}} -{{- else if .Values.postgresqlDatabase -}} - {{- .Values.postgresqlDatabase -}} -{{- end -}} -{{- end -}} - -{{/* -Return the proper image name to change the volume permissions -*/}} -{{- define "postgresql.volumePermissions.image" -}} -{{- $registryName := .Values.volumePermissions.image.registry -}} -{{- $repositoryName := .Values.volumePermissions.image.repository -}} -{{- $tag := .Values.volumePermissions.image.tag | toString -}} -{{/* -Helm 2.11 supports the assignment of a value to a variable defined in a different scope, -but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. -Also, we can't use a single if because lazy evaluation is not an option -*/}} -{{- if .Values.global }} - {{- if .Values.global.imageRegistry }} - {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} - {{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} - {{- end -}} -{{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} -{{- end -}} -{{- end -}} - -{{/* -Return the proper PostgreSQL metrics image name -*/}} -{{- define "postgresql.metrics.image" -}} -{{- $registryName := default "docker.io" .Values.metrics.image.registry -}} -{{- $repositoryName := .Values.metrics.image.repository -}} -{{- $tag := default "latest" .Values.metrics.image.tag | toString -}} -{{/* -Helm 2.11 supports the assignment of a value to a variable defined in a different scope, -but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic. -Also, we can't use a single if because lazy evaluation is not an option -*/}} -{{- if .Values.global }} - {{- if .Values.global.imageRegistry }} - {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}} - {{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} - {{- end -}} -{{- else -}} - {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} -{{- end -}} -{{- end -}} - -{{/* -Get the password secret. -*/}} -{{- define "postgresql.secretName" -}} -{{- if .Values.global.postgresql.existingSecret }} - {{- printf "%s" (tpl .Values.global.postgresql.existingSecret $) -}} -{{- else if .Values.existingSecret -}} - {{- printf "%s" (tpl .Values.existingSecret $) -}} -{{- else -}} - {{- printf "%s" (include "common.fullname" .) -}} -{{- end -}} -{{- end -}} - -{{/* -Return true if a secret object should be created -*/}} -{{- define "postgresql.createSecret" -}} -{{- if .Values.global.postgresql.existingSecret }} -{{- else if .Values.existingSecret -}} -{{- else -}} - {{- true -}} -{{- end -}} -{{- end -}} - -{{/* -Get the configuration ConfigMap name. -*/}} -{{- define "postgresql.configurationCM" -}} -{{- if .Values.configurationConfigMap -}} -{{- printf "%s" (tpl .Values.configurationConfigMap $) -}} -{{- else -}} -{{- printf "%s-configuration" (include "common.fullname" .) -}} -{{- end -}} -{{- end -}} - -{{/* -Get the extended configuration ConfigMap name. -*/}} -{{- define "postgresql.extendedConfigurationCM" -}} -{{- if .Values.extendedConfConfigMap -}} -{{- printf "%s" (tpl .Values.extendedConfConfigMap $) -}} -{{- else -}} -{{- printf "%s-extended-configuration" (include "common.fullname" .) -}} -{{- end -}} -{{- end -}} - -{{/* -Return true if a configmap should be mounted with PostgreSQL configuration -*/}} -{{- define "postgresql.mountConfigurationCM" -}} -{{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap }} - {{- true -}} -{{- end -}} -{{- end -}} - -{{/* -Get the initialization scripts ConfigMap name. -*/}} -{{- define "postgresql.initdbScriptsCM" -}} -{{- if .Values.initdbScriptsConfigMap -}} -{{- printf "%s" (tpl .Values.initdbScriptsConfigMap $) -}} -{{- else -}} -{{- printf "%s-init-scripts" (include "common.fullname" .) -}} -{{- end -}} -{{- end -}} - -{{/* -Get the initialization scripts Secret name. -*/}} -{{- define "postgresql.initdbScriptsSecret" -}} -{{- printf "%s" (tpl .Values.initdbScriptsSecret $) -}} -{{- end -}} - -{{/* -Get the metrics ConfigMap name. -*/}} -{{- define "postgresql.metricsCM" -}} -{{- printf "%s-metrics" (include "common.fullname" .) -}} -{{- end -}} - -{{/* -Get the readiness probe command -*/}} -{{- define "postgresql.readinessProbeCommand" -}} -- | -{{- if (include "postgresql.database" .) }} - exec pg_isready -U {{ include "postgresql.username" . | quote }} -d {{ (include "postgresql.database" .) | quote }} -h 127.0.0.1 -p {{ template "postgresql.port" . }} -{{- else }} - exec pg_isready -U {{ include "postgresql.username" . | quote }} -h 127.0.0.1 -p {{ template "postgresql.port" . }} -{{- end }} -{{- if contains "bitnami/" .Values.image.repository }} - [ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ] -{{- end -}} -{{- end -}} - -{{/* -Return the proper Storage Class -*/}} -{{- define "postgresql.storageClass" -}} -{{/* -Helm 2.11 supports the assignment of a value to a variable defined in a different scope, -but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic. -*/}} -{{- if .Values.global -}} - {{- if .Values.global.storageClass -}} - {{- if (eq "-" .Values.global.storageClass) -}} - {{- printf "storageClassName: \"\"" -}} - {{- else }} - {{- printf "storageClassName: %s" .Values.global.storageClass -}} - {{- end -}} - {{- else -}} - {{- if .Values.persistence.storageClass -}} - {{- if (eq "-" .Values.persistence.storageClass) -}} - {{- printf "storageClassName: \"\"" -}} - {{- else }} - {{- printf "storageClassName: %s" .Values.persistence.storageClass -}} - {{- end -}} - {{- end -}} - {{- end -}} -{{- else -}} - {{- if .Values.persistence.storageClass -}} - {{- if (eq "-" .Values.persistence.storageClass) -}} - {{- printf "storageClassName: \"\"" -}} - {{- else }} - {{- printf "storageClassName: %s" .Values.persistence.storageClass -}} - {{- end -}} - {{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Renders a value that contains template. -Usage: -{{ include "postgresql.tplValue" ( dict "value" .Values.path.to.the.Value "context" $) }} -*/}} -{{- define "postgresql.tplValue" -}} - {{- if typeIs "string" .value }} - {{- tpl .value .context }} - {{- else }} - {{- tpl (.value | toYaml) .context }} - {{- end }} -{{- end -}} - -{{/* -Return the appropriate apiVersion for statefulset. -*/}} -{{- define "postgresql.statefulset.apiVersion" -}} -{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} -{{- print "apps/v1beta2" -}} -{{- else -}} -{{- print "apps/v1" -}} -{{- end -}} -{{- end -}} - -{{/* -Compile all warnings into a single message, and call fail. -*/}} -{{- define "postgresql.validateValues" -}} -{{- $messages := list -}} -{{- $messages := append $messages (include "postgresql.validateValues.ldapConfigurationMethod" .) -}} -{{- $messages := append $messages (include "postgresql.validateValues.psp" .) -}} -{{- $messages := without $messages "" -}} -{{- $message := join "\n" $messages -}} - -{{- if $message -}} -{{- printf "\nVALUES VALIDATION:\n%s" $message | fail -}} -{{- end -}} -{{- end -}} - -{{/* -Validate values of Postgresql - If ldap.url is used then you don't need the other settings for ldap -*/}} -{{- define "postgresql.validateValues.ldapConfigurationMethod" -}} -{{- if and .Values.ldap.enabled (and (not (empty .Values.ldap.url)) (not (empty .Values.ldap.server))) }} -postgresql: ldap.url, ldap.server - You cannot set both `ldap.url` and `ldap.server` at the same time. - Please provide a unique way to configure LDAP. - More info at https://www.postgresql.org/docs/current/auth-ldap.html -{{- end -}} -{{- end -}} - -{{/* -Validate values of Postgresql - If PSP is enabled RBAC should be enabled too -*/}} -{{- define "postgresql.validateValues.psp" -}} -{{- if and .Values.psp.create (not .Values.rbac.create) }} -postgresql: psp.create, rbac.create - RBAC should be enabled if PSP is enabled in order for PSP to work. - More info at https://kubernetes.io/docs/concepts/policy/pod-security-policy/#authorizing-policies -{{- end -}} -{{- end -}} - -{{/* -Return the appropriate apiVersion for podsecuritypolicy. -*/}} -{{- define "podsecuritypolicy.apiVersion" -}} -{{- if semverCompare "<1.10-0" .Capabilities.KubeVersion.GitVersion -}} -{{- print "extensions/v1beta1" -}} -{{- else -}} -{{- print "policy/v1beta1" -}} -{{- end -}} -{{- end -}} \ No newline at end of file diff --git a/tip-wlan/charts/postgresql/templates/configmap.yaml b/tip-wlan/charts/postgresql/templates/configmap.yaml deleted file mode 100644 index e0ff1ac..0000000 --- a/tip-wlan/charts/postgresql/templates/configmap.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{{ if and (or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration) (not .Values.configurationConfigMap) }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "common.fullname" . }}-configuration - namespace: {{ include "common.namespace" . }} - labels: - app: {{ template "common.name" . }} - chart: {{ template "common.chart" . }} - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} - {{- if .Values.commonAnnotations }} - annotations: {{- include "postgresql.tplValue" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} - {{- end }} -data: -{{- if (.Files.Glob "files/postgresql.conf") }} -{{ (.Files.Glob "files/postgresql.conf").AsConfig | indent 2 }} -{{- else if .Values.postgresqlConfiguration }} - postgresql.conf: | -{{- range $key, $value := default dict .Values.postgresqlConfiguration }} - {{ $key | snakecase }}={{ $value }} -{{- end }} -{{- end }} -{{- if (.Files.Glob "files/pg_hba.conf") }} -{{ (.Files.Glob "files/pg_hba.conf").AsConfig | indent 2 }} -{{- else if .Values.pgHbaConfiguration }} - pg_hba.conf: | -{{ .Values.pgHbaConfiguration | indent 4 }} -{{- end }} -{{ end }} diff --git a/tip-wlan/charts/postgresql/templates/extended-config-configmap.yaml b/tip-wlan/charts/postgresql/templates/extended-config-configmap.yaml deleted file mode 100644 index cbfa9ec..0000000 --- a/tip-wlan/charts/postgresql/templates/extended-config-configmap.yaml +++ /dev/null @@ -1,25 +0,0 @@ -{{- if and (or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf) (not .Values.extendedConfConfigMap)}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "common.fullname" . }}-extended-configuration - namespace: {{ include "common.namespace" . }} - labels: - app: {{ template "common.name" . }} - chart: {{ template "common.chart" . }} - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} - {{- if .Values.commonAnnotations }} - annotations: {{- include "postgresql.tplValue" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} - {{- end }} -data: -{{- with .Files.Glob "files/conf.d/*.conf" }} -{{ .AsConfig | indent 2 }} -{{- end }} -{{ with .Values.postgresqlExtendedConf }} - override.conf: | -{{- range $key, $value := . }} - {{ $key | snakecase }}={{ $value }} -{{- end }} -{{- end }} -{{- end }} diff --git a/tip-wlan/charts/postgresql/templates/initialization-configmap.yaml b/tip-wlan/charts/postgresql/templates/initialization-configmap.yaml deleted file mode 100644 index a149415..0000000 --- a/tip-wlan/charts/postgresql/templates/initialization-configmap.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if and (or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScripts) (not .Values.initdbScriptsConfigMap) }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "common.fullname" . }}-init-scripts - namespace: {{ include "common.namespace" . }} - labels: - app: {{ template "common.name" . }} - chart: {{ template "common.chart" . }} - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} - {{- if .Values.commonAnnotations }} - annotations: {{- include "postgresql.tplValue" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} - {{- end }} -{{- with .Files.Glob "files/docker-entrypoint-initdb.d/*.sql.gz" }} -binaryData: -{{- range $path, $bytes := . }} - {{ base $path }}: {{ $.Files.Get $path | b64enc | quote }} -{{- end }} -{{- end }} -data: -{{- with .Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql}" }} -{{ .AsConfig | indent 2 }} -{{- end }} -{{- with .Values.initdbScripts }} -{{ toYaml . | indent 2 }} -{{- end }} -{{- end }} diff --git a/tip-wlan/charts/postgresql/templates/secret-certs.yaml b/tip-wlan/charts/postgresql/templates/secret-certs.yaml deleted file mode 100644 index f20b34e..0000000 --- a/tip-wlan/charts/postgresql/templates/secret-certs.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "common.fullname" . }}-certs - namespace: {{ include "common.namespace" . }} -type: Opaque -data: -{{ tpl (.Files.Glob "resources/config/certs/*").AsSecrets . | indent 2 }} - diff --git a/tip-wlan/charts/postgresql/templates/secrets.yaml b/tip-wlan/charts/postgresql/templates/secrets.yaml deleted file mode 100644 index b7d308e..0000000 --- a/tip-wlan/charts/postgresql/templates/secrets.yaml +++ /dev/null @@ -1,27 +0,0 @@ -{{- if (include "postgresql.createSecret" .) }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ template "common.name" . }} - chart: {{ template "common.chart" . }} - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} - {{- if .Values.commonAnnotations }} - annotations: {{- include "postgresql.tplValue" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} - {{- end }} -type: Opaque -data: - {{- if and .Values.postgresqlPostgresPassword (not (eq .Values.postgresqlUsername "postgres")) }} - postgresql-postgres-password: {{ include "postgresql.postgres.password" . | b64enc | quote }} - {{- end }} - postgresql-password: {{ include "postgresql.password" . | b64enc | quote }} - {{- if .Values.replication.enabled }} - postgresql-replication-password: {{ include "postgresql.replication.password" . | b64enc | quote }} - {{- end }} - {{- if (and .Values.ldap.enabled .Values.ldap.bind_password)}} - postgresql-ldap-password: {{ .Values.ldap.bind_password | b64enc | quote }} - {{- end }} -{{- end -}} diff --git a/tip-wlan/charts/postgresql/templates/statefulset-slaves.yaml b/tip-wlan/charts/postgresql/templates/statefulset-slaves.yaml deleted file mode 100644 index 2c53bfe..0000000 --- a/tip-wlan/charts/postgresql/templates/statefulset-slaves.yaml +++ /dev/null @@ -1,348 +0,0 @@ -{{- if .Values.replication.enabled }} -apiVersion: {{ template "postgresql.statefulset.apiVersion" . }} -kind: StatefulSet -metadata: - name: "{{ template "common.fullname" . }}-slave" - namespace: {{ include "common.namespace" . }} - labels: - app: {{ template "common.name" . }} - chart: {{ template "common.chart" . }} - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} -{{- with .Values.slave.labels }} -{{ toYaml . | indent 4 }} -{{- end }} - annotations: - {{- if .Values.commonAnnotations }} - {{- include "postgresql.tplValue" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} - {{- end }} - {{- with .Values.slave.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - serviceName: {{ template "common.fullname" . }}-headless - replicas: {{ .Values.replication.slaveReplicas }} - selector: - matchLabels: - app: {{ template "common.name" . }} - release: {{ .Release.Name | quote }} - role: slave - template: - metadata: - name: {{ template "common.fullname" . }} - labels: - app: {{ template "common.name" . }} - chart: {{ template "common.chart" . }} - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} - role: slave -{{- with .Values.slave.podLabels }} -{{ toYaml . | indent 8 }} -{{- end }} -{{- with .Values.slave.podAnnotations }} - annotations: -{{ toYaml . | indent 8 }} -{{- end }} - spec: - {{- if .Values.schedulerName }} - schedulerName: "{{ .Values.schedulerName }}" - {{- end }} - {{- if .Values.image.pullSecrets }} - imagePullSecrets: - - name: {{ .Values.image.pullSecrets }} - {{- end }} - {{- if .Values.slave.nodeSelector }} - nodeSelector: -{{ toYaml .Values.slave.nodeSelector | indent 8 }} - {{- end }} - {{- if .Values.slave.affinity }} - affinity: -{{ toYaml .Values.slave.affinity | indent 8 }} - {{- end }} - {{- if .Values.slave.tolerations }} - tolerations: -{{ toYaml .Values.slave.tolerations | indent 8 }} - {{- end }} - {{- if .Values.terminationGracePeriodSeconds }} - terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }} - {{- end }} - {{- if .Values.securityContext.enabled }} - securityContext: - fsGroup: {{ .Values.securityContext.fsGroup }} - {{- end }} - {{- if .Values.serviceAccount.enabled }} - serviceAccountName: {{ default (include "common.fullname" . ) .Values.serviceAccount.name}} - {{- end }} - {{- if or .Values.slave.extraInitContainers (and .Values.volumePermissions.enabled (or .Values.persistence.enabled (and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled))) }} - initContainers: - - image: busybox:latest - imagePullPolicy: Always - name: setup-configs - command: - - sh - - -c - - | - echo "Setting Config Maps" - cd /tmp/certs - cp * /opt/tip-wlan/certs/ - chmod 0600 /opt/tip-wlan/certs/postgresclientkey_dec.pem /opt/tip-wlan/certs/serverkey_dec.pem - chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} /opt/tip-wlan/certs/*.* - echo "copied all the certs, updated the permissions and ownership. here are the contents of /opt/tip-wlan/certs folder" - ls -lrt /opt/tip-wlan/certs/ - volumeMounts: - - mountPath: /tmp/certs/ - name: postgresql-certs - - mountPath: /opt/tip-wlan/certs - name: postgresql-certs-transfer - {{- if and .Values.volumePermissions.enabled (or .Values.persistence.enabled (and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled)) }} - - name: init-chmod-data - image: {{ template "postgresql.volumePermissions.image" . }} - imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} - {{- if .Values.resources }} - resources: {{- toYaml .Values.resources | nindent 12 }} - {{- end }} - command: - - /bin/sh - - -cx - - | - {{- if .Values.persistence.enabled }} - mkdir -p {{ .Values.persistence.mountPath }}/data {{- if (include "postgresql.mountConfigurationCM" .) }} {{ .Values.persistence.mountPath }}/conf {{- end }} - chmod 700 {{ .Values.persistence.mountPath }}/data {{- if (include "postgresql.mountConfigurationCM" .) }} {{ .Values.persistence.mountPath }}/conf {{- end }} - find {{ .Values.persistence.mountPath }} -mindepth 1 -maxdepth 1 {{- if not (include "postgresql.mountConfigurationCM" .) }} -not -name "conf" {{- end }} -not -name ".snapshot" -not -name "lost+found" | \ - {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }} - xargs chown -R `id -u`:`id -G | cut -d " " -f2` - {{- else }} - xargs chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} - {{- end }} - {{- end }} - {{- if and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled }} - chmod -R 777 /dev/shm - {{- end }} - {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }} - securityContext: - {{- else }} - securityContext: - runAsUser: {{ .Values.volumePermissions.securityContext.runAsUser }} - {{- end }} - volumeMounts: - {{ if .Values.persistence.enabled }} - - name: data - mountPath: {{ .Values.persistence.mountPath }} - subPath: {{ .Values.persistence.subPath }} - {{- end }} - {{- if .Values.shmVolume.enabled }} - - name: dshm - mountPath: /dev/shm - {{- end }} - {{- end }} - {{- if .Values.slave.extraInitContainers }} -{{ tpl .Values.slave.extraInitContainers . | indent 8 }} - {{- end }} - {{- end }} - {{- if .Values.slave.priorityClassName }} - priorityClassName: {{ .Values.slave.priorityClassName }} - {{- end }} - containers: - - name: {{ template "common.fullname" . }} - image: {{ template "postgresql.image" . }} - imagePullPolicy: "{{ .Values.image.pullPolicy }}" - {{- if .Values.resources }} - resources: {{- toYaml .Values.resources | nindent 12 }} - {{- end }} - {{- if .Values.securityContext.enabled }} - securityContext: - runAsUser: {{ .Values.securityContext.runAsUser }} - {{- end }} - env: - - name: BITNAMI_DEBUG - value: {{ ternary "true" "false" .Values.image.debug | quote }} - - name: POSTGRESQL_VOLUME_DIR - value: "{{ .Values.persistence.mountPath }}" - - name: POSTGRESQL_PORT_NUMBER - value: "{{ template "postgresql.port" . }}" - {{- if .Values.persistence.mountPath }} - - name: PGDATA - value: {{ .Values.postgresqlDataDir | quote }} - {{- end }} - - name: POSTGRES_REPLICATION_MODE - value: "slave" - - name: POSTGRES_REPLICATION_USER - value: {{ include "postgresql.replication.username" . | quote }} - {{- if .Values.usePasswordFile }} - - name: POSTGRES_REPLICATION_PASSWORD_FILE - value: "/opt/bitnami/postgresql/secrets/postgresql-replication-password" - {{- else }} - - name: POSTGRES_REPLICATION_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "postgresql.secretName" . }} - key: postgresql-replication-password - {{- end }} - - name: POSTGRES_CLUSTER_APP_NAME - value: {{ .Values.replication.applicationName }} - - name: POSTGRES_MASTER_HOST - value: {{ template "common.fullname" . }} - - name: POSTGRES_MASTER_PORT_NUMBER - value: {{ include "postgresql.port" . | quote }} - {{- if and .Values.postgresqlPostgresPassword (not (eq .Values.postgresqlUsername "postgres")) }} - {{- if .Values.usePasswordFile }} - - name: POSTGRES_POSTGRES_PASSWORD_FILE - value: "/opt/bitnami/postgresql/secrets/postgresql-postgres-password" - {{- else }} - - name: POSTGRES_POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "postgresql.secretName" . }} - key: postgresql-postgres-password - {{- end }} - {{- end }} - {{- if .Values.usePasswordFile }} - - name: POSTGRES_PASSWORD_FILE - value: "/opt/bitnami/postgresql/secrets/postgresql-password" - {{- else }} - - name: POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "postgresql.secretName" . }} - key: postgresql-password - {{- end }} - - name: PGSSLMODE - value: "verify-ca" - - name: PGSSLCERT - value: "/opt/tip-wlan/certs/postgresclientcert.pem" - - name: PGSSLKEY - value: "/opt/tip-wlan/certs/postgresclientkey_dec.pem" - - name: PGSSLROOTCERT - value: "/opt/tip-wlan/certs/cacert.pem" - - name: POSTGRESQL_ENABLE_TLS - value: "yes" - - name: POSTGRESQL_TLS_CERT_FILE - value: "/opt/tip-wlan/certs/servercert.pem" - - name: POSTGRESQL_TLS_KEY_FILE - value: "/opt/tip-wlan/certs/serverkey_dec.pem" - - name: POSTGRESQL_TLS_CA_FILE - value: "/opt/tip-wlan/certs/cacert.pem" - ports: - - name: tcp-postgresql - containerPort: {{ template "postgresql.port" . }} - {{- if .Values.livenessProbe.enabled }} - livenessProbe: - exec: - command: - - /bin/sh - - -c - {{- if (include "postgresql.database" .) }} - - exec pg_isready -U {{ include "postgresql.username" . | quote }} -d {{ (include "postgresql.database" .) | quote }} -h 127.0.0.1 -p {{ template "postgresql.port" . }} - {{- else }} - - exec pg_isready -U {{ include "postgresql.username" . | quote }} -h 127.0.0.1 -p {{ template "postgresql.port" . }} - {{- end }} - initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.livenessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} - successThreshold: {{ .Values.livenessProbe.successThreshold }} - failureThreshold: {{ .Values.livenessProbe.failureThreshold }} - {{- end }} - {{- if .Values.readinessProbe.enabled }} - readinessProbe: - exec: - command: - - /bin/sh - - -c - - -e - {{- include "postgresql.readinessProbeCommand" . | nindent 16 }} - initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.readinessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} - successThreshold: {{ .Values.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.readinessProbe.failureThreshold }} - {{- end }} - volumeMounts: - {{- if .Values.usePasswordFile }} - - name: postgresql-password - mountPath: /opt/bitnami/postgresql/secrets/ - {{- end }} - {{- if .Values.shmVolume.enabled }} - - name: dshm - mountPath: /dev/shm - {{- end }} - {{- if .Values.persistence.enabled }} - - name: data - mountPath: {{ .Values.persistence.mountPath }} - subPath: {{ .Values.persistence.subPath }} - {{ end }} - {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }} - - name: postgresql-extended-config - mountPath: /bitnami/postgresql/conf/conf.d/ - {{- end }} - {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap }} - - name: postgresql-config - mountPath: /bitnami/postgresql/conf - {{- end }} - - mountPath: /opt/tip-wlan/certs - name: postgresql-certs-transfer - {{- if .Values.slave.extraVolumeMounts }} - {{- toYaml .Values.slave.extraVolumeMounts | nindent 12 }} - {{- end }} -{{- if .Values.slave.sidecars }} -{{- include "postgresql.tplValue" ( dict "value" .Values.slave.sidecars "context" $ ) | nindent 8 }} -{{- end }} - volumes: - {{- if .Values.usePasswordFile }} - - name: postgresql-password - secret: - secretName: {{ template "postgresql.secretName" . }} - {{- end }} - {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap}} - - name: postgresql-config - configMap: - name: {{ template "postgresql.configurationCM" . }} - {{- end }} - - name: postgresql-certs - secret: - secretName: {{ include "common.fullname" . }}-certs - - name: postgresql-certs-transfer - emptyDir: {} - {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }} - - name: postgresql-extended-config - configMap: - name: {{ template "postgresql.extendedConfigurationCM" . }} - {{- end }} - {{- if .Values.shmVolume.enabled }} - - name: dshm - emptyDir: - medium: Memory - sizeLimit: 1Gi - {{- end }} - {{- if not .Values.persistence.enabled }} - - name: data - emptyDir: {} - {{- end }} - {{- if .Values.slave.extraVolumes }} - {{- toYaml .Values.slave.extraVolumes | nindent 8 }} - {{- end }} - updateStrategy: - type: {{ .Values.updateStrategy.type }} - {{- if (eq "Recreate" .Values.updateStrategy.type) }} - rollingUpdate: null - {{- end }} -{{- if .Values.persistence.enabled }} - volumeClaimTemplates: - - metadata: - name: data - {{- with .Values.persistence.annotations }} - annotations: - {{- range $key, $value := . }} - {{ $key }}: {{ $value }} - {{- end }} - {{- end }} - spec: - accessModes: - {{- range .Values.persistence.accessModes }} - - {{ . | quote }} - {{- end }} - resources: - requests: - storage: {{ .Values.persistence.size | quote }} - {{ include "postgresql.storageClass" . }} -{{- end }} -{{- end }} diff --git a/tip-wlan/charts/postgresql/templates/statefulset.yaml b/tip-wlan/charts/postgresql/templates/statefulset.yaml deleted file mode 100644 index 4e5af85..0000000 --- a/tip-wlan/charts/postgresql/templates/statefulset.yaml +++ /dev/null @@ -1,503 +0,0 @@ -apiVersion: {{ template "postgresql.statefulset.apiVersion" . }} -kind: StatefulSet -metadata: - name: {{ template "postgresql.master.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ template "common.name" . }} - chart: {{ template "common.chart" . }} - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} - {{- with .Values.master.labels }} - {{- toYaml . | nindent 4 }} - {{- end }} - annotations: - {{- if .Values.commonAnnotations }} - {{- include "postgresql.tplValue" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} - {{- end }} - {{- with .Values.slave.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - serviceName: {{ template "common.fullname" . }}-headless - replicas: 1 - updateStrategy: - type: {{ .Values.updateStrategy.type }} - {{- if (eq "Recreate" .Values.updateStrategy.type) }} - rollingUpdate: null - {{- end }} - selector: - matchLabels: - app: {{ template "common.name" . }} - release: {{ .Release.Name | quote }} - role: master - template: - metadata: - name: {{ template "common.fullname" . }} - labels: - app: {{ template "common.name" . }} - chart: {{ template "common.chart" . }} - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} - role: master - {{- with .Values.master.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.master.podAnnotations }} - annotations: {{- toYaml . | nindent 8 }} - {{- end }} - spec: - {{- if .Values.schedulerName }} - schedulerName: "{{ .Values.schedulerName }}" - {{- end }} - {{- if .Values.image.pullSecrets }} - imagePullSecrets: - - name: {{ .Values.image.pullSecrets }} - {{- end }} - {{- if .Values.master.nodeSelector }} - nodeSelector: {{- toYaml .Values.master.nodeSelector | nindent 8 }} - {{- end }} - {{- if .Values.master.affinity }} - affinity: {{- toYaml .Values.master.affinity | nindent 8 }} - {{- end }} - {{- if .Values.master.tolerations }} - tolerations: {{- toYaml .Values.master.tolerations | nindent 8 }} - {{- end }} - {{- if .Values.terminationGracePeriodSeconds }} - terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }} - {{- end }} - {{- if .Values.securityContext.enabled }} - securityContext: - fsGroup: {{ .Values.securityContext.fsGroup }} - {{- end }} - {{- if .Values.serviceAccount.enabled }} - serviceAccountName: {{ default (include "common.fullname" . ) .Values.serviceAccount.name }} - {{- end }} - {{- if or .Values.master.extraInitContainers (and .Values.volumePermissions.enabled (or .Values.persistence.enabled (and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled))) }} - initContainers: - - image: busybox:latest - imagePullPolicy: Always - name: setup-configs - command: - - sh - - -c - - | - echo "Setting Config Maps" - cd /tmp/certs - cp * /opt/tip-wlan/certs/ - chmod 0600 /opt/tip-wlan/certs/postgresclientkey_dec.pem /opt/tip-wlan/certs/serverkey_dec.pem - chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} /opt/tip-wlan/certs/*.* - echo "copied all the certs, updated the permissions and ownership. here are the contents of /opt/tip-wlan/certs folder" - ls -lrt /opt/tip-wlan/certs/ - volumeMounts: - - mountPath: /tmp/certs/ - name: postgresql-certs - - mountPath: /opt/tip-wlan/certs - name: postgresql-certs-transfer - {{- if and .Values.volumePermissions.enabled (or .Values.persistence.enabled (and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled)) }} - - name: init-chmod-data - image: {{ template "postgresql.volumePermissions.image" . }} - imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} - {{- if .Values.resources }} - resources: {{- toYaml .Values.resources | nindent 12 }} - {{- end }} - command: - - /bin/sh - - -cx - - | - {{- if .Values.persistence.enabled }} - mkdir -p {{ .Values.persistence.mountPath }}/data {{- if (include "postgresql.mountConfigurationCM" .) }} {{ .Values.persistence.mountPath }}/conf {{- end }} - chmod 700 {{ .Values.persistence.mountPath }}/data {{- if (include "postgresql.mountConfigurationCM" .) }} {{ .Values.persistence.mountPath }}/conf {{- end }} - find {{ .Values.persistence.mountPath }} -mindepth 1 -maxdepth 1 {{- if not (include "postgresql.mountConfigurationCM" .) }} -not -name "conf" {{- end }} -not -name ".snapshot" -not -name "lost+found" | \ - {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }} - xargs chown -R `id -u`:`id -G | cut -d " " -f2` - {{- else }} - xargs chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} - {{- end }} - {{- end }} - {{- if and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled }} - chmod -R 777 /dev/shm - {{- end }} - {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }} - securityContext: - {{- else }} - securityContext: - runAsUser: {{ .Values.volumePermissions.securityContext.runAsUser }} - {{- end }} - volumeMounts: - {{- if .Values.persistence.enabled }} - - name: data - mountPath: {{ .Values.persistence.mountPath }} - subPath: {{ .Values.persistence.subPath }} - {{- end }} - {{- if .Values.shmVolume.enabled }} - - name: dshm - mountPath: /dev/shm - {{- end }} - {{- end }} - {{- if .Values.master.extraInitContainers }} - {{- tpl .Values.master.extraInitContainers . | nindent 8 }} - {{- end }} - {{- end }} - {{- if .Values.master.priorityClassName }} - priorityClassName: {{ .Values.master.priorityClassName }} - {{- end }} - containers: - - name: {{ template "common.fullname" . }} - image: {{ template "postgresql.image" . }} - imagePullPolicy: "{{ .Values.image.pullPolicy }}" - {{- if .Values.resources }} - resources: {{- toYaml .Values.resources | nindent 12 }} - {{- end }} - {{- if .Values.securityContext.enabled }} - securityContext: - runAsUser: {{ .Values.securityContext.runAsUser }} - {{- end }} - env: - - name: BITNAMI_DEBUG - value: {{ ternary "true" "false" .Values.image.debug | quote }} - - name: POSTGRESQL_PORT_NUMBER - value: "{{ template "postgresql.port" . }}" - - name: POSTGRESQL_VOLUME_DIR - value: "{{ .Values.persistence.mountPath }}" - {{- if .Values.postgresqlInitdbArgs }} - - name: POSTGRES_INITDB_ARGS - value: {{ .Values.postgresqlInitdbArgs | quote }} - {{- end }} - {{- if .Values.postgresqlInitdbWalDir }} - - name: POSTGRES_INITDB_WALDIR - value: {{ .Values.postgresqlInitdbWalDir | quote }} - {{- end }} - {{- if .Values.initdbUser }} - - name: POSTGRESQL_INITSCRIPTS_USERNAME - value: {{ .Values.initdbUser }} - {{- end }} - {{- if .Values.initdbPassword }} - - name: POSTGRESQL_INITSCRIPTS_PASSWORD - value: {{ .Values.initdbPassword }} - {{- end }} - {{- if .Values.persistence.mountPath }} - - name: PGDATA - value: {{ .Values.postgresqlDataDir | quote }} - {{- end }} - {{- if .Values.replication.enabled }} - - name: POSTGRES_REPLICATION_MODE - value: "master" - - name: POSTGRES_REPLICATION_USER - value: {{ include "postgresql.replication.username" . | quote }} - {{- if .Values.usePasswordFile }} - - name: POSTGRES_REPLICATION_PASSWORD_FILE - value: "/opt/bitnami/postgresql/secrets/postgresql-replication-password" - {{- else }} - - name: POSTGRES_REPLICATION_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "postgresql.secretName" . }} - key: postgresql-replication-password - {{- end }} - {{- if not (eq .Values.replication.synchronousCommit "off")}} - - name: POSTGRES_SYNCHRONOUS_COMMIT_MODE - value: {{ .Values.replication.synchronousCommit | quote }} - - name: POSTGRES_NUM_SYNCHRONOUS_REPLICAS - value: {{ .Values.replication.numSynchronousReplicas | quote }} - {{- end }} - - name: POSTGRES_CLUSTER_APP_NAME - value: {{ .Values.replication.applicationName }} - {{- end }} - {{- if and .Values.postgresqlPostgresPassword (not (eq .Values.postgresqlUsername "postgres")) }} - {{- if .Values.usePasswordFile }} - - name: POSTGRES_POSTGRES_PASSWORD_FILE - value: "/opt/bitnami/postgresql/secrets/postgresql-postgres-password" - {{- else }} - - name: POSTGRES_POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "postgresql.secretName" . }} - key: postgresql-postgres-password - {{- end }} - {{- end }} - - name: POSTGRES_USER - value: {{ include "postgresql.username" . | quote }} - {{- if .Values.usePasswordFile }} - - name: POSTGRES_PASSWORD_FILE - value: "/opt/bitnami/postgresql/secrets/postgresql-password" - {{- else }} - - name: POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "postgresql.secretName" . }} - key: postgresql-password - {{- end }} - - name: PGSSLMODE - value: "verify-ca" - - name: PGSSLCERT - value: "/opt/tip-wlan/certs/postgresclientcert.pem" - - name: PGSSLKEY - value: "/opt/tip-wlan/certs/postgresclientkey_dec.pem" - - name: PGSSLROOTCERT - value: "/opt/tip-wlan/certs/cacert.pem" - - name: POSTGRESQL_ENABLE_TLS - value: "yes" - - name: POSTGRESQL_TLS_CERT_FILE - value: "/opt/tip-wlan/certs/servercert.pem" - - name: POSTGRESQL_TLS_KEY_FILE - value: "/opt/tip-wlan/certs/serverkey_dec.pem" - - name: POSTGRESQL_TLS_CA_FILE - value: "/opt/tip-wlan/certs/cacert.pem" - {{- if (include "postgresql.database" .) }} - - name: POSTGRES_DB - value: {{ (include "postgresql.database" .) | quote }} - {{- end }} - {{- if .Values.extraEnv }} - {{- include "postgresql.tplValue" (dict "value" .Values.extraEnv "context" $) | nindent 12 }} - {{- end }} - - name: POSTGRESQL_ENABLE_LDAP - value: {{ ternary "yes" "no" .Values.ldap.enabled | quote }} - {{- if .Values.ldap.enabled }} - - name: POSTGRESQL_LDAP_SERVER - value: {{ .Values.ldap.server }} - - name: POSTGRESQL_LDAP_PORT - value: {{ .Values.ldap.port | quote }} - - name: POSTGRESQL_LDAP_SCHEME - value: {{ .Values.ldap.scheme }} - {{- if .Values.ldap.tls }} - - name: POSTGRESQL_LDAP_TLS - value: "1" - {{- end}} - - name: POSTGRESQL_LDAP_PREFIX - value: {{ .Values.ldap.prefix | quote }} - - name: POSTGRESQL_LDAP_SUFFIX - value: {{ .Values.ldap.suffix | quote}} - - name: POSTGRESQL_LDAP_BASE_DN - value: {{ .Values.ldap.baseDN }} - - name: POSTGRESQL_LDAP_BIND_DN - value: {{ .Values.ldap.bindDN }} - {{- if (not (empty .Values.ldap.bind_password)) }} - - name: POSTGRESQL_LDAP_BIND_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "postgresql.secretName" . }} - key: postgresql-ldap-password - {{- end}} - - name: POSTGRESQL_LDAP_SEARCH_ATTR - value: {{ .Values.ldap.search_attr }} - - name: POSTGRESQL_LDAP_SEARCH_FILTER - value: {{ .Values.ldap.search_filter }} - - name: POSTGRESQL_LDAP_URL - value: {{ .Values.ldap.url }} - {{- end}} - {{- if .Values.extraEnvVarsCM }} - envFrom: - - configMapRef: - name: {{ tpl .Values.extraEnvVarsCM . }} - {{- end }} - ports: - - name: tcp-postgresql - containerPort: {{ template "postgresql.port" . }} - {{- if .Values.livenessProbe.enabled }} - livenessProbe: - exec: - command: - - /bin/sh - - -c - {{- if (include "postgresql.database" .) }} - - exec pg_isready -U {{ include "postgresql.username" . | quote }} -d {{ (include "postgresql.database" .) | quote }} -h 127.0.0.1 -p {{ template "postgresql.port" . }} - {{- else }} - - exec pg_isready -U {{ include "postgresql.username" . | quote }} -h 127.0.0.1 -p {{ template "postgresql.port" . }} - {{- end }} - initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.livenessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} - successThreshold: {{ .Values.livenessProbe.successThreshold }} - failureThreshold: {{ .Values.livenessProbe.failureThreshold }} - {{- end }} - {{- if .Values.readinessProbe.enabled }} - readinessProbe: - exec: - command: - - /bin/sh - - -c - - -e - {{- include "postgresql.readinessProbeCommand" . | nindent 16 }} - initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.readinessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} - successThreshold: {{ .Values.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.readinessProbe.failureThreshold }} - {{- end }} - volumeMounts: - {{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }} - - name: custom-init-scripts - mountPath: /docker-entrypoint-initdb.d/ - {{- end }} - {{- if .Values.initdbScriptsSecret }} - - name: custom-init-scripts-secret - mountPath: /docker-entrypoint-initdb.d/secret - {{- end }} - {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }} - - name: postgresql-extended-config - mountPath: /bitnami/postgresql/conf/conf.d/ - {{- end }} - {{- if .Values.usePasswordFile }} - - name: postgresql-password - mountPath: /opt/bitnami/postgresql/secrets/ - {{- end }} - {{- if .Values.shmVolume.enabled }} - - name: dshm - mountPath: /dev/shm - {{- end }} - {{- if .Values.persistence.enabled }} - - name: data - mountPath: {{ .Values.persistence.mountPath }} - subPath: {{ .Values.persistence.subPath }} - {{- end }} - {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap }} - - name: postgresql-config - mountPath: /bitnami/postgresql/conf - {{- end }} - - mountPath: /opt/tip-wlan/certs - name: postgresql-certs-transfer - {{- if .Values.master.extraVolumeMounts }} - {{- toYaml .Values.master.extraVolumeMounts | nindent 12 }} - {{- end }} -{{- if .Values.master.sidecars }} -{{- include "postgresql.tplValue" ( dict "value" .Values.master.sidecars "context" $ ) | nindent 8 }} -{{- end }} -{{- if .Values.metrics.enabled }} - - name: metrics - image: {{ template "postgresql.metrics.image" . }} - imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} - {{- if .Values.metrics.securityContext.enabled }} - securityContext: - runAsUser: {{ .Values.metrics.securityContext.runAsUser }} - {{- end }} - env: - {{- $database := required "In order to enable metrics you need to specify a database (.Values.postgresqlDatabase or .Values.global.postgresql.postgresqlDatabase)" (include "postgresql.database" .) }} - - name: DATA_SOURCE_URI - value: {{ printf "127.0.0.1:%d/%s?sslmode=disable" (int (include "postgresql.port" .)) $database | quote }} - {{- if .Values.usePasswordFile }} - - name: DATA_SOURCE_PASS_FILE - value: "/opt/bitnami/postgresql/secrets/postgresql-password" - {{- else }} - - name: DATA_SOURCE_PASS - valueFrom: - secretKeyRef: - name: {{ template "postgresql.secretName" . }} - key: postgresql-password - {{- end }} - - name: DATA_SOURCE_USER - value: {{ template "postgresql.username" . }} - {{- if .Values.livenessProbe.enabled }} - livenessProbe: - httpGet: - path: / - port: http-metrics - initialDelaySeconds: {{ .Values.metrics.livenessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.metrics.livenessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.metrics.livenessProbe.timeoutSeconds }} - successThreshold: {{ .Values.metrics.livenessProbe.successThreshold }} - failureThreshold: {{ .Values.metrics.livenessProbe.failureThreshold }} - {{- end }} - {{- if .Values.readinessProbe.enabled }} - readinessProbe: - httpGet: - path: / - port: http-metrics - initialDelaySeconds: {{ .Values.metrics.readinessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.metrics.readinessProbe.timeoutSeconds }} - successThreshold: {{ .Values.metrics.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.metrics.readinessProbe.failureThreshold }} - {{- end }} - volumeMounts: - {{- if .Values.usePasswordFile }} - - name: postgresql-password - mountPath: /opt/bitnami/postgresql/secrets/ - {{- end }} - {{- if .Values.metrics.customMetrics }} - - name: custom-metrics - mountPath: /conf - readOnly: true - args: ["--extend.query-path", "/conf/custom-metrics.yaml"] - {{- end }} - ports: - - name: http-metrics - containerPort: 9187 - {{- if .Values.metrics.resources }} - resources: {{- toYaml .Values.metrics.resources | nindent 12 }} - {{- end }} -{{- end }} - volumes: - {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap}} - - name: postgresql-config - configMap: - name: {{ template "postgresql.configurationCM" . }} - {{- end }} - - name: postgresql-certs - secret: - secretName: {{ include "common.fullname" . }}-certs - - name: postgresql-certs-transfer - emptyDir: {} - {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }} - - name: postgresql-extended-config - configMap: - name: {{ template "postgresql.extendedConfigurationCM" . }} - {{- end }} - {{- if .Values.usePasswordFile }} - - name: postgresql-password - secret: - secretName: {{ template "postgresql.secretName" . }} - {{- end }} - {{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }} - - name: custom-init-scripts - configMap: - name: {{ template "postgresql.initdbScriptsCM" . }} - {{- end }} - {{- if .Values.initdbScriptsSecret }} - - name: custom-init-scripts-secret - secret: - secretName: {{ template "postgresql.initdbScriptsSecret" . }} - {{- end }} - {{- if .Values.master.extraVolumes }} - {{- toYaml .Values.master.extraVolumes | nindent 8 }} - {{- end }} - {{- if and .Values.metrics.enabled .Values.metrics.customMetrics }} - - name: custom-metrics - configMap: - name: {{ template "postgresql.metricsCM" . }} - {{- end }} - {{- if .Values.shmVolume.enabled }} - - name: dshm - emptyDir: - medium: Memory - sizeLimit: 1Gi - {{- end }} -{{- if and .Values.persistence.enabled .Values.persistence.existingClaim }} - - name: data - persistentVolumeClaim: -{{- with .Values.persistence.existingClaim }} - claimName: {{ tpl . $ }} -{{- end }} -{{- else if not .Values.persistence.enabled }} - - name: data - emptyDir: {} -{{- else if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }} - volumeClaimTemplates: - - metadata: - name: data - {{- with .Values.persistence.annotations }} - annotations: - {{- range $key, $value := . }} - {{ $key }}: {{ $value }} - {{- end }} - {{- end }} - spec: - accessModes: - {{- range .Values.persistence.accessModes }} - - {{ . | quote }} - {{- end }} - resources: - requests: - storage: {{ .Values.persistence.size | quote }} - {{ include "postgresql.storageClass" . }} -{{- end }} diff --git a/tip-wlan/charts/postgresql/templates/svc-headless.yaml b/tip-wlan/charts/postgresql/templates/svc-headless.yaml deleted file mode 100644 index 22ebfdc..0000000 --- a/tip-wlan/charts/postgresql/templates/svc-headless.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ template "common.fullname" . }}-headless - namespace: {{ include "common.namespace" . }} - labels: - app: {{ template "common.name" . }} - chart: {{ template "common.chart" . }} - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} - {{- if .Values.commonAnnotations }} - annotations: {{- include "postgresql.tplValue" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} - {{- end }} -spec: - type: ClusterIP - clusterIP: None - ports: - - name: tcp-postgresql - port: {{ template "postgresql.port" . }} - targetPort: tcp-postgresql - selector: - app: {{ template "common.name" . }} - release: {{ .Release.Name | quote }} diff --git a/tip-wlan/charts/postgresql/templates/svc-read.yaml b/tip-wlan/charts/postgresql/templates/svc-read.yaml deleted file mode 100644 index 73119c6..0000000 --- a/tip-wlan/charts/postgresql/templates/svc-read.yaml +++ /dev/null @@ -1,47 +0,0 @@ -{{- if .Values.replication.enabled }} -{{- $serviceAnnotations := coalesce .Values.slave.service.annotations .Values.service.annotations -}} -{{- $serviceType := coalesce .Values.slave.service.type .Values.service.type -}} -{{- $serviceLoadBalancerIP := coalesce .Values.slave.service.loadBalancerIP .Values.service.loadBalancerIP -}} -{{- $serviceLoadBalancerSourceRanges := coalesce .Values.slave.service.loadBalancerSourceRanges .Values.service.loadBalancerSourceRanges -}} -{{- $serviceClusterIP := coalesce .Values.slave.service.clusterIP .Values.service.clusterIP -}} -{{- $serviceNodePort := coalesce .Values.slave.service.nodePort .Values.service.nodePort -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "common.fullname" . }}-read - namespace: {{ include "common.namespace" . }} - labels: - app: {{ template "common.name" . }} - chart: {{ template "common.chart" . }} - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} - annotations: - {{- if .Values.commonAnnotations }} - {{- include "postgresql.tplValue" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} - {{- end }} - {{- if $serviceAnnotations }} - {{- include "postgresql.tplValue" (dict "value" $serviceAnnotations "context" $) | nindent 4 }} - {{- end }} -spec: - type: {{ $serviceType }} - {{- if and $serviceLoadBalancerIP (eq $serviceType "LoadBalancer") }} - loadBalancerIP: {{ $serviceLoadBalancerIP }} - {{- end }} - {{- if and (eq $serviceType "LoadBalancer") $serviceLoadBalancerSourceRanges }} - loadBalancerSourceRanges: {{- include "postgresql.tplValue" (dict "value" $serviceLoadBalancerSourceRanges "context" $) | nindent 4 }} - {{- end }} - {{- if and (eq $serviceType "ClusterIP") $serviceClusterIP }} - clusterIP: {{ $serviceClusterIP }} - {{- end }} - ports: - - name: tcp-postgresql - port: {{ template "postgresql.port" . }} - targetPort: tcp-postgresql - {{- if $serviceNodePort }} - nodePort: {{ $serviceNodePort }} - {{- end }} - selector: - app: {{ template "common.name" . }} - release: {{ .Release.Name | quote }} - role: slave -{{- end }} diff --git a/tip-wlan/charts/postgresql/templates/svc.yaml b/tip-wlan/charts/postgresql/templates/svc.yaml deleted file mode 100644 index cc460a8..0000000 --- a/tip-wlan/charts/postgresql/templates/svc.yaml +++ /dev/null @@ -1,45 +0,0 @@ -{{- $serviceAnnotations := coalesce .Values.master.service.annotations .Values.service.annotations -}} -{{- $serviceType := coalesce .Values.master.service.type .Values.service.type -}} -{{- $serviceLoadBalancerIP := coalesce .Values.master.service.loadBalancerIP .Values.service.loadBalancerIP -}} -{{- $serviceLoadBalancerSourceRanges := coalesce .Values.master.service.loadBalancerSourceRanges .Values.service.loadBalancerSourceRanges -}} -{{- $serviceClusterIP := coalesce .Values.master.service.clusterIP .Values.service.clusterIP -}} -{{- $serviceNodePort := coalesce .Values.master.service.nodePort .Values.service.nodePort -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ template "common.name" . }} - chart: {{ template "common.chart" . }} - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} - annotations: - {{- if .Values.commonAnnotations }} - {{- include "postgresql.tplValue" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} - {{- end }} - {{- if $serviceAnnotations }} - {{- include "postgresql.tplValue" (dict "value" $serviceAnnotations "context" $) | nindent 4 }} - {{- end }} -spec: - type: {{ $serviceType }} - {{- if and $serviceLoadBalancerIP (eq $serviceType "LoadBalancer") }} - loadBalancerIP: {{ $serviceLoadBalancerIP }} - {{- end }} - {{- if and (eq $serviceType "LoadBalancer") $serviceLoadBalancerSourceRanges }} - loadBalancerSourceRanges: {{- include "postgresql.tplValue" (dict "value" $serviceLoadBalancerSourceRanges "context" $) | nindent 4 }} - {{- end }} - {{- if and (eq $serviceType "ClusterIP") $serviceClusterIP }} - clusterIP: {{ $serviceClusterIP }} - {{- end }} - ports: - - name: tcp-postgresql - port: {{ template "postgresql.port" . }} - targetPort: tcp-postgresql - {{- if $serviceNodePort }} - nodePort: {{ $serviceNodePort }} - {{- end }} - selector: - app: {{ template "common.name" . }} - release: {{ .Release.Name | quote }} - role: master diff --git a/tip-wlan/charts/postgresql/templates/tests/test-postgres-record-insert-del.yaml b/tip-wlan/charts/postgresql/templates/tests/test-postgres-record-insert-del.yaml deleted file mode 100644 index aac33ed..0000000 --- a/tip-wlan/charts/postgresql/templates/tests/test-postgres-record-insert-del.yaml +++ /dev/null @@ -1,52 +0,0 @@ -{{- if .Values.testsEnabled -}} -# NOTE: For the test to work, make sure that the cluster-size remains the same -# if you are doing helm-del and then helm-install with existing pvc. -apiVersion: v1 -kind: Pod -metadata: - name: {{ include "common.fullname" . }}-test-insertion-deletion - namespace: {{ include "common.namespace" . }} - annotations: - "helm.sh/hook": test-success -spec: - containers: - - name: {{ include "common.name" . }}-test-postgres-basic - image: {{ template "postgresql.image" . }} - imagePullPolicy: {{ .Values.image.pullPolicy | default .Values.global.pullPolicy }} - env: - - name: POSTGRES_USER - value: {{ include "postgresql.username" . | quote }} - {{- if .Values.usePasswordFile }} - - name: POSTGRES_PASSWORD_FILE - value: "/opt/bitnami/postgresql/secrets/postgresql-password" - {{- else }} - - name: POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "postgresql.secretName" . }} - key: postgresql-password - {{- end }} - command: - - sh - - -c - - | - PGPASSWORD=$POSTGRES_PASSWORD psql -h {{ include "common.fullname" . }} -U $POSTGRES_USER << EOF - \l ; - DROP DATABASE IF EXISTS TEST; - CREATE DATABASE TEST; - \c test ; - CREATE TABLE IF NOT EXISTS TEST_TABLE (id int, name text); - \d ; - SELECT id,name FROM TEST_TABLE; - INSERT INTO TEST_TABLE VALUES (1, 'Test-user'), (2, 'User-2'); - SELECT id,name FROM TEST_TABLE; - DELETE FROM TEST_TABLE where id=2; - SELECT id,name FROM TEST_TABLE; - DROP TABLE TEST_TABLE; - \c postgres; - DROP DATABASE test; - \l ; - \q - EOF - restartPolicy: Never -{{- end }} \ No newline at end of file diff --git a/tip-wlan/charts/postgresql/values.schema.json b/tip-wlan/charts/postgresql/values.schema.json deleted file mode 100644 index ac2de6e..0000000 --- a/tip-wlan/charts/postgresql/values.schema.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "$schema": "http://json-schema.org/schema#", - "type": "object", - "properties": { - "postgresqlUsername": { - "type": "string", - "title": "Admin user", - "form": true - }, - "postgresqlPassword": { - "type": "string", - "title": "Password", - "form": true - }, - "persistence": { - "type": "object", - "properties": { - "size": { - "type": "string", - "title": "Persistent Volume Size", - "form": true, - "render": "slider", - "sliderMin": 1, - "sliderMax": 100, - "sliderUnit": "Gi" - } - } - }, - "resources": { - "type": "object", - "title": "Required Resources", - "description": "Configure resource requests", - "form": true, - "properties": { - "requests": { - "type": "object", - "properties": { - "memory": { - "type": "string", - "form": true, - "render": "slider", - "title": "Memory Request", - "sliderMin": 10, - "sliderMax": 2048, - "sliderUnit": "Mi" - }, - "cpu": { - "type": "string", - "form": true, - "render": "slider", - "title": "CPU Request", - "sliderMin": 10, - "sliderMax": 2000, - "sliderUnit": "m" - } - } - } - } - }, - "replication": { - "type": "object", - "form": true, - "title": "Replication Details", - "properties": { - "enabled": { - "type": "boolean", - "title": "Enable Replication", - "form": true - }, - "slaveReplicas": { - "type": "integer", - "title": "Slave Replicas", - "form": true, - "hidden": { - "condition": false, - "value": "replication.enabled" - } - } - } - }, - "volumePermissions": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean", - "form": true, - "title": "Enable Init Containers", - "description": "Change the owner of the persist volume mountpoint to RunAsUser:fsGroup" - } - } - }, - "metrics": { - "type": "object", - "properties": { - "enabled": { - "type": "boolean", - "title": "Configure metrics exporter", - "form": true - } - } - } - } -} diff --git a/tip-wlan/charts/postgresql/values.yaml b/tip-wlan/charts/postgresql/values.yaml deleted file mode 100644 index bc4a9db..0000000 --- a/tip-wlan/charts/postgresql/values.yaml +++ /dev/null @@ -1,576 +0,0 @@ -## Global Docker image parameters -## Please, note that this will override the image parameters, including dependencies, configured to use the global value -## Current available global Docker image parameters: imageRegistry and imagePullSecrets -## -global: - postgresql: {} -# imageRegistry: myRegistryName -# imagePullSecrets: -# - myRegistryKeySecretName -# storageClass: myStorageClass - -## Bitnami PostgreSQL image version -## ref: https://hub.docker.com/r/bitnami/postgresql/tags/ -## -image: - registry: docker.io - repository: bitnami/postgresql - tag: 11.8.0-debian-10-r58 - # repository: postgres - # tag: 10.6 - ## Specify a imagePullPolicy - ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' - ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images - ## - pullPolicy: Always - ## Optionally specify an array of imagePullSecrets. - ## Secrets must be manually created in the namespace. - ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - ## - # pullSecrets: - # - myRegistryKeySecretName - - ## Set to true if you would like to see extra information on logs - ## It turns BASH and NAMI debugging in minideb - ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging - debug: false - -## String to partially override common.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override common.fullname template -## -# fullnameOverride: - -## -## Init containers parameters: -## volumePermissions: Change the owner of the persist volume mountpoint to RunAsUser:fsGroup -## -volumePermissions: - enabled: true - image: - registry: docker.io - repository: bitnami/minideb - tag: buster - ## Specify a imagePullPolicy - ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' - ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images - ## - pullPolicy: Always - ## Optionally specify an array of imagePullSecrets. - ## Secrets must be manually created in the namespace. - ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - ## - # pullSecrets: - # - myRegistryKeySecretName - ## Init container Security Context - ## Note: the chown of the data folder is done to securityContext.runAsUser - ## and not the below volumePermissions.securityContext.runAsUser - ## When runAsUser is set to special value "auto", init container will try to chwon the - ## data folder to autodetermined user&group, using commands: `id -u`:`id -G | cut -d" " -f2` - ## "auto" is especially useful for OpenShift which has scc with dynamic userids (and 0 is not allowed). - ## You may want to use this volumePermissions.securityContext.runAsUser="auto" in combination with - ## pod securityContext.enabled=false and shmVolume.chmod.enabled=false - ## - securityContext: - runAsUser: 0 - -## Use an alternate scheduler, e.g. "stork". -## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ -## -# schedulerName: - - -## Pod Security Context -## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ -## -securityContext: - enabled: true - fsGroup: 1001 - runAsUser: 1001 - -## Pod Service Account -## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ -serviceAccount: - enabled: false - ## Name of an already existing service account. Setting this value disables the automatic service account creation. - # name: - -## Pod Security Policy -## ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/ -psp: - create: false - -## Creates role for ServiceAccount -## Required for PSP -rbac: - create: false - -replication: - enabled: false - user: repl_user - password: repl_password - slaveReplicas: 1 - ## Set synchronous commit mode: on, off, remote_apply, remote_write and local - ## ref: https://www.postgresql.org/docs/9.6/runtime-config-wal.html#GUC-WAL-LEVEL - synchronousCommit: "off" - ## From the number of `slaveReplicas` defined above, set the number of those that will have synchronous replication - ## NOTE: It cannot be > slaveReplicas - numSynchronousReplicas: 0 - ## Replication Cluster application name. Useful for defining multiple replication policies - applicationName: my_application - -## PostgreSQL admin password (used when `postgresqlUsername` is not `postgres`) -## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-user-on-first-run (see note!) -# postgresqlPostgresPassword: - -## PostgreSQL user (has superuser privileges if username is `postgres`) -## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#setting-the-root-password-on-first-run -postgresqlUsername: postgres - -## PostgreSQL password -## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#setting-the-root-password-on-first-run -## -postgresqlPassword: DUMMY_POSTGRES_PASSWORD - -## PostgreSQL password using existing secret -## existingSecret: secret - -## Mount PostgreSQL secret as a file instead of passing environment variable -# usePasswordFile: false - -## Create a database -## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-on-first-run -## -# postgresqlDatabase: - -## PostgreSQL data dir -## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md -## -postgresqlDataDir: /bitnami/postgresql/data -# postgresqlDataDir: /data/pgdata -## An array to add extra environment variables -## For example: -## extraEnv: -## - name: FOO -## value: "bar" -## -# extraEnv: -extraEnv: [] - -## Name of a ConfigMap containing extra env vars -## -# extraEnvVarsCM: - -## Specify extra initdb args -## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md -## -# postgresqlInitdbArgs: - -## Specify a custom location for the PostgreSQL transaction log -## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md -## -# postgresqlInitdbWalDir: - -## PostgreSQL configuration -## Specify runtime configuration parameters as a dict, using camelCase, e.g. -## {"sharedBuffers": "500MB"} -## Alternatively, you can put your postgresql.conf under the files/ directory -## ref: https://www.postgresql.org/docs/current/static/runtime-config.html -## -# postgresqlConfiguration: - -## PostgreSQL extended configuration -## As above, but _appended_ to the main configuration -## Alternatively, you can put your *.conf under the files/conf.d/ directory -## https://github.com/bitnami/bitnami-docker-postgresql#allow-settings-to-be-loaded-from-files-other-than-the-default-postgresqlconf -## -# postgresqlExtendedConf: - -## PostgreSQL client authentication configuration -## Specify content for pg_hba.conf -## Default: do not create pg_hba.conf -## Alternatively, you can put your pg_hba.conf under the files/ directory -pgHbaConfiguration: |- - local all all trust - host all all localhost trust - host all all 0.0.0.0/0 trust - host all all ::/0 trust -# host mydatabase mysuser 192.168.0.0/24 md5 - -## ConfigMap with PostgreSQL configuration -## NOTE: This will override postgresqlConfiguration and pgHbaConfiguration -# configurationConfigMap: - -## ConfigMap with PostgreSQL extended configuration -# extendedConfConfigMap: - -## initdb scripts -## Specify dictionary of scripts to be run at first boot -## Alternatively, you can put your scripts under the files/docker-entrypoint-initdb.d directory -## -# initdbScripts: -# my_init_script.sh: | -# #!/bin/sh -# echo "Do something." - -## ConfigMap with scripts to be run at first boot -## NOTE: This will override initdbScripts -# initdbScriptsConfigMap: - -## Secret with scripts to be run at first boot (in case it contains sensitive information) -## NOTE: This can work along initdbScripts or initdbScriptsConfigMap -# initdbScriptsSecret: - -## Specify the PostgreSQL username and password to execute the initdb scripts -# initdbUser: -# initdbPassword: - -## Optional duration in seconds the pod needs to terminate gracefully. -## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods -## -# terminationGracePeriodSeconds: 30 - -## Enable/disable the chart's tests. Useful if using this chart as a dependency of -## another chart and you don't want these tests running when trying to develop and -## test your own chart. -testsEnabled: true - -## LDAP configuration -## -ldap: - enabled: false - url: "" - server: "" - port: "" - prefix: "" - suffix: "" - baseDN: "" - bindDN: "" - bind_password: - search_attr: "" - search_filter: "" - scheme: "" - tls: false - -## PostgreSQL service configuration -service: - ## PosgresSQL service type - type: ClusterIP - # type: NodePort - # clusterIP: None - port: 5432 - - ## Specify the nodePort value for the LoadBalancer and NodePort service types. - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport - ## - ## nodePort: 30010 - - ## Provide any additional annotations which may be required. Evaluated as a template. - ## - annotations: {} - ## Set the LoadBalancer service type to internal only. - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer - ## - # loadBalancerIP: - - ## Load Balancer sources. Evaluated as a template. - ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service - ## - # loadBalancerSourceRanges: - # - 10.10.10.0/24 - -## Start master and slave(s) pod(s) without limitations on shm memory. -## By default docker and containerd (and possibly other container runtimes) -## limit `/dev/shm` to `64M` (see e.g. the -## [docker issue](https://github.com/docker-library/postgres/issues/416) and the -## [containerd issue](https://github.com/containerd/containerd/issues/3654), -## which could be not enough if PostgreSQL uses parallel workers heavily. -## -shmVolume: - ## Set `shmVolume.enabled` to `true` to mount a new tmpfs volume to remove - ## this limitation. - ## - enabled: true - ## Set to `true` to `chmod 777 /dev/shm` on a initContainer. - ## This option is ingored if `volumePermissions.enabled` is `false` - ## - chmod: - enabled: true - -## PostgreSQL data Persistent Volume Storage Class -## If defined, storageClassName: -## If set to "-", storageClassName: "", which disables dynamic provisioning -## If undefined (the default) or set to null, no storageClassName spec is -## set, choosing the default provisioner. (gp2 on AWS, standard on -## GKE, AWS & OpenStack) -## -persistence: - enabled: false - ## A manually managed Persistent Volume and Claim - ## If defined, PVC must be created manually before volume will be bound - ## The value is evaluated as a template, so, for example, the name can depend on .Release or .Chart - ## - # existingClaim: - - ## The path the volume will be mounted at, useful when using different - ## PostgreSQL images. - ## - mountPath: /bitnami/postgresql - # mountPath: /data/ - ## The subdirectory of the volume to mount to, useful in dev environments - ## and one PV for multiple services. - ## - subPath: "" - - storageClass: "-" - accessModes: - - ReadWriteOnce - size: 1Gi - annotations: {} - -## updateStrategy for PostgreSQL StatefulSet and its slaves StatefulSets -## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies -updateStrategy: - type: RollingUpdate - -## -## PostgreSQL Master parameters -## -master: - ## Node, affinity, tolerations, and priorityclass settings for pod assignment - ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector - ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity - ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature - ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption - nodeSelector: {} - affinity: {} - tolerations: [] - labels: {} - annotations: {} - podLabels: {} - podAnnotations: {} - priorityClassName: "" - ## Extra init containers - ## Example - ## - ## extraInitContainers: - ## - name: do-something - ## image: busybox - ## command: ['do', 'something'] - extraInitContainers: [] - - ## Additional PostgreSQL Master Volume mounts - ## - extraVolumeMounts: [] - ## Additional PostgreSQL Master Volumes - ## - extraVolumes: [] - ## Add sidecars to the pod - ## - ## For example: - ## sidecars: - ## - name: your-image-name - ## image: your-image - ## imagePullPolicy: Always - ## ports: - ## - name: portname - ## containerPort: 1234 - sidecars: [] - - ## Override the service configuration for master - ## - service: {} - # type: - # nodePort: - # clusterIP: - -## -## PostgreSQL Slave parameters -## -slave: - ## Node, affinity, tolerations, and priorityclass settings for pod assignment - ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector - ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity - ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature - ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption - nodeSelector: {} - affinity: {} - tolerations: [] - labels: {} - annotations: {} - podLabels: {} - podAnnotations: {} - priorityClassName: "" - extraInitContainers: | - # - name: do-something - # image: busybox - # command: ['do', 'something'] - ## Additional PostgreSQL Slave Volume mounts - ## - extraVolumeMounts: [] - ## Additional PostgreSQL Slave Volumes - ## - extraVolumes: [] - ## Add sidecars to the pod - ## - ## For example: - ## sidecars: - ## - name: your-image-name - ## image: your-image - ## imagePullPolicy: Always - ## ports: - ## - name: portname - ## containerPort: 1234 - sidecars: [] - - ## Override the service configuration for slave - ## - service: {} - # service: - # type: - # nodePort: 30011 - # clusterIP: - -## Configure resource requests and limits -## ref: http://kubernetes.io/docs/user-guide/compute-resources/ -## -resources: - limits: - memory: 500Mi - cpu: 50m - requests: - memory: 128Mi - cpu: 50m - -## Add annotations to all the deployed resources -## -commonAnnotiations: {} - -networkPolicy: - ## Enable creation of NetworkPolicy resources. Only Ingress traffic is filtered for now. - ## - enabled: false - - ## The Policy model to apply. When set to false, only pods with the correct - ## client label will have network access to the port PostgreSQL is listening - ## on. When true, PostgreSQL will accept connections from any source - ## (with the correct destination port). - ## - allowExternal: true - - ## if explicitNamespacesSelector is missing or set to {}, only client Pods that are in the networkPolicy's namespace - ## and that match other criteria, the ones that have the good label, can reach the DB. - ## But sometimes, we want the DB to be accessible to clients from other namespaces, in this case, we can use this - ## LabelSelector to select these namespaces, note that the networkPolicy's namespace should also be explicitly added. - ## - ## Example: - ## explicitNamespacesSelector: - ## matchLabels: - ## role: frontend - ## matchExpressions: - ## - {key: role, operator: In, values: [frontend]} - explicitNamespacesSelector: {} - -## Configure extra options for liveness and readiness probes -## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes) -livenessProbe: - enabled: true - initialDelaySeconds: 30 - periodSeconds: 10 - timeoutSeconds: 5 - failureThreshold: 6 - successThreshold: 1 - -readinessProbe: - enabled: true - initialDelaySeconds: 5 - periodSeconds: 10 - timeoutSeconds: 5 - failureThreshold: 6 - successThreshold: 1 - -## Configure metrics exporter -## -metrics: - enabled: false - # resources: {} - service: - type: ClusterIP - annotations: - prometheus.io/scrape: "true" - prometheus.io/port: "9187" - loadBalancerIP: - serviceMonitor: - enabled: false - additionalLabels: {} - # namespace: monitoring - # interval: 30s - # scrapeTimeout: 10s - ## Custom PrometheusRule to be defined - ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart - ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions - prometheusRule: - enabled: false - additionalLabels: {} - namespace: "" - ## These are just examples rules, please adapt them to your needs. - ## Make sure to constraint the rules to the current postgresql service. - ## rules: - ## - alert: HugeReplicationLag - ## expr: pg_replication_lag{service="{{ template "postgresql.fullname" . }}-metrics"} / 3600 > 1 - ## for: 1m - ## labels: - ## severity: critical - ## annotations: - ## description: replication for {{ template "postgresql.fullname" . }} PostgreSQL is lagging by {{ "{{ $value }}" }} hour(s). - ## summary: PostgreSQL replication is lagging by {{ "{{ $value }}" }} hour(s). - rules: [] - - image: - registry: docker.io - repository: bitnami/postgres-exporter - tag: 0.8.0-debian-10-r106 - pullPolicy: IfNotPresent - ## Optionally specify an array of imagePullSecrets. - ## Secrets must be manually created in the namespace. - ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - ## - # pullSecrets: - # - myRegistryKeySecretName - ## Define additional custom metrics - ## ref: https://github.com/wrouesnel/postgres_exporter#adding-new-metrics-via-a-config-file - # customMetrics: - # pg_database: - # query: "SELECT d.datname AS name, CASE WHEN pg_catalog.has_database_privilege(d.datname, 'CONNECT') THEN pg_catalog.pg_database_size(d.datname) ELSE 0 END AS size FROM pg_catalog.pg_database d where datname not in ('template0', 'template1', 'postgres')" - # metrics: - # - name: - # usage: "LABEL" - # description: "Name of the database" - # - size_bytes: - # usage: "GAUGE" - # description: "Size of the database in bytes" - ## Pod Security Context - ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ - ## - securityContext: - enabled: false - runAsUser: 1001 - ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes) - ## Configure extra options for liveness and readiness probes - livenessProbe: - enabled: true - initialDelaySeconds: 5 - periodSeconds: 10 - timeoutSeconds: 5 - failureThreshold: 6 - successThreshold: 1 - - readinessProbe: - enabled: true - initialDelaySeconds: 5 - periodSeconds: 10 - timeoutSeconds: 5 - failureThreshold: 6 - successThreshold: 1 diff --git a/tip-wlan/charts/zookeeper/Chart.yaml b/tip-wlan/charts/zookeeper/Chart.yaml deleted file mode 100644 index 54653c1..0000000 --- a/tip-wlan/charts/zookeeper/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v2 -name: zookeeper -version: 0.1.0 -appVersion: 1.0.0 -description: Centralized service for maintaining configuration information, naming, - providing distributed synchronization, and providing group services. diff --git a/tip-wlan/charts/zookeeper/templates/_helpers.tpl b/tip-wlan/charts/zookeeper/templates/_helpers.tpl deleted file mode 100644 index ecab98d..0000000 --- a/tip-wlan/charts/zookeeper/templates/_helpers.tpl +++ /dev/null @@ -1,20 +0,0 @@ -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "zookeeper.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -The name of the zookeeper headless service. -*/}} -{{- define "zookeeper.headless" -}} -{{- printf "%s-headless" (include "common.fullname" .) | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -The name of the zookeeper chroots job. -*/}} -{{- define "zookeeper.chroots" -}} -{{- printf "%s-chroots" (include "common.fullname" .) | trunc 63 | trimSuffix "-" -}} -{{- end -}} diff --git a/tip-wlan/charts/zookeeper/templates/config-script.yaml b/tip-wlan/charts/zookeeper/templates/config-script.yaml deleted file mode 100644 index d780703..0000000 --- a/tip-wlan/charts/zookeeper/templates/config-script.yaml +++ /dev/null @@ -1,111 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ template "zookeeper.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - component: server -data: - ok: | - #!/bin/sh - zkServer.sh status - - ready: | - #!/bin/sh - echo ruok | nc 127.0.0.1 ${1:-2181} - - run: | - #!/bin/bash - - set -a - ROOT=$(echo /apache-zookeeper-*) - - ZK_USER=${ZK_USER:-"zookeeper"} - ZK_LOG_LEVEL=${ZK_LOG_LEVEL:-"INFO"} - ZK_DATA_DIR=${ZK_DATA_DIR:-"/data"} - ZK_DATA_LOG_DIR=${ZK_DATA_LOG_DIR:-"/data/log"} - ZK_CONF_DIR=${ZK_CONF_DIR:-"/conf"} - ZK_CLIENT_PORT=${ZK_CLIENT_PORT:-2181} - ZK_SERVER_PORT=${ZK_SERVER_PORT:-2888} - ZK_ELECTION_PORT=${ZK_ELECTION_PORT:-3888} - ZK_TICK_TIME=${ZK_TICK_TIME:-2000} - ZK_INIT_LIMIT=${ZK_INIT_LIMIT:-10} - ZK_SYNC_LIMIT=${ZK_SYNC_LIMIT:-5} - ZK_HEAP_SIZE=${ZK_HEAP_SIZE:-2G} - ZK_MAX_CLIENT_CNXNS=${ZK_MAX_CLIENT_CNXNS:-60} - ZK_MIN_SESSION_TIMEOUT=${ZK_MIN_SESSION_TIMEOUT:- $((ZK_TICK_TIME*2))} - ZK_MAX_SESSION_TIMEOUT=${ZK_MAX_SESSION_TIMEOUT:- $((ZK_TICK_TIME*20))} - ZK_SNAP_RETAIN_COUNT=${ZK_SNAP_RETAIN_COUNT:-3} - ZK_PURGE_INTERVAL=${ZK_PURGE_INTERVAL:-0} - ID_FILE="$ZK_DATA_DIR/myid" - ZK_CONFIG_FILE="$ZK_CONF_DIR/zoo.cfg" - LOG4J_PROPERTIES="$ZK_CONF_DIR/log4j.properties" - HOST=$(hostname) - DOMAIN=`hostname -d` - JVMFLAGS="-Xmx$ZK_HEAP_SIZE -Xms$ZK_HEAP_SIZE" - - APPJAR=$(echo $ROOT/*jar) - CLASSPATH="${ROOT}/lib/*:${APPJAR}:${ZK_CONF_DIR}:" - - if [[ $HOST =~ (.*)-([0-9]+)$ ]]; then - NAME=${BASH_REMATCH[1]} - ORD=${BASH_REMATCH[2]} - MY_ID=$((ORD+1)) - else - echo "Failed to extract ordinal from hostname $HOST" - exit 1 - fi - - mkdir -p $ZK_DATA_DIR - mkdir -p $ZK_DATA_LOG_DIR - echo $MY_ID >> $ID_FILE - - echo "clientPort=$ZK_CLIENT_PORT" >> $ZK_CONFIG_FILE - echo "dataDir=$ZK_DATA_DIR" >> $ZK_CONFIG_FILE - echo "dataLogDir=$ZK_DATA_LOG_DIR" >> $ZK_CONFIG_FILE - echo "tickTime=$ZK_TICK_TIME" >> $ZK_CONFIG_FILE - echo "initLimit=$ZK_INIT_LIMIT" >> $ZK_CONFIG_FILE - echo "syncLimit=$ZK_SYNC_LIMIT" >> $ZK_CONFIG_FILE - echo "maxClientCnxns=$ZK_MAX_CLIENT_CNXNS" >> $ZK_CONFIG_FILE - echo "minSessionTimeout=$ZK_MIN_SESSION_TIMEOUT" >> $ZK_CONFIG_FILE - echo "maxSessionTimeout=$ZK_MAX_SESSION_TIMEOUT" >> $ZK_CONFIG_FILE - echo "autopurge.snapRetainCount=$ZK_SNAP_RETAIN_COUNT" >> $ZK_CONFIG_FILE - echo "autopurge.purgeInterval=$ZK_PURGE_INTERVAL" >> $ZK_CONFIG_FILE - echo "4lw.commands.whitelist=*" >> $ZK_CONFIG_FILE - - for (( i=1; i<=$ZK_REPLICAS; i++ )) - do - echo "server.$i=$NAME-$((i-1)).$DOMAIN:$ZK_SERVER_PORT:$ZK_ELECTION_PORT" >> $ZK_CONFIG_FILE - done - - rm -f $LOG4J_PROPERTIES - - echo "zookeeper.root.logger=$ZK_LOG_LEVEL, CONSOLE" >> $LOG4J_PROPERTIES - echo "zookeeper.console.threshold=$ZK_LOG_LEVEL" >> $LOG4J_PROPERTIES - echo "zookeeper.log.threshold=$ZK_LOG_LEVEL" >> $LOG4J_PROPERTIES - echo "zookeeper.log.dir=$ZK_DATA_LOG_DIR" >> $LOG4J_PROPERTIES - echo "zookeeper.log.file=zookeeper.log" >> $LOG4J_PROPERTIES - echo "zookeeper.log.maxfilesize=256MB" >> $LOG4J_PROPERTIES - echo "zookeeper.log.maxbackupindex=10" >> $LOG4J_PROPERTIES - echo "zookeeper.tracelog.dir=$ZK_DATA_LOG_DIR" >> $LOG4J_PROPERTIES - echo "zookeeper.tracelog.file=zookeeper_trace.log" >> $LOG4J_PROPERTIES - echo "log4j.rootLogger=\${zookeeper.root.logger}" >> $LOG4J_PROPERTIES - echo "log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender" >> $LOG4J_PROPERTIES - echo "log4j.appender.CONSOLE.Threshold=\${zookeeper.console.threshold}" >> $LOG4J_PROPERTIES - echo "log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout" >> $LOG4J_PROPERTIES - echo "log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} [myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n" >> $LOG4J_PROPERTIES - - if [ -n "$JMXDISABLE" ] - then - MAIN=org.apache.zookeeper.server.quorum.QuorumPeerMain - else - MAIN="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=$JMXPORT -Dcom.sun.management.jmxremote.authenticate=$JMXAUTH -Dcom.sun.management.jmxremote.ssl=$JMXSSL -Dzookeeper.jmx.log4j.disable=$JMXLOG4J org.apache.zookeeper.server.quorum.QuorumPeerMain" - fi - - set -x - exec java -cp "$CLASSPATH" $JVMFLAGS $MAIN $ZK_CONFIG_FILE diff --git a/tip-wlan/charts/zookeeper/templates/service-headless.yaml b/tip-wlan/charts/zookeeper/templates/service-headless.yaml deleted file mode 100644 index 2f231fb..0000000 --- a/tip-wlan/charts/zookeeper/templates/service-headless.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ template "zookeeper.headless" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ template "zookeeper.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -{{- if .Values.headless.annotations }} - annotations: -{{ .Values.headless.annotations | toYaml | trimSuffix "\n" | indent 4 }} -{{- end }} -spec: - clusterIP: None - ports: -{{- range $key, $port := .Values.ports }} - - name: {{ $key }} - port: {{ $port.containerPort }} - targetPort: {{ $key }} - protocol: {{ $port.protocol }} -{{- end }} - selector: - app: {{ template "common.name" . }} - release: {{ .Release.Name }} diff --git a/tip-wlan/charts/zookeeper/templates/service.yaml b/tip-wlan/charts/zookeeper/templates/service.yaml deleted file mode 100644 index 3802090..0000000 --- a/tip-wlan/charts/zookeeper/templates/service.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ template "zookeeper.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -{{- if .Values.service.annotations }} - annotations: -{{- with .Values.service.annotations }} -{{ toYaml . | indent 4 }} -{{- end }} -{{- end }} -spec: - type: {{ .Values.service.type }} - ports: - {{- range $key, $value := .Values.service.ports }} - - name: {{ $key }} -{{ toYaml $value | indent 6 }} - {{- end }} - selector: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} diff --git a/tip-wlan/charts/zookeeper/templates/statefulset.yaml b/tip-wlan/charts/zookeeper/templates/statefulset.yaml deleted file mode 100644 index dd5e63d..0000000 --- a/tip-wlan/charts/zookeeper/templates/statefulset.yaml +++ /dev/null @@ -1,160 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ include "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - component: server -spec: - serviceName: {{ template "zookeeper.headless" . }} - replicas: {{ .Values.replicaCount }} - selector: - matchLabels: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} - component: server - updateStrategy: -{{ toYaml .Values.updateStrategy | indent 4 }} - template: - metadata: - labels: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} - component: server - {{- if .Values.podLabels }} - ## Custom pod labels - {{- range $key, $value := .Values.podLabels }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- end }} -{{- if .Values.podAnnotations }} - annotations: - ## Custom pod annotations - {{- range $key, $value := .Values.podAnnotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} -{{- end }} - spec: - terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }} -{{- if .Values.schedulerName }} - schedulerName: "{{ .Values.schedulerName }}" -{{- end }} - securityContext: -{{ toYaml .Values.securityContext | indent 8 }} -{{- if .Values.priorityClassName }} - priorityClassName: "{{ .Values.priorityClassName }}" -{{- end }} - containers: - - name: zookeeper - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy | default .Values.global.pullPolicy }} - {{- with .Values.command }} - command: {{ range . }} - - {{ . | quote }} - {{- end }} - {{- end }} - ports: -{{- range $key, $port := .Values.ports }} - - name: {{ $key }} -{{ toYaml $port | indent 14 }} -{{- end }} - livenessProbe: - exec: - command: - - sh - - /config-scripts/ok - initialDelaySeconds: 20 - periodSeconds: 30 - timeoutSeconds: 5 - failureThreshold: 2 - successThreshold: 1 - readinessProbe: - exec: - command: - - sh - - /config-scripts/ready - initialDelaySeconds: 20 - periodSeconds: 30 - timeoutSeconds: 5 - failureThreshold: 2 - successThreshold: 1 - env: - - name: ZK_REPLICAS - value: {{ .Values.replicaCount | quote }} - {{- range $key, $value := .Values.env }} - - name: {{ $key | upper | replace "." "_" }} - value: {{ $value | quote }} - {{- end }} - {{- range $secret := .Values.secrets }} - {{- range $key := $secret.keys }} - - name: {{ (print $secret.name "_" $key) | upper }} - valueFrom: - secretKeyRef: - name: {{ $secret.name }} - key: {{ $key }} - {{- end }} - {{- end }} - resources: -{{ toYaml .Values.resources | indent 12 }} - volumeMounts: - - name: data - mountPath: /data - {{- range $secret := .Values.secrets }} - {{- if $secret.mountPath }} - {{- range $key := $secret.keys }} - - name: {{ $.Release.Name }}-{{ $secret.name }} - mountPath: {{ $secret.mountPath }}/{{ $key }} - subPath: {{ $key }} - readOnly: true - {{- end }} - {{- end }} - {{- end }} - - name: config - mountPath: /config-scripts - {{- with .Values.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} - volumes: - - name: config - configMap: - name: {{ include "common.fullname" . }} - defaultMode: 0555 - {{- range .Values.secrets }} - - name: {{ $.Release.Name }}-{{ .name }} - secret: - secretName: {{ .name }} - {{- end }} - {{- if not .Values.persistence.enabled }} - - name: data - emptyDir: {} - {{- end }} - {{- if .Values.persistence.enabled }} - volumeClaimTemplates: - - metadata: - name: data - spec: - accessModes: - - {{ .Values.persistence.accessMode | quote }} - resources: - requests: - storage: {{ .Values.persistence.size | quote }} - {{- if .Values.persistence.storageClass }} - {{- if (eq "-" .Values.persistence.storageClass) }} - storageClassName: "" - {{- else }} - storageClassName: "{{ .Values.persistence.storageClass }}" - {{- end }} - {{- end }} - {{- end }} diff --git a/tip-wlan/charts/zookeeper/values.yaml b/tip-wlan/charts/zookeeper/values.yaml deleted file mode 100644 index 5d5d3e5..0000000 --- a/tip-wlan/charts/zookeeper/values.yaml +++ /dev/null @@ -1,167 +0,0 @@ -## As weighted quorums are not supported, it is imperative that an odd number of replicas -## be chosen. Moreover, the number of replicas should be either 1, 3, 5, or 7. -## -## ref: https://github.com/kubernetes/contrib/tree/master/statefulsets/zookeeper#stateful-set -replicaCount: 1 # Desired quantity of ZooKeeper pods. This should always be (1,3,5, or 7) - -podDisruptionBudget: - maxUnavailable: 1 # Limits how many Zokeeper pods may be unavailable due to voluntary disruptions. - -terminationGracePeriodSeconds: 1800 # Duration in seconds a Zokeeper pod needs to terminate gracefully. - -updateStrategy: - type: RollingUpdate - -## refs: -## - https://github.com/kubernetes/contrib/tree/master/statefulsets/zookeeper -## - https://github.com/kubernetes/contrib/blob/master/statefulsets/zookeeper/Makefile#L1 -image: - repository: zookeeper # Container image repository for zookeeper container. - tag: 3.5.5 # Container image tag for zookeeper container. - pullPolicy: Always # Image pull criteria for zookeeper container. - -service: - type: ClusterIP # Exposes zookeeper on a cluster-internal IP. - annotations: {} # Arbitrary non-identifying metadata for zookeeper service. - ## AWS example for use with LoadBalancer service type. - # external-dns.alpha.kubernetes.io/hostname: zookeeper.cluster.local - # service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled: "true" - # service.beta.kubernetes.io/aws-load-balancer-internal: "true" - ports: - client: - port: 2181 # Service port number for client port. - targetPort: client # Service target port for client port. - protocol: TCP # Service port protocol for client port. - -## Headless service. -## -headless: - annotations: {} - -ports: - client: - containerPort: 2181 # Port number for zookeeper container client port. - protocol: TCP # Protocol for zookeeper container client port. - election: - containerPort: 3888 # Port number for zookeeper container election port. - protocol: TCP # Protocol for zookeeper container election port. - server: - containerPort: 2888 # Port number for zookeeper container server port. - protocol: TCP # Protocol for zookeeper container server port. - -resources: - limits: - cpu: 500m - memory: 1Gi - requests: - cpu: 50m - memory: 700Mi - -priorityClassName: "" - -nodeSelector: {} # Node label-values required to run zookeeper pods. - -tolerations: [] # Node taint overrides for zookeeper pods. - -affinity: {} # Criteria by which pod label-values influence scheduling for zookeeper pods. - # podAntiAffinity: - # requiredDuringSchedulingIgnoredDuringExecution: - # - topologyKey: "kubernetes.io/hostname" - # labelSelector: - # matchLabels: - # release: zookeeper - -podAnnotations: {} # Arbitrary non-identifying metadata for zookeeper pods. - # prometheus.io/scrape: "true" - # prometheus.io/path: "/metrics" - # prometheus.io/port: "9141" - -podLabels: {} # Key/value pairs that are attached to zookeeper pods. - # team: "developers" - # service: "zookeeper" - -securityContext: - fsGroup: 1000 - runAsUser: 1000 - -## Useful, if you want to use an alternate image. -command: - - /bin/bash - - -xec - - /config-scripts/run - -## Useful if using any custom authorizer. -## Pass any secrets to the kafka pods. Each secret will be passed as an -## environment variable by default. The secret can also be mounted to a -## specific path (in addition to environment variable) if required. Environment -## variable names are generated as: `_` (All upper case) -# secrets: -# - name: myKafkaSecret -# keys: -# - username -# - password -# # mountPath: /opt/kafka/secret -# - name: myZkSecret -# keys: -# - user -# - pass -# mountPath: /opt/zookeeper/secret - -persistence: - enabled: false - ## If defined, PVC must be created manually before volume will be bound - ## existingClaim: opensync-wifi-controller-zookeeper-data - ## volumeReclaimPolicy: Retain - ## If you want to bind to an existing PV, uncomment below with the pv name - ## and comment storageClass and belowannotation - ## volumeName: pvc-dc52b290-ae86-4cb3-aad0-f2c806a23114 - - ## zookeeper data Persistent Volume Storage Class - ## If defined, storageClassName: - ## If set to "-", storageClassName: "", which disables dynamic provisioning - ## If undefined (the default) or set to null, no storageClassName spec is - ## set, choosing the default provisioner. (gp2 on AWS, standard on - ## GKE, AWS & OpenStack) - ## - storageClass: "-" - accessMode: ReadWriteOnce - size: 1Gi - -## Use an alternate scheduler, e.g. "stork". -## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ -## -# schedulerName: - -## ref: https://github.com/kubernetes/contrib/tree/master/statefulsets/zookeeper -env: - - ## Options related to JMX exporter. - ## ref: https://github.com/apache/zookeeper/blob/master/bin/zkServer.sh#L36 - JMXAUTH: "false" - JMXDISABLE: "false" - JMXPORT: 1099 - JMXSSL: "false" - - ## The port on which the server will accept client requests. - ZOO_PORT: 2181 - - ## The number of Ticks that an ensemble member is allowed to perform leader - ## election. - ZOO_INIT_LIMIT: 5 - - ZOO_TICK_TIME: 2000 - - ## The maximum number of concurrent client connections that - ## a server in the ensemble will accept. - ZOO_MAX_CLIENT_CNXNS: 60 - - ## The number of Tick by which a follower may lag behind the ensembles leader. - ZK_SYNC_LIMIT: 10 - - ## The number of wall clock ms that corresponds to a Tick for the ensembles - ## internal time. - ZK_TICK_TIME: 2000 - - ZOO_AUTOPURGE_PURGEINTERVAL: 0 - ZOO_AUTOPURGE_SNAPRETAINCOUNT: 3 - ZOO_STANDALONE_ENABLED: false diff --git a/tip-wlan/resources/certs/.gitkeep b/tip-wlan/resources/certs/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/tip-wlan/resources/environments/dev-amazon-tip.yaml b/tip-wlan/resources/environments/dev-amazon-tip.yaml index f1e9a41..7be4133 100644 --- a/tip-wlan/resources/environments/dev-amazon-tip.yaml +++ b/tip-wlan/resources/environments/dev-amazon-tip.yaml @@ -1,48 +1,21 @@ -# This is a development override file. -# It overrides the default Tip-Wlan parent chart behaviour -# -# It can be tweaked, based on the need to support different -# dev environments. -# This file expects to have a GlusterFS storage solution running -# before "helm install" is performed. -################################################################# -# Global configuration overrides. -# -# These overrides will affect all helm charts (ie. applications) -# that are listed below and are 'enabled'. -################################################################# global: - # Change to an unused port prefix range to prevent port conflicts - # with other instances running within the same k8s cluster nodePortPrefix: 302 nodePortPrefixExt: 304 - nsPrefix: tip - # image pull policy + pullPolicy: Always - repository: tip-tip-wlan-cloud-docker-repo.jfrog.io - # override default mount path root directory - # referenced by persistent volumes and log files - persistence: - # flag to enable debugging - application support required - debugEnabled: true + integratedDeployment: + testingEnabled: -# Annotations for namespace +dockerRegistrySecret: ewoJImF1dGhzIjogewoJCSJ0aXAtdGlwLXdsYW4tY2xvdWQtZG9ja2VyLXJlcG8uamZyb2cuaW8iOiB7CgkJCSJhdXRoIjogImRHbHdMWEpsWVdRNmRHbHdMWEpsWVdRPSIKCQl9Cgl9LAoJIkh0dHBIZWFkZXJzIjogewoJCSJVc2VyLUFnZW50IjogIkRvY2tlci1DbGllbnQvMTkuMDMuOCAobGludXgpIgoJfQp9 annotations: { "helm.sh/resource-policy": keep } -#createReleaseNamespace: false - -# Docker registry secret -dockerRegistrySecret: ewoJImF1dGhzIjogewoJCSJ0aXAtdGlwLXdsYW4tY2xvdWQtZG9ja2VyLXJlcG8uamZyb2cuaW8iOiB7CgkJCSJhdXRoIjogImRHbHdMWEpsWVdRNmRHbHdMWEpsWVdRPSIKCQl9Cgl9LAoJIkh0dHBIZWFkZXJzIjogewoJCSJVc2VyLUFnZW50IjogIkRvY2tlci1DbGllbnQvMTkuMDMuOCAobGludXgpIgoJfQp9 -################################################################# -# Enable/disable and configure helm charts (ie. applications) -# to customize the TIP-WLAN deployment. -################################################################# opensync-gw-static: enabled: false + common: efs-provisioner: enabled: true @@ -50,7 +23,8 @@ common: efsFileSystemId: fs-49a5104c awsRegion: us-west-2 efsDnsName: fs-49a5104c.efs.us-west-2.amazonaws.com - storageClass: aws-efs + storageClass: aws-efs + opensync-gw-cloud: enabled: true externalhost: @@ -60,17 +34,20 @@ opensync-gw-cloud: persistence: enabled: false filestore: - url: "https://wlan-filestore.demo.lab.wlan.tip.build" + url: https://wlan-filestore.demo.lab.wlan.tip.build + opensync-mqtt-broker: enabled: true replicaCount: 1 persistence: enabled: true - storageClass: "gp2" + storageClass: gp2 + wlan-cloud-graphql-gw: enabled: true env: portalsvc: wlan-portal-svc.demo.lab.wlan.tip.build + wlan-cloud-static-portal: enabled: true env: @@ -81,12 +58,14 @@ wlan-cloud-static-portal: paths: [ / ] + wlan-portal-service: enabled: true persistence: enabled: true storageClass: aws-efs filestoreSize: 10Gi + wlan-prov-service: enabled: true creds: @@ -99,6 +78,7 @@ wlan-prov-service: schema_repo: username: tip-read password: tip-read + wlan-ssc-service: enabled: true creds: @@ -111,12 +91,14 @@ wlan-ssc-service: schema_repo: username: tip-read password: tip-read + wlan-spc-service: enabled: true creds: sslKeyPassword: mypassword sslKeystorePassword: mypassword sslTruststorePassword: mypassword + wlan-port-forwarding-gateway-service: enabled: true creds: @@ -124,49 +106,130 @@ wlan-port-forwarding-gateway-service: externallyVisible: host: api.wlan.demo.lab.wlan.tip.build port: 30401 + nginx-ingress-controller: enabled: true controller: config: - externalStatusAddress: "api.wlan.demo.lab.wlan.tip.build" -zookeeper: - enabled: true - replicaCount: 1 - persistence: - enabled: true - storageClass: "gp2" + externalStatusAddress: api.wlan.demo.lab.wlan.tip.build + kafka: enabled: true replicaCount: 1 + image: + debug: true + auth: + clientProtocol: mtls + interBrokerProtocol: tls + jksSecret: tip-common-kafka-certs + jksPassword: mypassword + tlsEndpointIdentificationAlgorithm: "" + jaas: + clientUsers: + - brokerUser + clientPassword: + - brokerPassword + extraEnvVars: + - name: KAFKA_CFG_SSL_KEYSTORE_TYPE + value: PKCS12 + allowPlaintextListener: true persistence: enabled: true - storageClass: "gp2" + storageClass: gp2 + metrics: + serviceMonitor: + enabled: false + namespace: monitoring + selector: + release: prometheus-operator + zookeeper: + enabled: true + persistence: + enabled: true + cassandra: enabled: true - config: - replicaCount: 3 - seedCount: 2 + tlsEncryptionSecretName: tip-common-cassandra-certs + image: + debug: true persistence: enabled: true - storageClass: "gp2" + storageClass: gp2 + replicaCount: 1 + cluster: + name: TipWlanCluster + seedCount: 1 + internodeEncryption: all + clientEncryption: true + exporter: + enabled: false + serviceMonitor: + enabled: false + additionalLabels: + release: prometheus-operator + dbUser: + user: cassandra + password: cassandra resources: + limits: {} requests: - cpu: 500m - memory: 2Gi - limits: - cpu: 1000m - memory: 4Gi + cpu: 1 + memory: 3Gi + postgresql: enabled: true + postgresqlDatabase: tip + image: + debug: true + metrics: + enabled: false + serviceMonitor: + enabled: falsea + namespace: monitoring + additionalLabels: + release: prometheus-operator + postgresqlUsername: postgres postgresqlPassword: postgres -## NOTE: If we are using glusterfs as Storage class, we don't really need -## replication turned on, since the data is anyway replicated on glusterfs nodes -## Replication is useful: -## a. When we use HostPath as storage mechanism -## b. If master goes down and one of the slave is promoted as master + pgHbaConfiguration: | + hostssl replication repl_user 0.0.0.0/0 md5 clientcert=0 + hostssl postgres postgres 0.0.0.0/0 cert clientcert=1 + hostssl postgres postgres ::/0 cert clientcert=1 + hostssl all all 0.0.0.0/0 md5 clientcert=1 replication: enabled: true + user: repl_user + password: repl_password slaveReplicas: 1 persistence: enabled: true - storageClass: "gp2" \ No newline at end of file + storageClass: gp2 + volumePermissions: + enabled: true + livenessProbe: + enabled: false + readinessProbe: + enabled: false + tls: + enabled: true + certificatesSecret: tip-common-postgres-certs + certFilename: cert.crt + certKeyFilename: cert.key + certCAFilename: cacert.pem + initdbScriptsConfigMap: tip-common-postgres-scripts + extraEnv: + - name: PGSSLCERT + value: /opt/tip-wlan/certs/postgresclientcert.pem + - name: PGSSLKEY + value: /opt/tip-wlan/certs/postgresclientkey_dec.pem + - name: PGSSLROOTCERT + value: /opt/tip-wlan/certs/cacert.pem + primary: + extraInitContainers: + - command: [ "sh", "-c", "chmod 0600 /opt/bitnami/postgresql/certs/postgresclientkey_dec.pem" ] + image: busybox:latest + name: chmod-client-cert-additional + securityContext: + runAsUser: 0 + volumeMounts: + - mountPath: /opt/bitnami/postgresql/certs + name: postgresql-certificates diff --git a/tip-wlan/resources/environments/dev-docker-on-windows.yaml b/tip-wlan/resources/environments/dev-docker-on-windows.yaml new file mode 100644 index 0000000..c161ebf --- /dev/null +++ b/tip-wlan/resources/environments/dev-docker-on-windows.yaml @@ -0,0 +1,295 @@ +global: + nodePortPrefix: 302 + nodePortPrefixExt: 304 + + pullPolicy: Always + repository: tip-tip-wlan-cloud-docker-repo.jfrog.io + + integratedDeployment: false + testingEnabled: + kafka: + image: confluentinc/cp-kafka:5.0.1 + port: 9092 + topics: + - name: wlan_service_metrics + partitions: 1 + replicationFactor: 1 + - name: system_events + partitions: 1 + replicationFactor: 1 + - name: customer_events + partitions: 1 + replicationFactor: 1 + creds: + sslKeyPassword: mypassword + sslKeystorePassword: mypassword + sslTruststorePassword: mypassword + +dockerRegistrySecret: ewoJImF1dGhzIjogewoJCSJ0aXAtdGlwLXdsYW4tY2xvdWQtZG9ja2VyLXJlcG8uamZyb2cuaW8iOiB7CgkJCSJhdXRoIjogImRHbHdMWEpsWVdRNmRHbHdMWEpsWVdRPSIKCQl9Cgl9LAoJIkh0dHBIZWFkZXJzIjogewoJCSJVc2VyLUFnZW50IjogIkRvY2tlci1DbGllbnQvMTkuMDMuOCAobGludXgpIgoJfQp9 +annotations: { + "helm.sh/resource-policy": keep +} + +common: + efs-provisioner: + enabled: false + +opensync-gw-static: + enabled: false + +opensync-gw-cloud: + service: + type: LoadBalancer + enabled: true + externalhost: + address: + ovsdb: opensync-controller.wlan.local + mqtt: opensync-mqtt-broker.wlan.local + persistence: + enabled: true + filestore: + url: "https://wlan-filestore.wlan.local" + +opensync-mqtt-broker: + enabled: true + service: + type: LoadBalancer + replicaCount: 1 + persistence: + enabled: true + storageClass: hostpath +wlan-cloud-graphql-gw: + enabled: true + ingress: + enabled: true + hosts: + - host: wlan-graphql.wlan.local + paths: [ + / + ] + tls: + - hosts: + - wlan-graphql.wlan.local + secretName: nginx-ingress-controller-default-server-secret + env: + portalsvc: tip-wlan-portal-service:9051 + +wlan-cloud-static-portal: + enabled: true + env: + graphql: https://wlan-graphql.wlan.local + service: + type: NodePort + ingress: + hosts: + - host: wlan-ui.wlan.local + paths: [ + / + ] + tls: + - hosts: + - wlan-ui.wlan.local + secretName: nginx-ingress-controller-default-server-secret + +wlan-portal-service: + service: + type: NodePort + nodePort_static: false + enabled: true + persistence: + enabled: true + storageClass: hostpath + accessMode: ReadWriteOnce + filestoreSize: 10Gi + tsp: + host: wlan-portal-svc.wlan.local + ingress: + enabled: true + hosts: + - host: wlan-portal-svc.wlan.local + paths: [ + / + ] + tls: + - hosts: + - wlan-portal-svc.wlan.local + secretName: nginx-ingress-controller-default-server-secret + +wlan-prov-service: + enabled: true + creds: + enabled: true + db: + postgresUser: + password: postgres + tipUser: + password: tip_password + schema_repo: + username: tip-read + password: tip-read + postgres: + singleDataSourceUsername: tip_user + singleDataSourcePassword: tip_password + singleDataSourceSslKeyPassword: mypassword + +wlan-ssc-service: + enabled: true + creds: + sslKeyPassword: mypassword + sslKeystorePassword: mypassword + sslTruststorePassword: mypassword + cassandra: + tip_user: tip_user + tip_password: tip_password + schema_repo: + username: tip-read + password: tip-read + +wlan-spc-service: + enabled: true + creds: + sslKeyPassword: mypassword + sslKeystorePassword: mypassword + sslTruststorePassword: mypassword + +wlan-port-forwarding-gateway-service: + enabled: true + creds: + websocketSessionTokenEncKey: MyToKeN0MyToKeN1 + externallyVisible: + host: api.wlan.local + port: 30401 + +nginx-ingress-controller: + enabled: true + controller: + nginxDebug: true + service: + type: LoadBalancer + defaultTLS: + cert: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZXakNDQTBLZ0F3SUJBZ0lVUU5hUC9zcHZSSHRCVEFLd1lSTndieFJmRkFzd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0hURWJNQmtHQTFVRUF3d1NkMnhoYmkxMWFTNTNiR0Z1TG14dlkyRnNNQjRYRFRJd01EZ3lOekl3TWpZMQpObG9YRFRNd01EZ3lOVEl3TWpZMU5sb3dIVEViTUJrR0ExVUVBd3dTZDJ4aGJpMTFhUzUzYkdGdUxteHZZMkZzCk1JSUNJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBZzhBTUlJQ0NnS0NBZ0VBd1JhZ2lEV3pDTllCdFd3QmNLK2YKVGtrUW1NdCtRQWdUallyMEtTOERQSkNKZjZLa1BmWkhDdTN3NEx2cnh6WTlObWllaDJYVTgzNGFtZEp4SXVDdwo2SWJObzZ6c2tqc3lmb084d0ZEbWxMVldMZWc1SDlHOWRvZW0rV1RlS1BhRUhpM29xdXpOZ3Q2d0xzM212dk9BClR2aVRJb2M4OEVMams0ZFNSMlQ0ZGhoMHFLQ0NqK0hkWEJBNlYvOWJpcnUralYrL2t4RVF1TDJ6TTM5RHZWZDgKOWtzMzV6TVZVemUzNmxENElDT25sN2hnYVROQmk0NU85c2RMRDBZYVVtamlGd1FsdEpVZG1QS3BhQWRidmpVTwpuc3VwbkRZam0rVW0rOWFFcHFNNHRlMjNlZkM4TjhqMXVrZXh6SnJFMkdlRi9XQi9ZMUxGSUcyd2pxVm5zUGNzCm5GRjRZZDlFQlJSbmUxRVplWEJ1M0ZFTEZ5NmxDT0hJMTQ2b0JjYy9JYjYxN3JkVEtYcXh0di8yTkw2L1RxRmsKbnMvRUVqdmU2a1FZemxCWndXSFdwWndRZmczbW82TmFvRlpwVGFnOThNeXU1clpvT29mVGN4WEg2cExtNVB4MQpPQXpnTG5hOU8rMkZtQTRGanJnSGNNWTFOSXp5blpMK0RIOGZpYnQxRi92MkYyTUErUjl2bzg0dlI1Uk9HTmRECnZhMkFwZXZrTGNqUWcvTHdzWHYwZ1RvcFEvWEl6ZWpoNmJkVWtPcktTd0p6VDJDOS9lOUdRbjBncHBWOExCdUsKMXpRSG9ST0xuQTQxTUNGdlFMUUhvK1h0OEtHdytVYmFseTZoT3hCWkY1MUwvQmJxamtESDlBRUZhSkxwdGlFeQpxbjFFNXYrM3doZ0ZTNUlaVDhJVzV1VUNBd0VBQWFPQmtUQ0JqakFkQmdOVkhRNEVGZ1FVeTJiQVV5TlBYSFM5CjNWVFNEK3dvTjd0M3E4RXdId1lEVlIwakJCZ3dGb0FVeTJiQVV5TlBYSFM5M1ZUU0Qrd29ON3QzcThFd0R3WUQKVlIwVEFRSC9CQVV3QXdFQi96QTdCZ05WSFJFRU5EQXlnaHAzYkdGdUxYVnBMV2R5WVhCb2NXd3VkMnhoYmk1cwpiMk5oYklJT1lYQnBMbmRzWVc0dWJHOWpZV3lIQk1Db0FBRXdEUVlKS29aSWh2Y05BUUVMQlFBRGdnSUJBS0grCmJxSmVlMTFuMzRTWWdCRHZnb1o4bEpMUVJ3c0ZucUV4Y1NyL3BsWjdHVklHRkg1L1EyS3lvOVZ5RWlUUHdySXMKS3NFckMxZXZINnh0MVVSZk16cDA1elZRMExZTTUra3NhbVJEYWdBZzNNMWNtN29LT2Rtcy9kcXpQZTJnWmZHSgpwVmR0VlcxQ0hyTDBSTFRSOTNoN2tnU2lCbFNFSVlNb2VLZk41SDlBYXZKNEtyeXlnUXM2M2trR1E1TTllc0FwCnU2YkIzMDd6eWZ6Z1MzdG1Rc1UwMXJnSmZoRUhRL1krQWs5d0R1T2d2bWZ4MFRXZ0FPR2JLcTZUdThNS1lkZWoKSWU3clYxRzVVdjdLZmdvelZYNzZnMktkblRWQmZzcFNLbzN6eXJaa2NrekFwdlV1OUllZkhkVG9lNEpNRVUweQpmazdsRVUvZXh6Qnl5TnhwKzZoZHUvWklnM3hiMXlBMW9WWThORWQxckwxekFWaVBlMzUxU0VORUtlSnBSYW5DCmtDTDNSQUZrYnhRN0loYWNqb3g4YmVsUitnbW84Y3lGWnBqOVhhb1BsU0ZTY2R3ejU3M0NUMGg5N3Y3NkE3c3cKeUMrQ2lTcDg1Z1dFVjV2Z0JpdE5KN1I5b25qQmRzdUgybGdFdE1EM0pOT3M4Y0NTUmloWXhyaXdaU3FoVDdvLwp0Y0lsY0o4NFc1bTZYNnpISjNHbXR1S0czUVBOT21zMC9WVm9EVHA5cWRwTCtFazE3dUIyQTQxTnB4ejNVUytsCjZ5SytwZFFRajdBTHpLdVJmT3lnODBYYk53MnY0U25wSTVxYlhGQlJ1bTUyZjg2c1BlbUZxMUtjdU5XZTRFVkMKeERHM2VLbHUrZGxsVXRLeC9QTjZ5ZmxiVDV4Y0dnY2Rtcnd6UmFXUwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== + key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUpRUUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQ1Nzd2dna25BZ0VBQW9JQ0FRREJGcUNJTmJNSTFnRzEKYkFGd3I1OU9TUkNZeTM1QUNCT05pdlFwTHdNOGtJbC9vcVE5OWtjSzdmRGd1K3ZITmowMmFKNkhaZFR6ZmhxWgowbkVpNExEb2hzMmpyT3lTT3pKK2c3ekFVT2FVdFZZdDZEa2YwYjEyaDZiNVpONG85b1FlTGVpcTdNMkMzckF1CnplYSs4NEJPK0pNaWh6endRdU9UaDFKSFpQaDJHSFNvb0lLUDRkMWNFRHBYLzF1S3U3Nk5YNytURVJDNHZiTXoKZjBPOVYzejJTemZuTXhWVE43ZnFVUGdnSTZlWHVHQnBNMEdMams3Mngwc1BSaHBTYU9JWEJDVzBsUjJZOHFsbwpCMXUrTlE2ZXk2bWNOaU9iNVNiNzFvU21vemkxN2JkNThMdzN5UFc2UjdITW1zVFlaNFg5WUg5alVzVWdiYkNPCnBXZXc5eXljVVhoaDMwUUZGR2Q3VVJsNWNHN2NVUXNYTHFVSTRjalhqcWdGeHo4aHZyWHV0MU1wZXJHMi8vWTAKdnI5T29XU2V6OFFTTzk3cVJCak9VRm5CWWRhbG5CQitEZWFqbzFxZ1ZtbE5xRDN3eks3bXRtZzZoOU56RmNmcQprdWJrL0hVNERPQXVkcjA3N1lXWURnV091QWR3eGpVMGpQS2RrdjRNZngrSnUzVVgrL1lYWXdENUgyK2p6aTlICmxFNFkxME85cllDbDYrUXR5TkNEOHZDeGUvU0JPaWxEOWNqTjZPSHB0MVNRNnNwTEFuTlBZTDM5NzBaQ2ZTQ20KbFh3c0c0clhOQWVoRTR1Y0RqVXdJVzlBdEFlajVlM3dvYkQ1UnRxWExxRTdFRmtYblV2OEZ1cU9RTWYwQVFWbwprdW0ySVRLcWZVVG0vN2ZDR0FWTGtobFB3aGJtNVFJREFRQUJBb0lDQUMyR2hEc1pUaWtiTERQMlR6Q2VkOVVoCmJRUlpsbDdLaUxHcXZYNm9VdjhJcFNLdTJrS3h1blpkTzVvQk5NbzNnNTg4YzRSQkFrQ1d6dmJObzFjeDJ3UTQKSkd3ZTdYaGM5TDdYbUwxUFZjNWlJdnVYOFVBTFY3eUdwMXZONklPSC9BYVJsSFlZZHl3UURVSTcwZGZiMmJqRQo2d3dORHRVbk1Ea3NncjNLbExwamNiNEFla2dxWE9MRUFMMld1Nkt1T1hOankrdUU3b2hnVWN3bWlYWXZGb3VMCm1KYXVlS3l5U202NHdJZnpZQ1JwbUhHMVlCTGpic0xJb20zcmZYRkl3V1hqMkhBSGFIOFRWOVhyUmpwR2tEZm8KbFFqN3l0R0s2ZkllMWcva0ZBN3hDWDE2d1NYMS85bjM1WGYwVmMwZ08zdE9NVHJkM1JTVVNEaVp6eVR1WWxuZwpETEdmYXZjRS82QXJ5cTlWZ3hyUXdXbnZhd0hIcWxBWUtxVHpJYkRJS0Y3SjRYTE9FckFtRE50T1I2Lzc1WjJ3CnVPQlFYT0N3NFM1dWxWdzhIZUM0NGlFTmxJYU5lNDNWTkZUTGtRM3lCeW96VVlYWTN2eEJXMWpURFpFOTB5YTUKZzk4cmFiYWhIS0lockpGYzNXYTE0RWhicUE2TVVLSXRRTkk4K1N1Rk1KV3R4VW1iM1cxK2dHbXJvTmo1TU9kYQpzdjV5OThTYS93UUc4dGc0cmdNQ0xpQVNHL3hudDB3RURrNXFDVUUxRzRSdkdOeUYxU09zNk82c1BTOTg4Umd4CnJuamQvWWZoME5xVnhHcHFGNnhpQVgvZXkyU0NGUWNybEtmNnhGREF4YjI4RTdaNnRQSUZCTWxpQ1IrbzdYR3MKZDNvUWVuMThCalM1NjdtR2ZmNkJBb0lCQVFEanFFcHZqOVhJVVB3bk1RZitRY3R0R1pXZEp2bFZSa1BSMW9maApSVWI2UHdFRkEwdVQyM011ZmFvNGI4bWIrM2Vra1BkYTZmbWJqUGFUckQrbk5YNGxyRE5oYytvcVY4aFVEQnA0CmpVcEg3OXorTVNUZVVQclpnS3VMeEdqaDJiK0FWYVZjZTI2STVYUXVoUnR6ZHFYZDlIeSs4YXpYRTltbHlPQ00KMUpEK2VHZWxhaVJMbEZBbVRDNDNoNlV5T0Q5SmZOSW1oWDQ2WDJRRlFsbGc1cWxVdWQ4Ukx3eFViZTJoYzhTWQp4VnVvYVZSSUdBSmhqRkd3ZVhnRjdzc0tQNXBZMHRkTlNvSGsxeHRnUmVJTlllZFU1cmtpKzloZTN0cStqWUdJCmxVcVVzYzNzN3c4cUk1UXk5NGdmcUI5Lzd4K3BFdGEvak9leE4yL1pGOFJGSXVucEFvSUJBUURaSUpUaUUxKzkKc2xnQ0NGVllLR3Z5aE5odkppck94enlOUWU3YjIvZmxQNzVHd0pTTWpZZTdoTmhGK3JrZHRJcXF5dWxyeGF3YgpPbWliU0FCSG5kT20ycDRMdDhaK20vQXZaRUgzVklLdWkwY0xVbTlKRXNsWURVcFIrdG5BemloNzdrS2FlVzlnCk1wdlpiUzZGdXE2ZlBZQUJyK3dXeU1IazR0UnRNZ3duUFRtSzZQTW85b3FIUURTSVJjL3N0N2hBTUwwMDdtNlEKOTJkRXRqNTNtSTBURTRISVhtY3hZbjV5NGVJLy85aEFMb2xFa0ZHWDU0SmNMdWpDWWkwQ3RIU0xDcnNmQkJwZgpDS2NaMk5sWFNiYVREU1prZWhnQWFWTlM2OVp1K1o2eGFvNmZZMjVxSnNmeXlaUkNjSzJYY0FoUDV2QWNUbWhQClNKUFJZc1dSNXZ1ZEFvSUJBRmtRRXFiWWg1TkprNHdsazNIMS9ZYWVGcmtYY1QzYU1sZ2FiS2hGdVFIWHVpZGkKNWFOZm5BMFpIb25idWV6ckVTQnhra09mKzRYT1BQMEN5eGc0UmpTb3pLVVlld2k3dE9Ta280cDhCQTVtbVhkYwpkSWNBK1ZJMEUyaW5tenlZT21JVG41Q3h2VW1UTXNPc1VWUDNtK1pjYXAwczRTaDNYSk9PSmNNU3VmTEQyaENOCm1NdDBwM0tFSlNTV1RadDdBODlWSk1YclBibktiYy9jNkNpUHRMa3Z5a1BudXhRZ3VYR0xYK05BZXA1RkxyTFIKcWNUTjUzdDUyZW5BUlBDcWQxQytrM3BxWnF6SE5xK1FSMkppNWVTQ0t2V3p2eTlHVWg5d0xyZm5aL2tLSW56SgovWTNIdzRlNDdTa3RWYjF3S0Z1MXdndklMVEJZZHNwZ2tPbFhRbGtDZ2dFQUtKYVJuazFXMldRc1ZYenZUMEtICkkxZTRDZGNOcTRmTkJ1N3JVc2drNkFMcGM5cHVLblFPaW54RDNaa0gzOGl2SDB3OUpEdFlkK0tNU1hMRk1wNEwKUWFhZVlyeGc2NndFMHljZnViZGZrbmRRdVlvWWFZV01nOXhBSjJFSU1hV1lKY3FkUXJrdW04SDZKa1BsclhQLwpUcDgxZlp0QU8rWWRjTWNDUk1OVlNFU0dyRFB0dUp1VnU4REIwVE9Uc2NHS1BOMmZrUFI5VUxZZTVOWllpUXpJCldtZU1IRU9oY0xiandsLzlaazlTUW5Vd2pkT1luUmZXNDVxVlFqa09CdkpxMHM4WHVhMlBySEkyb250SjdhcEcKNmVoTVkvMzYzS0RUeGExMmNWcFNVd0lEVlVKR0VxdmJOc1I5NVltZ3VhMWtzR01RUVlwYXIyOTJ5bTUzVmxYaQpkUUtDQVFCTUFYS0RaNVZobHBRR1VlUk1FNVhqVm1KOE1WdlZTUzV3NzBGOC9CS0ZnZFBJNnR2Nkx5UGh3OTRPCmxZVldoOXJmdUpmbWllK1ZJSWhaeSthUVNpVVhGQUtTdjZFTWJ1bXdjN1pUNEkyYitDTXQxUEhaTEZtUEN0OXAKOEorUDdoaDlRYWRBYzZqZEdSa0NMNkpMU3VoeWhMbW90SG9IS0ZJazdhNENNZGl2QnB3SVdxMWVScHd0aWRrNwpIdytrdlJ5YW5DMUJVU1dYNGxJcW1LanAyR1B2UDVVdVV2RUlPNitqaWFyWTJDTUNKb3BtcVJ2WWQzNGtSVkF1CjZueFl4a05neEFQSnVWN2tkZVVzQXg5Q1FZcFQ1blFmendtdlVGa0FraHJoTmw5dUJRUDhMdkZORFQ0cWU0bFcKUWw0cXRFZFNiZDVxVWVVdkgzOG5JMmpTVDVMawotLS0tLUVORCBQUklWQVRFIEtFWS0tLS0tCg== + wildcardTLS: + cert: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZEekNDQXZlZ0F3SUJBZ0lVYSthaVJZWG9QTGliSS9wdVJCdi9DZ2RTTDNzd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0Z6RVZNQk1HQTFVRUF3d01LaTUzYkdGdUxteHZZMkZzTUI0WERUSXdNVEl5TVRJd05UQXpNVm9YRFRNdwpNVEl4T1RJd05UQXpNVm93RnpFVk1CTUdBMVVFQXd3TUtpNTNiR0Z1TG14dlkyRnNNSUlDSWpBTkJna3Foa2lHCjl3MEJBUUVGQUFPQ0FnOEFNSUlDQ2dLQ0FnRUEwQjhuZE1raGIzZEN6N0I2aS9kRlFWenJwaEtQK2RmY2JKN1gKMzB3MU1FWDIvM3ZvVStkRlBNbnZrS3hEdFJwanZCbnhCczF6L1VmajlyUFhDSzZkazNNYU5DajRQYVUxem9WQQppK1Z6amc0ZG5XNjJxWG1qYVYrYUMrQm5zQndyQmx2THQ0dkh1eFRLbHh1RnR4THdid3VObGJvS1lVN01kV3oyCllMY3QzUWZBWElVb2FRK1RTMUZGdVdFeEZOTFRidlBGZWNoajB4ZnhyOU5BcU9aTXI0RGE0NHMzVERxMVVyRTIKbjhaZXFxVXZ1YUE4ZmEzQjNVZVRFNmJ4OEdhN1JybG5Dakd3UDRGVml3ajdvellmanV6T2JOM2dlcjdWcEpLMQpMSjdIdDBBemZlRm9aQ2xPbUVBd1p5alFwRGZOckdNTCs1dWtIK2JxWngyaUo5UndFcDNmdlE4em5jN1Q4dHJDCmxzMjRWNUpySWhUQXlCcTZRWVNnSXdXM2V5TmVpUnQ0ZHp6Sk5rNnd4cFp0WE96WTFwamJrV2FMaEhKOW1LRWoKU3lqVVBnS3dKSVlmb3BJbTJoUzl1dVZHZDdiU1MyV055aHJSOU5LSG5Lamo5Y0IrUWU0eEh0Z1pEcm1GZ1ZpZQp0cXZBUHhJL0ZkV1pSN3RmT2JCNTR3alMxVFk3TEd6cll4TDZSMWNjZDE4WUppcGNTS05xa05ORlllZ092VkNICmFldW1OTUdVNlZZalJWS1JmQXMva2FzcWxleGpheSt0SXNtd3dDZGoxUUN3UitRa2VEZFdoNE8vQzM1NENRb28KTkxZYzRNRk8xbVVDY2NsbUgvbFBvcTd1anBCMWI2VmFBNVprNFhjVUpRc0c4SUlSMDFHTFM5RW1HVVZaeTlOWApwV2dCbXNVQ0F3RUFBYU5UTUZFd0hRWURWUjBPQkJZRUZOZlVJSGhXdnFwUzg2ZC82SnJvbmxFYzZMU1NNQjhHCkExVWRJd1FZTUJhQUZOZlVJSGhXdnFwUzg2ZC82SnJvbmxFYzZMU1NNQThHQTFVZEV3RUIvd1FGTUFNQkFmOHcKRFFZSktvWklodmNOQVFFTEJRQURnZ0lCQUtlTW9PckhLZ3BGemtkckVhMVhSSVRUOHFZanhKc04yNmFIMFovLwp1dDRXVkE4ckNDNzV4VkpaNnpBQWlBOFE2eTRYSHBzRzl2ZSs1QlJIWEdCS0lYOU5FZGNrbWdNdExzQ2xOR0JCCkxkN3lWd3hhaGVCQzhVTWIrVTAxMlNwaFc3K0t6UFJhQ3g4cHNMMUlFQUkyblQ1MzlCNDBmR2NyTktNSDRqZGkKdkxad3VxT00rZnJucFJ1MkZlK3Bja2Fwek92SEJTb0I3THovR1dmMWUwZ0llc1B4WEdmVG9hbGM1SzU5bDF1TQpCTkhpUW15S3E4TS9MbllMejhyOWp3dHNKU2lLYUljelpISjNtQ0ZUb3ljREF3NTl3WEdmWXZWcFBMaWZXTTJxCm1uSlJKM2dQS1lzOUhXWFgyYktoSmZoMjRLOTN2M1duMVRUellYOGtTbWlnRG0wTUhOSTNwZktlMmJqVW9MNmgKMlQ4bWhRbjdPQ2dvZHMvOXczR1dOdmFxYTAySHRnc0tTbk9YdmpSNXFMaVFLRjdhMi95TTlrNWNQcUdHaW1GYgppUWV3eUgvMWw2YjQ0T0s2RGwwMVltWFltNUVqR3plckp2aU90eUhSaWhtME01VmNBWWJaYkE0S1Y1eHhLZjRqClIwaktwQXdqbEpzTDdRMk9zTC9IRkxmaDV1RU1HMXlmTzF1blZkVURKK1FBZHJQUG5tZTZVTVFQZm1UcGx1WjAKS3pvOXY3NEpYV0pwQkNtaWNTbFBQdnB3cXZLTk5iOWd6b0hjOXFheWMwNWVxRldRbzNNZjIzYU82b05wU2ZuaAp5aWMvczFQcC9ZS2FHakVSQXB1UmRvYTlWT1diUncycFZMei9rZVNraS9QTDJFRFc4RUVHYjFXcUFBMkJPVVhDCi9oYXQKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= + key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUpRd0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQ1Mwd2dna3BBZ0VBQW9JQ0FRRFFIeWQweVNGdmQwTFAKc0hxTDkwVkJYT3VtRW8vNTE5eHNudGZmVERVd1JmYi9lK2hUNTBVOHllK1FyRU8xR21POEdmRUd6WFA5UitQMgpzOWNJcnAyVGN4bzBLUGc5cFRYT2hVQ0w1WE9PRGgyZGJyYXBlYU5wWDVvTDRHZXdIQ3NHVzh1M2k4ZTdGTXFYCkc0VzNFdkJ2QzQyVnVncGhUc3gxYlBaZ3R5M2RCOEJjaFNocEQ1TkxVVVc1WVRFVTB0TnU4OFY1eUdQVEYvR3YKMDBDbzVreXZnTnJqaXpkTU9yVlNzVGFmeGw2cXBTKzVvRHg5cmNIZFI1TVRwdkh3WnJ0R3VXY0tNYkEvZ1ZXTApDUHVqTmgrTzdNNXMzZUI2dnRXa2tyVXNuc2UzUUROOTRXaGtLVTZZUURCbktOQ2tOODJzWXd2N202UWY1dXBuCkhhSW4xSEFTbmQrOUR6T2R6dFB5MnNLV3piaFhrbXNpRk1ESUdycEJoS0FqQmJkN0kxNkpHM2gzUE1rMlRyREcKbG0xYzdOaldtTnVSWm91RWNuMllvU05MS05RK0FyQWtoaCtpa2liYUZMMjY1VVozdHRKTFpZM0tHdEgwMG9lYwpxT1Axd0g1QjdqRWUyQmtPdVlXQldKNjJxOEEvRWo4VjFabEh1MTg1c0huakNOTFZOanNzYk90akV2cEhWeHgzClh4Z21LbHhJbzJxUTAwVmg2QTY5VUlkcDY2WTB3WlRwVmlORlVwRjhDeitScXlxVjdHTnJMNjBpeWJEQUoyUFYKQUxCSDVDUjROMWFIZzc4TGZuZ0pDaWcwdGh6Z3dVN1daUUp4eVdZZitVK2lydTZPa0hWdnBWb0RsbVRoZHhRbApDd2J3Z2hIVFVZdEwwU1laUlZuTDAxZWxhQUdheFFJREFRQUJBb0lDQVFDUVRkbXN4enl3cmUrY1ZCQlVkaW9GCjdTalRhTEY5bWFlVGhQdkhMMjc5dnJWSlpoK3I5WUp6YU16NzhnV3NUOVR4ZXNjOVlUMVlVLzJEZENUWU4wSzUKRnlrSEc1VXNJUjVTeU4vOVlDWWtURE5La3BhQ29mMmxOWTE1U0twOFdMdVlXQlBEZTE4TW41anM5ejlhdGY0Ugo4Ti9GL2szdU5KWGRvYVNmWU1Pakt4bTh6UE05RFhpaTA0SlZ6RWNjMmlXU0crSkQwNmNybWNHUm1SZVBSTWZOCk5Mb1E1ZGw4dUlRN0J2Y0tCNkJpRDlFc2t5YitPWGxmTlo2TUZNaFNXTmpuYSt3L0REN1plWkxYcVczWk45RGYKNStBbGFoNlkzVE1EUGxueXkxRk5CVzN1alZrMWdkS21ESFBEUTNDUFBNWVdEa01qdlVJcWdKRHMySVl6dWIvTwpXRjRVUTV5UEJhZzluaWp1dS9uMVZDdGZuSkxwakZIakU1VzdkK3p1UGh6aUJ1WDFOcjRtOVVJdEpaSTNsYmJtCmdvZFlMdGl4b3RwNWF3ang1eXA3MU1zUHlTZzcrbHBPenA4dStuRENJcnc0K0VSME56MG8yTXFmcmJ2VklGQXIKWHIyc2YrejljbmtxalBWWEZaVks3em1TUHI5N0YrbTV4RHpURG9lTG53aVlhUUpOQ0ZhejhMVERjNldVT2w4SQpLOWhHd3FaK0llTlgreW16em16Nkx6WWVPaGlrRmNRaUI0UXVPSjdWWnZWRmVoS3JJMXJLWHJDRU01VmpJZXBkCkhzR0c1eTlLUkcxdEszSU5ScmI0SHlhRDF6SHJSTHRneFpLT1BvWDN0UjNmbTJ1aGova3dwelZnWTltRXJDWDkKd2I4SVA5TXdRR3REQVNBcjZWVmJvUUtDQVFFQThIeWlaK1lVeFEzQnprL1hoNmZMWWNYakE3NTJrQ204VWZzWQp0d1Z4N0EyNW5YRStiUDRIT3UyVC9kTlc0Tkw1elZPT0JkaWZIcTJQVFNVMGYzQUFHL0pNcnVzM3NrNHd4azM5CitYYlh0dHltWkdxb3FEcVN3TUw2czVpY1RnangvenRhSXk1TWFKYWhUYUpNdFRQQlVpZ3U3enhoeGNwVlhNVUMKTklHcFl5Mkt5R2hyMjVVOFdlR0RYQm9SS2xYUXJXYkNZeW1kMXdYQStEaVl0dzA5eit0VHhPNTRodjFCZkJKZwpWMGd0VWdJU0I2WEZDMU9CWDZXQ1pXYlhCN2hPaHhISjNkNHAyQlZyN0gxL2JDQ0ZvVDY5by9WQVNHRmdtTHRiCnpGalRNbjFIaTluVW5jUFlScWpsN1h0NWdPOHBOa3BwMjVrNHIxRVludWhIazcrYzdRS0NBUUVBM1l3THozNloKNEVPRndvODIrUlVId2lkaFExOEdrU1JvWStKVm1udXJpSXdHZTk3ZmRTVk91d092SDlZSVhsRWpjRitoOHFQVQpJVnpIOXBuYXZjTENEMnhIOWZ5d09ML3pmYmJnYnExZjV4Y3BOUXlYM1JnTGFDUVpLNkpJa3NzOUtDb0dhSzlaCmpMVm41MjFFZlFBRE5DSi93YlRCb3dLQ0dTNDUzSzRBaWFEWHN6TkJLUk5MOHVaWWYwK0x0U2IzV3lkZVQ2eUgKdGZiSXR3NlBSS1lxb2NaeGIrM0pWQWFHcGxScjVZSlNDU1BtTjFMSjU0djlTcXBIVnJMNzJudFNwKzdDODJ6SgpJajVOSXFEOGFsOVZ3WFB5dExRd25hYWc1TW5ka0NLQ3R0MlVHSGZwMEh3ZTJTL1hkemppS2gzZTZaT3MyMSt1CitQUHVrSkUxTTZzU09RS0NBUUJjWVJRbDR6MUJRUHFjM1JESEhJN0UvVFlxWHdTK2RqblFLQ3VqU3FVcmIwNUoKQzVKV1hmSzdFVDVUTjliY3dFNlRNRENUVUZZM2U2WmJsUm9vaGdhVXRhdjlXWC9vcjU2TzNyRGNIbW5ZNWNQSgpPU3VXakFHSnFKeVRWdUZjSEpXUlhPUlFOVjNHbzI1Tkd6WnFPUHBmSys1em1mZFkrbE4yTW51WlhlR0twcGowClNTQjlsa003cDZSRlFnSXNDQkVFTzBBYXhZYkxiWHRtSHArVFdiUFA1ZThrN0JKQ2tKQ1NMNkR3aGxwYWNVOHAKdnVVRlo4dC95VjFneEhOL2xLNGR0cGliOE5hVUdnNStKdXRHeHV0dU9HS3kwK2dncGI5c2pEUkVPQzdRNjAwTApqTjdleDdlUjFSbVY4Mk9HUXRqSzhTVGU1V25mOXNBRmN1YmorNncxQW9JQkFHYXM4Z2hQRHpkOWM2OXd1alNFCkI1MTJyTUFSZVRTcEgrd3l5Q09aYnkwUVlDem1aTCtnODdUK2h4b0ZFc25MWnRZOHJBeU0ydEkvY3JrYUl1TlIKTUtqL01QYVREb1N1aVVWWkRQaWVSMVVOU2Q2NUlHU3FNUmNwcTdTcU9HSTM2UGNGU3dVWFJ6Uk1Hb1NLQW5UQQpIYnY2eFNUY0JlWHJVcW9pMzFRa0hFR3NsbXNKdFFnNVZqaVRncTQyQ25TQlE2QXVSYW85Tm9RaGhISTZRREc3CnBRUm11TW43OVJPSkZyeGRZY2Z6TnR2ZmxHRk5jQjlzcEk0SERwcml4cEJDR1ZPVTl5cmozdStNMmlqVFhVaGIKT0o0NGcySTJKRlhjRkxNVHp5aHVwZy9qN3kvTDIwUHhVa2Fyd25zUmxOZWFFbVpFTjVkUDZBS2U0cENEaTVtUApqaGtDZ2dFQkFMUmtVeG9oZDh2ZVBwR3hPbWlOak5HekpiTDlscGx0TWxhR0dPQ3JOUkZSeEppblgzWU9UVnhiCkRFVlpqaXRHNldydzFxaDdnZXAzeEdJaWZHQ1lZV3pNc0RZTitueGtwV0lRRmZOV3dYemNRWlhrTEduZVlUdTAKSVU2RjY5Myt1Q0tkcHVCdVl0d3BQNEJCVkNCRTVON0FzRGV4bFBYTzk1cEw3ZzR4OG5RckdNeGJlRXVOdytaTwpPYmYvTnFFMGZZcURkaERiVHI0UDR6bUpBRlpYeDlKMjNJdWRMUFI3MDZITGZ5bDMrb1pUS2Y2ZWdEL1drWXZGCllLdEtDZzI1UmtSYmZBakZkeDlpOVkzcDlPNEFNVUNaRVFIOWQwU1d6LzJWR0VmYzVha09YL2xvWlAyUXF3c2UKeXMyc0k1U0Z5TEd1ZGM3R2MzVTd5UGd0RVN0elVoWT0KLS0tLS1FTkQgUFJJVkFURSBLRVktLS0tLQo= + +kafka: + enabled: true + replicaCount: 1 + image: + debug: true + auth: + clientProtocol: mtls + interBrokerProtocol: tls + jksSecret: tip-common-kafka-certs + jksPassword: mypassword + tlsEndpointIdentificationAlgorithm: "" + jaas: + clientUsers: + - brokerUser + clientPassword: + - brokerPassword + extraEnvVars: + - name: KAFKA_CFG_SSL_KEYSTORE_TYPE + value: PKCS12 + allowPlaintextListener: true + persistence: + enabled: true + storageClass: hostpath + metrics: + serviceMonitor: + enabled: false + namespace: monitoring + selector: + release: prometheus-operator + zookeeper: + enabled: true + persistence: + enabled: true + +cassandra: + enabled: true + tlsEncryptionSecretName: tip-common-cassandra-certs + image: + debug: true + persistence: + enabled: true + storageClass: hostpath + replicaCount: 1 + cluster: + name: TipWlanCluster + seedCount: 1 + internodeEncryption: all + clientEncryption: true + exporter: + enabled: false + serviceMonitor: + enabled: false + additionalLabels: + release: prometheus-operator + dbUser: + user: cassandra + password: cassandra + resources: + limits: {} + requests: + cpu: 1 + memory: 3Gi + +postgresql: + enabled: true + postgresqlDatabase: tip + image: + debug: true + metrics: + enabled: false + serviceMonitor: + enabled: falsea + namespace: monitoring + additionalLabels: + release: prometheus-operator + postgresqlUsername: postgres + postgresqlPassword: postgres + pgHbaConfiguration: | + hostssl replication repl_user 0.0.0.0/0 md5 clientcert=0 + hostssl postgres postgres 0.0.0.0/0 cert clientcert=1 + hostssl postgres postgres ::/0 cert clientcert=1 + hostssl all all 0.0.0.0/0 md5 clientcert=1 + replication: + enabled: true + user: repl_user + password: repl_password + slaveReplicas: 1 + persistence: + enabled: true + storageClass: hostpath + volumePermissions: + enabled: true + livenessProbe: + enabled: false + readinessProbe: + enabled: false + tls: + enabled: true + certificatesSecret: tip-common-postgres-certs + certFilename: cert.crt + certKeyFilename: cert.key + certCAFilename: cacert.pem + initdbScriptsConfigMap: tip-common-postgres-scripts + extraEnv: + - name: PGSSLCERT + value: /opt/tip-wlan/certs/postgresclientcert.pem + - name: PGSSLKEY + value: /opt/tip-wlan/certs/postgresclientkey_dec.pem + - name: PGSSLROOTCERT + value: /opt/tip-wlan/certs/cacert.pem + primary: + extraInitContainers: + - command: [ "sh", "-c", "chmod 0600 /opt/bitnami/postgresql/certs/postgresclientkey_dec.pem" ] + image: busybox:latest + name: chmod-client-cert-additional + securityContext: + runAsUser: 0 + volumeMounts: + - mountPath: /opt/bitnami/postgresql/certs + name: postgresql-certificates diff --git a/tip-wlan/resources/environments/dev-integrated-aws-tip.yaml b/tip-wlan/resources/environments/dev-integrated-aws-tip.yaml index 481cd3d..6a9d702 100644 --- a/tip-wlan/resources/environments/dev-integrated-aws-tip.yaml +++ b/tip-wlan/resources/environments/dev-integrated-aws-tip.yaml @@ -1,51 +1,21 @@ -# This is a development override file. -# It overrides the default Tip-Wlan parent chart behaviour -# -# It can be tweaked, based on the need to support different -# dev environments. -# This file expects to have a GlusterFS storage solution running -# before "helm install" is performed. -################################################################# -# Global configuration overrides. -# -# These overrides will affect all helm charts (ie. applications) -# that are listed below and are 'enabled'. -################################################################# global: - # Change to an unused port prefix range to prevent port conflicts - # with other instances running within the same k8s cluster nodePortPrefix: 302 - nsPrefix: tip - # image pull policy + nodePortPrefixExt: 304 + pullPolicy: Always - repository: tip-tip-wlan-cloud-docker-repo.jfrog.io - # override default mount path root directory - # referenced by persistent volumes and log files - persistence: - # flag to enable debugging - application support required - debugEnabled: true + integratedDeployment: + testingEnabled: true - # Integrated Deployment which deploys Prov Service, Portal Service and - # SSC Service in a single docker image - integratedDeployment: true - -# Annotations for namespace +dockerRegistrySecret: ewoJImF1dGhzIjogewoJCSJ0aXAtdGlwLXdsYW4tY2xvdWQtZG9ja2VyLXJlcG8uamZyb2cuaW8iOiB7CgkJCSJhdXRoIjogImRHbHdMWEpsWVdRNmRHbHdMWEpsWVdRPSIKCQl9Cgl9LAoJIkh0dHBIZWFkZXJzIjogewoJCSJVc2VyLUFnZW50IjogIkRvY2tlci1DbGllbnQvMTkuMDMuOCAobGludXgpIgoJfQp9 annotations: { "helm.sh/resource-policy": keep } -createReleaseNamespace: false - -# Docker registry secret -dockerRegistrySecret: ewoJImF1dGhzIjogewoJCSJ0aXAtdGlwLXdsYW4tY2xvdWQtZG9ja2VyLXJlcG8uamZyb2cuaW8iOiB7CgkJCSJhdXRoIjogImRHbHdMWEpsWVdRNmRHbHdMWEpsWVdRPSIKCQl9Cgl9LAoJIkh0dHBIZWFkZXJzIjogewoJCSJVc2VyLUFnZW50IjogIkRvY2tlci1DbGllbnQvMTkuMDMuOCAobGludXgpIgoJfQp9 -################################################################# -# Enable/disable and configure helm charts (ie. applications) -# to customize the TIP-WLAN deployment. -################################################################# opensync-gw-static: enabled: false + opensync-gw-cloud: enabled: true externalhost: @@ -60,16 +30,19 @@ opensync-gw-cloud: prov: service: wlan-integrated-cloud-component-service port: 9092 + opensync-mqtt-broker: enabled: true replicaCount: 1 persistence: enabled: true - storageClass: "gp2" + storageClass: gp2 + wlan-cloud-graphql-gw: enabled: true env: portalsvc: wlan-portal-svc.tip.lab.connectus.ai + wlan-cloud-static-portal: enabled: true image: @@ -81,44 +54,133 @@ wlan-cloud-static-portal: paths: [ / ] + wlan-integrated-cloud-component-service: enabled: true + nginx-ingress-controller: enabled: true controller: config: - externalStatusAddress: "api.uswest2.tip.lab.connectus.ai" -zookeeper: - enabled: true - replicaCount: 1 - persistence: - enabled: true - storageClass: "gp2" + externalStatusAddress: api.uswest2.tip.lab.connectus.ai + kafka: enabled: true replicaCount: 1 + image: + debug: true + auth: + clientProtocol: mtls + interBrokerProtocol: tls + jksSecret: tip-common-kafka-certs + jksPassword: mypassword + tlsEndpointIdentificationAlgorithm: "" + jaas: + clientUsers: + - brokerUser + clientPassword: + - brokerPassword + extraEnvVars: + - name: KAFKA_CFG_SSL_KEYSTORE_TYPE + value: PKCS12 + allowPlaintextListener: true persistence: enabled: true - storageClass: "gp2" + storageClass: gp2 + metrics: + serviceMonitor: + enabled: false + namespace: monitoring + selector: + release: prometheus-operator + zookeeper: + enabled: true + persistence: + enabled: true + cassandra: enabled: true - config: - cluster_size: 3 - seed_size: 2 + tlsEncryptionSecretName: tip-common-cassandra-certs + image: + debug: true persistence: enabled: true - storageClass: "gp2" + storageClass: gp2 + replicaCount: 1 + cluster: + name: TipWlanCluster + seedCount: 1 + internodeEncryption: all + clientEncryption: true + exporter: + enabled: false + serviceMonitor: + enabled: false + additionalLabels: + release: prometheus-operator + dbUser: + user: cassandra + password: cassandra + resources: + limits: {} + requests: + cpu: 1 + memory: 3Gi + postgresql: enabled: true - postgresqlPassword: cG9zdGdyZXMxMjM= -## NOTE: If we are using glusterfs as Storage class, we don't really need -## replication turned on, since the data is anyway replicated on glusterfs nodes -## Replication is useful: -## a. When we use HostPath as storage mechanism -## b. If master goes down and one of the slave is promoted as master + postgresqlDatabase: tip + image: + debug: true + metrics: + enabled: false + serviceMonitor: + enabled: falsea + namespace: monitoring + additionalLabels: + release: prometheus-operator + postgresqlUsername: postgres + postgresqlPassword: postgres + pgHbaConfiguration: | + hostssl replication repl_user 0.0.0.0/0 md5 clientcert=0 + hostssl postgres postgres 0.0.0.0/0 cert clientcert=1 + hostssl postgres postgres ::/0 cert clientcert=1 + hostssl all all 0.0.0.0/0 md5 clientcert=1 replication: enabled: true + user: repl_user + password: repl_password slaveReplicas: 1 persistence: enabled: true - storageClass: "gp2" \ No newline at end of file + storageClass: gp2 + volumePermissions: + enabled: true + livenessProbe: + enabled: false + readinessProbe: + enabled: false + tls: + enabled: true + certificatesSecret: tip-common-postgres-certs + certFilename: cert.crt + certKeyFilename: cert.key + certCAFilename: cacert.pem + initdbScriptsConfigMap: tip-common-postgres-scripts + extraEnv: + - name: PGSSLCERT + value: /opt/tip-wlan/certs/postgresclientcert.pem + - name: PGSSLKEY + value: /opt/tip-wlan/certs/postgresclientkey_dec.pem + - name: PGSSLROOTCERT + value: /opt/tip-wlan/certs/cacert.pem + primary: + extraInitContainers: + - command: [ "sh", "-c", "chmod 0600 /opt/bitnami/postgresql/certs/postgresclientkey_dec.pem" ] + image: busybox:latest + name: chmod-client-cert-additional + securityContext: + runAsUser: 0 + volumeMounts: + - mountPath: /opt/bitnami/postgresql/certs + name: postgresql-certificates diff --git a/tip-wlan/resources/environments/dev-integrated.yaml b/tip-wlan/resources/environments/dev-integrated.yaml index 280a9c3..3d77565 100644 --- a/tip-wlan/resources/environments/dev-integrated.yaml +++ b/tip-wlan/resources/environments/dev-integrated.yaml @@ -1,50 +1,21 @@ -# This is a development override file. -# It overrides the default Tip-Wlan parent chart behaviour -# -# It can be tweaked, based on the need to support different -# dev environments. -# This file expects to have a GlusterFS storage solution running -# before "helm install" is performed. -################################################################# -# Global configuration overrides. -# -# These overrides will affect all helm charts (ie. applications) -# that are listed below and are 'enabled'. -################################################################# global: - # Change to an unused port prefix range to prevent port conflicts - # with other instances running within the same k8s cluster nodePortPrefix: 302 - nsPrefix: tip - # image pull policy + nodePortPrefixExt: 304 + pullPolicy: Always - repository: tip-tip-wlan-cloud-docker-repo.jfrog.io - # override default mount path root directory - # referenced by persistent volumes and log files - persistence: - # flag to enable debugging - application support required - debugEnabled: true - - # Integrated Deployment which deploys Prov Service, Portal Service and - # SSC Service in a single docker image integratedDeployment: true -# Annotations for namespace + testingEnabled: + +dockerRegistrySecret: ewoJImF1dGhzIjogewoJCSJ0aXAtdGlwLXdsYW4tY2xvdWQtZG9ja2VyLXJlcG8uamZyb2cuaW8iOiB7CgkJCSJhdXRoIjogImRHbHdMWEpsWVdRNmRHbHdMWEpsWVdRPSIKCQl9Cgl9LAoJIkh0dHBIZWFkZXJzIjogewoJCSJVc2VyLUFnZW50IjogIkRvY2tlci1DbGllbnQvMTkuMDMuOCAobGludXgpIgoJfQp9 annotations: { "helm.sh/resource-policy": keep } -createReleaseNamespace: false - -# Docker registry secret -dockerRegistrySecret: ewoJImF1dGhzIjogewoJCSJ0aXAtdGlwLXdsYW4tY2xvdWQtZG9ja2VyLXJlcG8uamZyb2cuaW8iOiB7CgkJCSJhdXRoIjogImRHbHdMWEpsWVdRNmRHbHdMWEpsWVdRPSIKCQl9Cgl9LAoJIkh0dHBIZWFkZXJzIjogewoJCSJVc2VyLUFnZW50IjogIkRvY2tlci1DbGllbnQvMTkuMDMuOCAobGludXgpIgoJfQp9 -################################################################# -# Enable/disable and configure helm charts (ie. applications) -# to customize the TIP-WLAN deployment. -################################################################# opensync-gw-static: enabled: false + opensync-gw-cloud: enabled: true env: @@ -55,16 +26,20 @@ opensync-gw-cloud: prov: service: wlan-integrated-cloud-component-service port: 9092 + opensync-mqtt-broker: enabled: true replicaCount: 1 persistence: enabled: true - storageClass: "glusterfs-storage" + storageClass: glusterfs-storage + wlan-cloud-graphql-gw: enabled: true + wlan-cloud-static-portal: enabled: true + wlan-integrated-cloud-component-service: enabled: true image: @@ -79,6 +54,7 @@ wlan-integrated-cloud-component-service: password: tip-read integratedWithPersistence: enabled: true + nginx-ingress-controller: enabled: true controller: @@ -87,41 +63,124 @@ nginx-ingress-controller: } config: externalStatusAddress: "192.168.56.101" -zookeeper: - enabled: true - replicaCount: 1 - persistence: - enabled: true - storageClass: "glusterfs-storage" + kafka: enabled: true replicaCount: 1 + image: + debug: true + auth: + clientProtocol: mtls + interBrokerProtocol: tls + jksSecret: tip-common-kafka-certs + jksPassword: mypassword + tlsEndpointIdentificationAlgorithm: "" + jaas: + clientUsers: + - brokerUser + clientPassword: + - brokerPassword + extraEnvVars: + - name: KAFKA_CFG_SSL_KEYSTORE_TYPE + value: PKCS12 + allowPlaintextListener: true persistence: enabled: true - storageClass: "glusterfs-storage" + storageClass: glusterfs-storage + metrics: + serviceMonitor: + enabled: false + namespace: monitoring + selector: + release: prometheus-operator + zookeeper: + enabled: true + persistence: + enabled: true + cassandra: enabled: true - config: -## NOTE: If we are using glusterfs as Storage class, we don't really need -## replication turned on, since the data is anyway replicated on glusterfs nodes -## Replication is useful when we use HostPath as storage mechanism -## For Hostpath storage, recommendation is cluster_size: 3 and seed_size: 2 - cluster_size: 1 - seed_size: 1 + tlsEncryptionSecretName: tip-common-cassandra-certs + image: + debug: true persistence: enabled: true - storageClass: "glusterfs-storage" + storageClass: glusterfs-storage + replicaCount: 1 + cluster: + name: TipWlanCluster + seedCount: 1 + internodeEncryption: all + clientEncryption: true + exporter: + enabled: false + serviceMonitor: + enabled: false + additionalLabels: + release: prometheus-operator + dbUser: + user: cassandra + password: cassandra + resources: + limits: {} + requests: + cpu: 1 + memory: 3Gi + postgresql: enabled: true - postgresqlPassword: cG9zdGdyZXMxMjM= -## NOTE: If we are using glusterfs as Storage class, we don't really need -## replication turned on, since the data is anyway replicated on glusterfs nodes -## Replication is useful: -## a. When we use HostPath as storage mechanism -## b. If master goes down and one of the slave is promoted as master - replication: + postgresqlDatabase: tip + image: + debug: true + metrics: enabled: false + serviceMonitor: + enabled: falsea + namespace: monitoring + additionalLabels: + release: prometheus-operator + postgresqlUsername: postgres + postgresqlPassword: postgres + pgHbaConfiguration: | + hostssl replication repl_user 0.0.0.0/0 md5 clientcert=0 + hostssl postgres postgres 0.0.0.0/0 cert clientcert=1 + hostssl postgres postgres ::/0 cert clientcert=1 + hostssl all all 0.0.0.0/0 md5 clientcert=1 + replication: + enabled: true + user: repl_user + password: repl_password slaveReplicas: 1 persistence: enabled: true - storageClass: "glusterfs-storage" \ No newline at end of file + storageClass: glusterfs-storage + volumePermissions: + enabled: true + livenessProbe: + enabled: false + readinessProbe: + enabled: false + tls: + enabled: true + certificatesSecret: tip-common-postgres-certs + certFilename: cert.crt + certKeyFilename: cert.key + certCAFilename: cacert.pem + initdbScriptsConfigMap: tip-common-postgres-scripts + extraEnv: + - name: PGSSLCERT + value: /opt/tip-wlan/certs/postgresclientcert.pem + - name: PGSSLKEY + value: /opt/tip-wlan/certs/postgresclientkey_dec.pem + - name: PGSSLROOTCERT + value: /opt/tip-wlan/certs/cacert.pem + primary: + extraInitContainers: + - command: [ "sh", "-c", "chmod 0600 /opt/bitnami/postgresql/certs/postgresclientkey_dec.pem" ] + image: busybox:latest + name: chmod-client-cert-additional + securityContext: + runAsUser: 0 + volumeMounts: + - mountPath: /opt/bitnami/postgresql/certs + name: postgresql-certificates diff --git a/tip-wlan/resources/environments/dev-local.yaml b/tip-wlan/resources/environments/dev-local.yaml index fab2a6b..8ad1c52 100644 --- a/tip-wlan/resources/environments/dev-local.yaml +++ b/tip-wlan/resources/environments/dev-local.yaml @@ -1,47 +1,58 @@ -# This is a development override file. -# It overrides the default Tip-Wlan parent chart behaviour -# -# It can be tweaked, based on the need to support different -# dev environments. -# This file expects to have a GlusterFS storage solution running -# before "helm install" is performed. -################################################################# -# Global configuration overrides. -# -# These overrides will affect all helm charts (ie. applications) -# that are listed below and are 'enabled'. -################################################################# +shared: + scalability: &jvm-options + tip_wlan_ovsdb_listener_threadPoolSize: 50 + tip_wlan_AsyncExecutor_CorePoolSize: 10 + tip_wlan_AsyncExecutor_MaxPoolSize: 50 + tip_wlan_AsyncExecutor_QueueCapacity: 50 + tip_wlan_httpClientConfig_maxConnectionsTotal: 100 + tip_wlan_httpClientConfig_maxConnectionsPerRoute: 10 + tip_wlan_maxHttpThreads: 100 + JVM_MEM_OPTIONS: " " + singleDataSource_maxTotalConnections: 8 + singleDataSource_maxIdleConnections: 8 + singleDataSource_maxPreparedStatements: 200 + singleDataSource_maxIdlePreparedStatements: 200 + singleDataSource_maxTotalConnections: 8 + singleDataSource_maxIdleConnections: 8 + singleDataSource_maxPreparedStatements: 200 + singleDataSource_maxIdlePreparedStatements: 200 + global: - # Change to an unused port prefix range to prevent port conflicts - # with other instances running within the same k8s cluster nodePortPrefix: 302 - nsPrefix: tip - # image pull policy + nodePortPrefixExt: 304 + pullPolicy: Always - repository: tip-tip-wlan-cloud-docker-repo.jfrog.io - # override default mount path root directory - # referenced by persistent volumes and log files - persistence: - # flag to enable debugging - application support required - debugEnabled: true + integratedDeployment: false + testingEnabled: -# Annotations for namespace + kafka: + image: confluentinc/cp-kafka:5.0.1 + port: 9092 + topics: + - name: wlan_service_metrics + partitions: 1 + replicationFactor: 1 + - name: system_events + partitions: 1 + replicationFactor: 1 + - name: customer_events + partitions: 1 + replicationFactor: 1 + creds: + sslKeyPassword: mypassword + sslKeystorePassword: mypassword + sslTruststorePassword: mypassword + +dockerRegistrySecret: ewoJImF1dGhzIjogewoJCSJ0aXAtdGlwLXdsYW4tY2xvdWQtZG9ja2VyLXJlcG8uamZyb2cuaW8iOiB7CgkJCSJhdXRoIjogImRHbHdMWEpsWVdRNmRHbHdMWEpsWVdRPSIKCQl9Cgl9LAoJIkh0dHBIZWFkZXJzIjogewoJCSJVc2VyLUFnZW50IjogIkRvY2tlci1DbGllbnQvMTkuMDMuOCAobGludXgpIgoJfQp9 annotations: { "helm.sh/resource-policy": keep } -# createReleaseNamespace: false - -# Docker registry secret -dockerRegistrySecret: ewoJImF1dGhzIjogewoJCSJ0aXAtdGlwLXdsYW4tY2xvdWQtZG9ja2VyLXJlcG8uamZyb2cuaW8iOiB7CgkJCSJhdXRoIjogImRHbHdMWEpsWVdRNmRHbHdMWEpsWVdRPSIKCQl9Cgl9LAoJIkh0dHBIZWFkZXJzIjogewoJCSJVc2VyLUFnZW50IjogIkRvY2tlci1DbGllbnQvMTkuMDMuOCAobGludXgpIgoJfQp9 -################################################################# -# Enable/disable and configure helm charts (ie. applications) -# to customize the TIP-WLAN deployment. -################################################################# opensync-gw-static: enabled: false + opensync-gw-cloud: enabled: true externalhost: @@ -51,22 +62,9 @@ opensync-gw-cloud: persistence: enabled: true filestore: - url: "https://wlan-filestore.wlan.local" + url: https://wlan-filestore.wlan.local scalability: - #how many concurrent connections single instance of OpenSyncGateway can accept - tip_wlan_ovsdb_listener_threadPoolSize: 50 - #asynchronous task executor - monitor metrics and adjust if tasks start being rejected - tip_wlan_AsyncExecutor_CorePoolSize: 10 - tip_wlan_AsyncExecutor_MaxPoolSize: 50 - tip_wlan_AsyncExecutor_QueueCapacity: 50 - #max total number of persistent connections in the http client pool - tip_wlan_httpClientConfig_maxConnectionsTotal: 100 - #max number of persistent connections in the http client pool per destination - tip_wlan_httpClientConfig_maxConnectionsPerRoute: 10 - #max number of concurrent REST API calls a single instance of this service can process - tip_wlan_maxHttpThreads: 100 - #memory tuning parameters for the JVM - max size, initialsize, garbage collection tuning options, etc. - JVM_MEM_OPTIONS: " " + <<: *jvm-options opensync-mqtt-broker: enabled: true @@ -74,6 +72,7 @@ opensync-mqtt-broker: persistence: enabled: true storageClass: standard + wlan-cloud-graphql-gw: enabled: true env: @@ -87,6 +86,8 @@ wlan-cloud-graphql-gw: tls: - hosts: - wlan-ui-graphql.wlan.local + secretName: nginx-ingress-controller-default-server-secret + wlan-cloud-static-portal: enabled: true env: @@ -102,6 +103,8 @@ wlan-cloud-static-portal: tls: - hosts: - wlan-ui.wlan.local + secretName: nginx-ingress-controller-default-server-secret + wlan-portal-service: enabled: true persistence: @@ -109,18 +112,7 @@ wlan-portal-service: storageClass: standard filestoreSize: 1Gi scalability: - #asynchronous task executor - monitor metrics and adjust if tasks start being rejected - tip_wlan_AsyncExecutor_CorePoolSize: 10 - tip_wlan_AsyncExecutor_MaxPoolSize: 50 - tip_wlan_AsyncExecutor_QueueCapacity: 50 - #max total number of persistent connections in the http client pool - tip_wlan_httpClientConfig_maxConnectionsTotal: 100 - #max number of persistent connections in the http client pool per destination - tip_wlan_httpClientConfig_maxConnectionsPerRoute: 10 - #max number of concurrent REST API calls a single instance of this service can process - tip_wlan_maxHttpThreads: 100 - #memory tuning parameters for the JVM - max size, initialsize, garbage collection tuning options, etc. - JVM_MEM_OPTIONS: " " + <<: *jvm-options wlan-prov-service: enabled: true @@ -139,26 +131,7 @@ wlan-prov-service: singleDataSourcePassword: tip_password singleDataSourceSslKeyPassword: mypassword scalability: - #asynchronous task executor - monitor metrics and adjust if tasks start being rejected - tip_wlan_AsyncExecutor_CorePoolSize: 10 - tip_wlan_AsyncExecutor_MaxPoolSize: 50 - tip_wlan_AsyncExecutor_QueueCapacity: 50 - #max total number of persistent connections in the http client pool - tip_wlan_httpClientConfig_maxConnectionsTotal: 100 - #max number of persistent connections in the http client pool per destination - tip_wlan_httpClientConfig_maxConnectionsPerRoute: 10 - #max number of concurrent REST API calls a single instance of this service can process - tip_wlan_maxHttpThreads: 100 - #memory tuning parameters for the JVM - max size, initialsize, garbage collection tuning options, etc. - JVM_MEM_OPTIONS: " " - #max number of connections to PostgreSQL database - singleDataSource_maxTotalConnections: 8 - #max number of idle connections to PostgreSQL database - singleDataSource_maxIdleConnections: 8 - #max number of cached prepared statements used in PostgreSQL database - singleDataSource_maxPreparedStatements: 200 - #max number of cached idle prepared statements used in PostgreSQL database - singleDataSource_maxIdlePreparedStatements: 200 + <<: *jvm-options wlan-ssc-service: enabled: true @@ -173,18 +146,7 @@ wlan-ssc-service: username: tip-read password: tip-read scalability: - #asynchronous task executor - monitor metrics and adjust if tasks start being rejected - tip_wlan_AsyncExecutor_CorePoolSize: 10 - tip_wlan_AsyncExecutor_MaxPoolSize: 50 - tip_wlan_AsyncExecutor_QueueCapacity: 50 - #max total number of persistent connections in the http client pool - tip_wlan_httpClientConfig_maxConnectionsTotal: 100 - #max number of persistent connections in the http client pool per destination - tip_wlan_httpClientConfig_maxConnectionsPerRoute: 10 - #max number of concurrent REST API calls a single instance of this service can process - tip_wlan_maxHttpThreads: 100 - #memory tuning parameters for the JVM - max size, initialsize, garbage collection tuning options, etc. - JVM_MEM_OPTIONS: " " + <<: *jvm-options wlan-spc-service: enabled: true @@ -193,78 +155,147 @@ wlan-spc-service: sslKeystorePassword: mypassword sslTruststorePassword: mypassword scalability: - #asynchronous task executor - monitor metrics and adjust if tasks start being rejected - tip_wlan_AsyncExecutor_CorePoolSize: 10 - tip_wlan_AsyncExecutor_MaxPoolSize: 50 - tip_wlan_AsyncExecutor_QueueCapacity: 50 - #max total number of persistent connections in the http client pool - tip_wlan_httpClientConfig_maxConnectionsTotal: 100 - #max number of persistent connections in the http client pool per destination - tip_wlan_httpClientConfig_maxConnectionsPerRoute: 10 - #max number of concurrent REST API calls a single instance of this service can process - tip_wlan_maxHttpThreads: 100 - #memory tuning parameters for the JVM - max size, initialsize, garbage collection tuning options, etc. - JVM_MEM_OPTIONS: " " - + <<: *jvm-options + +wlan-port-forwarding-gateway-service: + enabled: true + creds: + websocketSessionTokenEncKey: MyToKeN0MyToKeN1 + externallyVisible: + host: api.wlan.demo.lab.wlan.tip.build + port: 30401 + nginx-ingress-controller: enabled: true controller: service: type: LoadBalancer config: - externalStatusAddress: "api.wlan.local" + externalStatusAddress: api.wlan.local defaultTLS: cert: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZXakNDQTBLZ0F3SUJBZ0lVUU5hUC9zcHZSSHRCVEFLd1lSTndieFJmRkFzd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0hURWJNQmtHQTFVRUF3d1NkMnhoYmkxMWFTNTNiR0Z1TG14dlkyRnNNQjRYRFRJd01EZ3lOekl3TWpZMQpObG9YRFRNd01EZ3lOVEl3TWpZMU5sb3dIVEViTUJrR0ExVUVBd3dTZDJ4aGJpMTFhUzUzYkdGdUxteHZZMkZzCk1JSUNJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBZzhBTUlJQ0NnS0NBZ0VBd1JhZ2lEV3pDTllCdFd3QmNLK2YKVGtrUW1NdCtRQWdUallyMEtTOERQSkNKZjZLa1BmWkhDdTN3NEx2cnh6WTlObWllaDJYVTgzNGFtZEp4SXVDdwo2SWJObzZ6c2tqc3lmb084d0ZEbWxMVldMZWc1SDlHOWRvZW0rV1RlS1BhRUhpM29xdXpOZ3Q2d0xzM212dk9BClR2aVRJb2M4OEVMams0ZFNSMlQ0ZGhoMHFLQ0NqK0hkWEJBNlYvOWJpcnUralYrL2t4RVF1TDJ6TTM5RHZWZDgKOWtzMzV6TVZVemUzNmxENElDT25sN2hnYVROQmk0NU85c2RMRDBZYVVtamlGd1FsdEpVZG1QS3BhQWRidmpVTwpuc3VwbkRZam0rVW0rOWFFcHFNNHRlMjNlZkM4TjhqMXVrZXh6SnJFMkdlRi9XQi9ZMUxGSUcyd2pxVm5zUGNzCm5GRjRZZDlFQlJSbmUxRVplWEJ1M0ZFTEZ5NmxDT0hJMTQ2b0JjYy9JYjYxN3JkVEtYcXh0di8yTkw2L1RxRmsKbnMvRUVqdmU2a1FZemxCWndXSFdwWndRZmczbW82TmFvRlpwVGFnOThNeXU1clpvT29mVGN4WEg2cExtNVB4MQpPQXpnTG5hOU8rMkZtQTRGanJnSGNNWTFOSXp5blpMK0RIOGZpYnQxRi92MkYyTUErUjl2bzg0dlI1Uk9HTmRECnZhMkFwZXZrTGNqUWcvTHdzWHYwZ1RvcFEvWEl6ZWpoNmJkVWtPcktTd0p6VDJDOS9lOUdRbjBncHBWOExCdUsKMXpRSG9ST0xuQTQxTUNGdlFMUUhvK1h0OEtHdytVYmFseTZoT3hCWkY1MUwvQmJxamtESDlBRUZhSkxwdGlFeQpxbjFFNXYrM3doZ0ZTNUlaVDhJVzV1VUNBd0VBQWFPQmtUQ0JqakFkQmdOVkhRNEVGZ1FVeTJiQVV5TlBYSFM5CjNWVFNEK3dvTjd0M3E4RXdId1lEVlIwakJCZ3dGb0FVeTJiQVV5TlBYSFM5M1ZUU0Qrd29ON3QzcThFd0R3WUQKVlIwVEFRSC9CQVV3QXdFQi96QTdCZ05WSFJFRU5EQXlnaHAzYkdGdUxYVnBMV2R5WVhCb2NXd3VkMnhoYmk1cwpiMk5oYklJT1lYQnBMbmRzWVc0dWJHOWpZV3lIQk1Db0FBRXdEUVlKS29aSWh2Y05BUUVMQlFBRGdnSUJBS0grCmJxSmVlMTFuMzRTWWdCRHZnb1o4bEpMUVJ3c0ZucUV4Y1NyL3BsWjdHVklHRkg1L1EyS3lvOVZ5RWlUUHdySXMKS3NFckMxZXZINnh0MVVSZk16cDA1elZRMExZTTUra3NhbVJEYWdBZzNNMWNtN29LT2Rtcy9kcXpQZTJnWmZHSgpwVmR0VlcxQ0hyTDBSTFRSOTNoN2tnU2lCbFNFSVlNb2VLZk41SDlBYXZKNEtyeXlnUXM2M2trR1E1TTllc0FwCnU2YkIzMDd6eWZ6Z1MzdG1Rc1UwMXJnSmZoRUhRL1krQWs5d0R1T2d2bWZ4MFRXZ0FPR2JLcTZUdThNS1lkZWoKSWU3clYxRzVVdjdLZmdvelZYNzZnMktkblRWQmZzcFNLbzN6eXJaa2NrekFwdlV1OUllZkhkVG9lNEpNRVUweQpmazdsRVUvZXh6Qnl5TnhwKzZoZHUvWklnM3hiMXlBMW9WWThORWQxckwxekFWaVBlMzUxU0VORUtlSnBSYW5DCmtDTDNSQUZrYnhRN0loYWNqb3g4YmVsUitnbW84Y3lGWnBqOVhhb1BsU0ZTY2R3ejU3M0NUMGg5N3Y3NkE3c3cKeUMrQ2lTcDg1Z1dFVjV2Z0JpdE5KN1I5b25qQmRzdUgybGdFdE1EM0pOT3M4Y0NTUmloWXhyaXdaU3FoVDdvLwp0Y0lsY0o4NFc1bTZYNnpISjNHbXR1S0czUVBOT21zMC9WVm9EVHA5cWRwTCtFazE3dUIyQTQxTnB4ejNVUytsCjZ5SytwZFFRajdBTHpLdVJmT3lnODBYYk53MnY0U25wSTVxYlhGQlJ1bTUyZjg2c1BlbUZxMUtjdU5XZTRFVkMKeERHM2VLbHUrZGxsVXRLeC9QTjZ5ZmxiVDV4Y0dnY2Rtcnd6UmFXUwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUpRUUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQ1Nzd2dna25BZ0VBQW9JQ0FRREJGcUNJTmJNSTFnRzEKYkFGd3I1OU9TUkNZeTM1QUNCT05pdlFwTHdNOGtJbC9vcVE5OWtjSzdmRGd1K3ZITmowMmFKNkhaZFR6ZmhxWgowbkVpNExEb2hzMmpyT3lTT3pKK2c3ekFVT2FVdFZZdDZEa2YwYjEyaDZiNVpONG85b1FlTGVpcTdNMkMzckF1CnplYSs4NEJPK0pNaWh6endRdU9UaDFKSFpQaDJHSFNvb0lLUDRkMWNFRHBYLzF1S3U3Nk5YNytURVJDNHZiTXoKZjBPOVYzejJTemZuTXhWVE43ZnFVUGdnSTZlWHVHQnBNMEdMams3Mngwc1BSaHBTYU9JWEJDVzBsUjJZOHFsbwpCMXUrTlE2ZXk2bWNOaU9iNVNiNzFvU21vemkxN2JkNThMdzN5UFc2UjdITW1zVFlaNFg5WUg5alVzVWdiYkNPCnBXZXc5eXljVVhoaDMwUUZGR2Q3VVJsNWNHN2NVUXNYTHFVSTRjalhqcWdGeHo4aHZyWHV0MU1wZXJHMi8vWTAKdnI5T29XU2V6OFFTTzk3cVJCak9VRm5CWWRhbG5CQitEZWFqbzFxZ1ZtbE5xRDN3eks3bXRtZzZoOU56RmNmcQprdWJrL0hVNERPQXVkcjA3N1lXWURnV091QWR3eGpVMGpQS2RrdjRNZngrSnUzVVgrL1lYWXdENUgyK2p6aTlICmxFNFkxME85cllDbDYrUXR5TkNEOHZDeGUvU0JPaWxEOWNqTjZPSHB0MVNRNnNwTEFuTlBZTDM5NzBaQ2ZTQ20KbFh3c0c0clhOQWVoRTR1Y0RqVXdJVzlBdEFlajVlM3dvYkQ1UnRxWExxRTdFRmtYblV2OEZ1cU9RTWYwQVFWbwprdW0ySVRLcWZVVG0vN2ZDR0FWTGtobFB3aGJtNVFJREFRQUJBb0lDQUMyR2hEc1pUaWtiTERQMlR6Q2VkOVVoCmJRUlpsbDdLaUxHcXZYNm9VdjhJcFNLdTJrS3h1blpkTzVvQk5NbzNnNTg4YzRSQkFrQ1d6dmJObzFjeDJ3UTQKSkd3ZTdYaGM5TDdYbUwxUFZjNWlJdnVYOFVBTFY3eUdwMXZONklPSC9BYVJsSFlZZHl3UURVSTcwZGZiMmJqRQo2d3dORHRVbk1Ea3NncjNLbExwamNiNEFla2dxWE9MRUFMMld1Nkt1T1hOankrdUU3b2hnVWN3bWlYWXZGb3VMCm1KYXVlS3l5U202NHdJZnpZQ1JwbUhHMVlCTGpic0xJb20zcmZYRkl3V1hqMkhBSGFIOFRWOVhyUmpwR2tEZm8KbFFqN3l0R0s2ZkllMWcva0ZBN3hDWDE2d1NYMS85bjM1WGYwVmMwZ08zdE9NVHJkM1JTVVNEaVp6eVR1WWxuZwpETEdmYXZjRS82QXJ5cTlWZ3hyUXdXbnZhd0hIcWxBWUtxVHpJYkRJS0Y3SjRYTE9FckFtRE50T1I2Lzc1WjJ3CnVPQlFYT0N3NFM1dWxWdzhIZUM0NGlFTmxJYU5lNDNWTkZUTGtRM3lCeW96VVlYWTN2eEJXMWpURFpFOTB5YTUKZzk4cmFiYWhIS0lockpGYzNXYTE0RWhicUE2TVVLSXRRTkk4K1N1Rk1KV3R4VW1iM1cxK2dHbXJvTmo1TU9kYQpzdjV5OThTYS93UUc4dGc0cmdNQ0xpQVNHL3hudDB3RURrNXFDVUUxRzRSdkdOeUYxU09zNk82c1BTOTg4Umd4CnJuamQvWWZoME5xVnhHcHFGNnhpQVgvZXkyU0NGUWNybEtmNnhGREF4YjI4RTdaNnRQSUZCTWxpQ1IrbzdYR3MKZDNvUWVuMThCalM1NjdtR2ZmNkJBb0lCQVFEanFFcHZqOVhJVVB3bk1RZitRY3R0R1pXZEp2bFZSa1BSMW9maApSVWI2UHdFRkEwdVQyM011ZmFvNGI4bWIrM2Vra1BkYTZmbWJqUGFUckQrbk5YNGxyRE5oYytvcVY4aFVEQnA0CmpVcEg3OXorTVNUZVVQclpnS3VMeEdqaDJiK0FWYVZjZTI2STVYUXVoUnR6ZHFYZDlIeSs4YXpYRTltbHlPQ00KMUpEK2VHZWxhaVJMbEZBbVRDNDNoNlV5T0Q5SmZOSW1oWDQ2WDJRRlFsbGc1cWxVdWQ4Ukx3eFViZTJoYzhTWQp4VnVvYVZSSUdBSmhqRkd3ZVhnRjdzc0tQNXBZMHRkTlNvSGsxeHRnUmVJTlllZFU1cmtpKzloZTN0cStqWUdJCmxVcVVzYzNzN3c4cUk1UXk5NGdmcUI5Lzd4K3BFdGEvak9leE4yL1pGOFJGSXVucEFvSUJBUURaSUpUaUUxKzkKc2xnQ0NGVllLR3Z5aE5odkppck94enlOUWU3YjIvZmxQNzVHd0pTTWpZZTdoTmhGK3JrZHRJcXF5dWxyeGF3YgpPbWliU0FCSG5kT20ycDRMdDhaK20vQXZaRUgzVklLdWkwY0xVbTlKRXNsWURVcFIrdG5BemloNzdrS2FlVzlnCk1wdlpiUzZGdXE2ZlBZQUJyK3dXeU1IazR0UnRNZ3duUFRtSzZQTW85b3FIUURTSVJjL3N0N2hBTUwwMDdtNlEKOTJkRXRqNTNtSTBURTRISVhtY3hZbjV5NGVJLy85aEFMb2xFa0ZHWDU0SmNMdWpDWWkwQ3RIU0xDcnNmQkJwZgpDS2NaMk5sWFNiYVREU1prZWhnQWFWTlM2OVp1K1o2eGFvNmZZMjVxSnNmeXlaUkNjSzJYY0FoUDV2QWNUbWhQClNKUFJZc1dSNXZ1ZEFvSUJBRmtRRXFiWWg1TkprNHdsazNIMS9ZYWVGcmtYY1QzYU1sZ2FiS2hGdVFIWHVpZGkKNWFOZm5BMFpIb25idWV6ckVTQnhra09mKzRYT1BQMEN5eGc0UmpTb3pLVVlld2k3dE9Ta280cDhCQTVtbVhkYwpkSWNBK1ZJMEUyaW5tenlZT21JVG41Q3h2VW1UTXNPc1VWUDNtK1pjYXAwczRTaDNYSk9PSmNNU3VmTEQyaENOCm1NdDBwM0tFSlNTV1RadDdBODlWSk1YclBibktiYy9jNkNpUHRMa3Z5a1BudXhRZ3VYR0xYK05BZXA1RkxyTFIKcWNUTjUzdDUyZW5BUlBDcWQxQytrM3BxWnF6SE5xK1FSMkppNWVTQ0t2V3p2eTlHVWg5d0xyZm5aL2tLSW56SgovWTNIdzRlNDdTa3RWYjF3S0Z1MXdndklMVEJZZHNwZ2tPbFhRbGtDZ2dFQUtKYVJuazFXMldRc1ZYenZUMEtICkkxZTRDZGNOcTRmTkJ1N3JVc2drNkFMcGM5cHVLblFPaW54RDNaa0gzOGl2SDB3OUpEdFlkK0tNU1hMRk1wNEwKUWFhZVlyeGc2NndFMHljZnViZGZrbmRRdVlvWWFZV01nOXhBSjJFSU1hV1lKY3FkUXJrdW04SDZKa1BsclhQLwpUcDgxZlp0QU8rWWRjTWNDUk1OVlNFU0dyRFB0dUp1VnU4REIwVE9Uc2NHS1BOMmZrUFI5VUxZZTVOWllpUXpJCldtZU1IRU9oY0xiandsLzlaazlTUW5Vd2pkT1luUmZXNDVxVlFqa09CdkpxMHM4WHVhMlBySEkyb250SjdhcEcKNmVoTVkvMzYzS0RUeGExMmNWcFNVd0lEVlVKR0VxdmJOc1I5NVltZ3VhMWtzR01RUVlwYXIyOTJ5bTUzVmxYaQpkUUtDQVFCTUFYS0RaNVZobHBRR1VlUk1FNVhqVm1KOE1WdlZTUzV3NzBGOC9CS0ZnZFBJNnR2Nkx5UGh3OTRPCmxZVldoOXJmdUpmbWllK1ZJSWhaeSthUVNpVVhGQUtTdjZFTWJ1bXdjN1pUNEkyYitDTXQxUEhaTEZtUEN0OXAKOEorUDdoaDlRYWRBYzZqZEdSa0NMNkpMU3VoeWhMbW90SG9IS0ZJazdhNENNZGl2QnB3SVdxMWVScHd0aWRrNwpIdytrdlJ5YW5DMUJVU1dYNGxJcW1LanAyR1B2UDVVdVV2RUlPNitqaWFyWTJDTUNKb3BtcVJ2WWQzNGtSVkF1CjZueFl4a05neEFQSnVWN2tkZVVzQXg5Q1FZcFQ1blFmendtdlVGa0FraHJoTmw5dUJRUDhMdkZORFQ0cWU0bFcKUWw0cXRFZFNiZDVxVWVVdkgzOG5JMmpTVDVMawotLS0tLUVORCBQUklWQVRFIEtFWS0tLS0tCg== wildcardTLS: - # self signed wildcard cert for *.wlan.local cert: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZEekNDQXZlZ0F3SUJBZ0lVYSthaVJZWG9QTGliSS9wdVJCdi9DZ2RTTDNzd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0Z6RVZNQk1HQTFVRUF3d01LaTUzYkdGdUxteHZZMkZzTUI0WERUSXdNVEl5TVRJd05UQXpNVm9YRFRNdwpNVEl4T1RJd05UQXpNVm93RnpFVk1CTUdBMVVFQXd3TUtpNTNiR0Z1TG14dlkyRnNNSUlDSWpBTkJna3Foa2lHCjl3MEJBUUVGQUFPQ0FnOEFNSUlDQ2dLQ0FnRUEwQjhuZE1raGIzZEN6N0I2aS9kRlFWenJwaEtQK2RmY2JKN1gKMzB3MU1FWDIvM3ZvVStkRlBNbnZrS3hEdFJwanZCbnhCczF6L1VmajlyUFhDSzZkazNNYU5DajRQYVUxem9WQQppK1Z6amc0ZG5XNjJxWG1qYVYrYUMrQm5zQndyQmx2THQ0dkh1eFRLbHh1RnR4THdid3VObGJvS1lVN01kV3oyCllMY3QzUWZBWElVb2FRK1RTMUZGdVdFeEZOTFRidlBGZWNoajB4ZnhyOU5BcU9aTXI0RGE0NHMzVERxMVVyRTIKbjhaZXFxVXZ1YUE4ZmEzQjNVZVRFNmJ4OEdhN1JybG5Dakd3UDRGVml3ajdvellmanV6T2JOM2dlcjdWcEpLMQpMSjdIdDBBemZlRm9aQ2xPbUVBd1p5alFwRGZOckdNTCs1dWtIK2JxWngyaUo5UndFcDNmdlE4em5jN1Q4dHJDCmxzMjRWNUpySWhUQXlCcTZRWVNnSXdXM2V5TmVpUnQ0ZHp6Sk5rNnd4cFp0WE96WTFwamJrV2FMaEhKOW1LRWoKU3lqVVBnS3dKSVlmb3BJbTJoUzl1dVZHZDdiU1MyV055aHJSOU5LSG5Lamo5Y0IrUWU0eEh0Z1pEcm1GZ1ZpZQp0cXZBUHhJL0ZkV1pSN3RmT2JCNTR3alMxVFk3TEd6cll4TDZSMWNjZDE4WUppcGNTS05xa05ORlllZ092VkNICmFldW1OTUdVNlZZalJWS1JmQXMva2FzcWxleGpheSt0SXNtd3dDZGoxUUN3UitRa2VEZFdoNE8vQzM1NENRb28KTkxZYzRNRk8xbVVDY2NsbUgvbFBvcTd1anBCMWI2VmFBNVprNFhjVUpRc0c4SUlSMDFHTFM5RW1HVVZaeTlOWApwV2dCbXNVQ0F3RUFBYU5UTUZFd0hRWURWUjBPQkJZRUZOZlVJSGhXdnFwUzg2ZC82SnJvbmxFYzZMU1NNQjhHCkExVWRJd1FZTUJhQUZOZlVJSGhXdnFwUzg2ZC82SnJvbmxFYzZMU1NNQThHQTFVZEV3RUIvd1FGTUFNQkFmOHcKRFFZSktvWklodmNOQVFFTEJRQURnZ0lCQUtlTW9PckhLZ3BGemtkckVhMVhSSVRUOHFZanhKc04yNmFIMFovLwp1dDRXVkE4ckNDNzV4VkpaNnpBQWlBOFE2eTRYSHBzRzl2ZSs1QlJIWEdCS0lYOU5FZGNrbWdNdExzQ2xOR0JCCkxkN3lWd3hhaGVCQzhVTWIrVTAxMlNwaFc3K0t6UFJhQ3g4cHNMMUlFQUkyblQ1MzlCNDBmR2NyTktNSDRqZGkKdkxad3VxT00rZnJucFJ1MkZlK3Bja2Fwek92SEJTb0I3THovR1dmMWUwZ0llc1B4WEdmVG9hbGM1SzU5bDF1TQpCTkhpUW15S3E4TS9MbllMejhyOWp3dHNKU2lLYUljelpISjNtQ0ZUb3ljREF3NTl3WEdmWXZWcFBMaWZXTTJxCm1uSlJKM2dQS1lzOUhXWFgyYktoSmZoMjRLOTN2M1duMVRUellYOGtTbWlnRG0wTUhOSTNwZktlMmJqVW9MNmgKMlQ4bWhRbjdPQ2dvZHMvOXczR1dOdmFxYTAySHRnc0tTbk9YdmpSNXFMaVFLRjdhMi95TTlrNWNQcUdHaW1GYgppUWV3eUgvMWw2YjQ0T0s2RGwwMVltWFltNUVqR3plckp2aU90eUhSaWhtME01VmNBWWJaYkE0S1Y1eHhLZjRqClIwaktwQXdqbEpzTDdRMk9zTC9IRkxmaDV1RU1HMXlmTzF1blZkVURKK1FBZHJQUG5tZTZVTVFQZm1UcGx1WjAKS3pvOXY3NEpYV0pwQkNtaWNTbFBQdnB3cXZLTk5iOWd6b0hjOXFheWMwNWVxRldRbzNNZjIzYU82b05wU2ZuaAp5aWMvczFQcC9ZS2FHakVSQXB1UmRvYTlWT1diUncycFZMei9rZVNraS9QTDJFRFc4RUVHYjFXcUFBMkJPVVhDCi9oYXQKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUpRd0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQ1Mwd2dna3BBZ0VBQW9JQ0FRRFFIeWQweVNGdmQwTFAKc0hxTDkwVkJYT3VtRW8vNTE5eHNudGZmVERVd1JmYi9lK2hUNTBVOHllK1FyRU8xR21POEdmRUd6WFA5UitQMgpzOWNJcnAyVGN4bzBLUGc5cFRYT2hVQ0w1WE9PRGgyZGJyYXBlYU5wWDVvTDRHZXdIQ3NHVzh1M2k4ZTdGTXFYCkc0VzNFdkJ2QzQyVnVncGhUc3gxYlBaZ3R5M2RCOEJjaFNocEQ1TkxVVVc1WVRFVTB0TnU4OFY1eUdQVEYvR3YKMDBDbzVreXZnTnJqaXpkTU9yVlNzVGFmeGw2cXBTKzVvRHg5cmNIZFI1TVRwdkh3WnJ0R3VXY0tNYkEvZ1ZXTApDUHVqTmgrTzdNNXMzZUI2dnRXa2tyVXNuc2UzUUROOTRXaGtLVTZZUURCbktOQ2tOODJzWXd2N202UWY1dXBuCkhhSW4xSEFTbmQrOUR6T2R6dFB5MnNLV3piaFhrbXNpRk1ESUdycEJoS0FqQmJkN0kxNkpHM2gzUE1rMlRyREcKbG0xYzdOaldtTnVSWm91RWNuMllvU05MS05RK0FyQWtoaCtpa2liYUZMMjY1VVozdHRKTFpZM0tHdEgwMG9lYwpxT1Axd0g1QjdqRWUyQmtPdVlXQldKNjJxOEEvRWo4VjFabEh1MTg1c0huakNOTFZOanNzYk90akV2cEhWeHgzClh4Z21LbHhJbzJxUTAwVmg2QTY5VUlkcDY2WTB3WlRwVmlORlVwRjhDeitScXlxVjdHTnJMNjBpeWJEQUoyUFYKQUxCSDVDUjROMWFIZzc4TGZuZ0pDaWcwdGh6Z3dVN1daUUp4eVdZZitVK2lydTZPa0hWdnBWb0RsbVRoZHhRbApDd2J3Z2hIVFVZdEwwU1laUlZuTDAxZWxhQUdheFFJREFRQUJBb0lDQVFDUVRkbXN4enl3cmUrY1ZCQlVkaW9GCjdTalRhTEY5bWFlVGhQdkhMMjc5dnJWSlpoK3I5WUp6YU16NzhnV3NUOVR4ZXNjOVlUMVlVLzJEZENUWU4wSzUKRnlrSEc1VXNJUjVTeU4vOVlDWWtURE5La3BhQ29mMmxOWTE1U0twOFdMdVlXQlBEZTE4TW41anM5ejlhdGY0Ugo4Ti9GL2szdU5KWGRvYVNmWU1Pakt4bTh6UE05RFhpaTA0SlZ6RWNjMmlXU0crSkQwNmNybWNHUm1SZVBSTWZOCk5Mb1E1ZGw4dUlRN0J2Y0tCNkJpRDlFc2t5YitPWGxmTlo2TUZNaFNXTmpuYSt3L0REN1plWkxYcVczWk45RGYKNStBbGFoNlkzVE1EUGxueXkxRk5CVzN1alZrMWdkS21ESFBEUTNDUFBNWVdEa01qdlVJcWdKRHMySVl6dWIvTwpXRjRVUTV5UEJhZzluaWp1dS9uMVZDdGZuSkxwakZIakU1VzdkK3p1UGh6aUJ1WDFOcjRtOVVJdEpaSTNsYmJtCmdvZFlMdGl4b3RwNWF3ang1eXA3MU1zUHlTZzcrbHBPenA4dStuRENJcnc0K0VSME56MG8yTXFmcmJ2VklGQXIKWHIyc2YrejljbmtxalBWWEZaVks3em1TUHI5N0YrbTV4RHpURG9lTG53aVlhUUpOQ0ZhejhMVERjNldVT2w4SQpLOWhHd3FaK0llTlgreW16em16Nkx6WWVPaGlrRmNRaUI0UXVPSjdWWnZWRmVoS3JJMXJLWHJDRU01VmpJZXBkCkhzR0c1eTlLUkcxdEszSU5ScmI0SHlhRDF6SHJSTHRneFpLT1BvWDN0UjNmbTJ1aGova3dwelZnWTltRXJDWDkKd2I4SVA5TXdRR3REQVNBcjZWVmJvUUtDQVFFQThIeWlaK1lVeFEzQnprL1hoNmZMWWNYakE3NTJrQ204VWZzWQp0d1Z4N0EyNW5YRStiUDRIT3UyVC9kTlc0Tkw1elZPT0JkaWZIcTJQVFNVMGYzQUFHL0pNcnVzM3NrNHd4azM5CitYYlh0dHltWkdxb3FEcVN3TUw2czVpY1RnangvenRhSXk1TWFKYWhUYUpNdFRQQlVpZ3U3enhoeGNwVlhNVUMKTklHcFl5Mkt5R2hyMjVVOFdlR0RYQm9SS2xYUXJXYkNZeW1kMXdYQStEaVl0dzA5eit0VHhPNTRodjFCZkJKZwpWMGd0VWdJU0I2WEZDMU9CWDZXQ1pXYlhCN2hPaHhISjNkNHAyQlZyN0gxL2JDQ0ZvVDY5by9WQVNHRmdtTHRiCnpGalRNbjFIaTluVW5jUFlScWpsN1h0NWdPOHBOa3BwMjVrNHIxRVludWhIazcrYzdRS0NBUUVBM1l3THozNloKNEVPRndvODIrUlVId2lkaFExOEdrU1JvWStKVm1udXJpSXdHZTk3ZmRTVk91d092SDlZSVhsRWpjRitoOHFQVQpJVnpIOXBuYXZjTENEMnhIOWZ5d09ML3pmYmJnYnExZjV4Y3BOUXlYM1JnTGFDUVpLNkpJa3NzOUtDb0dhSzlaCmpMVm41MjFFZlFBRE5DSi93YlRCb3dLQ0dTNDUzSzRBaWFEWHN6TkJLUk5MOHVaWWYwK0x0U2IzV3lkZVQ2eUgKdGZiSXR3NlBSS1lxb2NaeGIrM0pWQWFHcGxScjVZSlNDU1BtTjFMSjU0djlTcXBIVnJMNzJudFNwKzdDODJ6SgpJajVOSXFEOGFsOVZ3WFB5dExRd25hYWc1TW5ka0NLQ3R0MlVHSGZwMEh3ZTJTL1hkemppS2gzZTZaT3MyMSt1CitQUHVrSkUxTTZzU09RS0NBUUJjWVJRbDR6MUJRUHFjM1JESEhJN0UvVFlxWHdTK2RqblFLQ3VqU3FVcmIwNUoKQzVKV1hmSzdFVDVUTjliY3dFNlRNRENUVUZZM2U2WmJsUm9vaGdhVXRhdjlXWC9vcjU2TzNyRGNIbW5ZNWNQSgpPU3VXakFHSnFKeVRWdUZjSEpXUlhPUlFOVjNHbzI1Tkd6WnFPUHBmSys1em1mZFkrbE4yTW51WlhlR0twcGowClNTQjlsa003cDZSRlFnSXNDQkVFTzBBYXhZYkxiWHRtSHArVFdiUFA1ZThrN0JKQ2tKQ1NMNkR3aGxwYWNVOHAKdnVVRlo4dC95VjFneEhOL2xLNGR0cGliOE5hVUdnNStKdXRHeHV0dU9HS3kwK2dncGI5c2pEUkVPQzdRNjAwTApqTjdleDdlUjFSbVY4Mk9HUXRqSzhTVGU1V25mOXNBRmN1YmorNncxQW9JQkFHYXM4Z2hQRHpkOWM2OXd1alNFCkI1MTJyTUFSZVRTcEgrd3l5Q09aYnkwUVlDem1aTCtnODdUK2h4b0ZFc25MWnRZOHJBeU0ydEkvY3JrYUl1TlIKTUtqL01QYVREb1N1aVVWWkRQaWVSMVVOU2Q2NUlHU3FNUmNwcTdTcU9HSTM2UGNGU3dVWFJ6Uk1Hb1NLQW5UQQpIYnY2eFNUY0JlWHJVcW9pMzFRa0hFR3NsbXNKdFFnNVZqaVRncTQyQ25TQlE2QXVSYW85Tm9RaGhISTZRREc3CnBRUm11TW43OVJPSkZyeGRZY2Z6TnR2ZmxHRk5jQjlzcEk0SERwcml4cEJDR1ZPVTl5cmozdStNMmlqVFhVaGIKT0o0NGcySTJKRlhjRkxNVHp5aHVwZy9qN3kvTDIwUHhVa2Fyd25zUmxOZWFFbVpFTjVkUDZBS2U0cENEaTVtUApqaGtDZ2dFQkFMUmtVeG9oZDh2ZVBwR3hPbWlOak5HekpiTDlscGx0TWxhR0dPQ3JOUkZSeEppblgzWU9UVnhiCkRFVlpqaXRHNldydzFxaDdnZXAzeEdJaWZHQ1lZV3pNc0RZTitueGtwV0lRRmZOV3dYemNRWlhrTEduZVlUdTAKSVU2RjY5Myt1Q0tkcHVCdVl0d3BQNEJCVkNCRTVON0FzRGV4bFBYTzk1cEw3ZzR4OG5RckdNeGJlRXVOdytaTwpPYmYvTnFFMGZZcURkaERiVHI0UDR6bUpBRlpYeDlKMjNJdWRMUFI3MDZITGZ5bDMrb1pUS2Y2ZWdEL1drWXZGCllLdEtDZzI1UmtSYmZBakZkeDlpOVkzcDlPNEFNVUNaRVFIOWQwU1d6LzJWR0VmYzVha09YL2xvWlAyUXF3c2UKeXMyc0k1U0Z5TEd1ZGM3R2MzVTd5UGd0RVN0elVoWT0KLS0tLS1FTkQgUFJJVkFURSBLRVktLS0tLQo= -zookeeper: - enabled: true - replicaCount: 1 - persistence: - enabled: true - storageClass: standard kafka: enabled: true replicaCount: 1 - persistence: - enabled: true - storageClass: standard - creds: - sslKeystorePassword: mypassword - sslTruststorePassword: mypassword - sslKeyPassword: mypassword -cassandra: - enabled: true image: debug: true - cluster: - replicaCount: 1 - seedCount: 1 + auth: + clientProtocol: mtls + interBrokerProtocol: tls + jksSecret: tip-common-kafka-certs + jksPassword: mypassword + tlsEndpointIdentificationAlgorithm: "" + jaas: + clientUsers: + - brokerUser + clientPassword: + - brokerPassword + extraEnvVars: + - name: KAFKA_CFG_SSL_KEYSTORE_TYPE + value: PKCS12 + allowPlaintextListener: true persistence: enabled: true storageClass: standard - creds: - sslKeystorePassword: mypassword - sslTruststorePassword: mypassword + metrics: + serviceMonitor: + enabled: false + namespace: monitoring + selector: + release: prometheus-operator + zookeeper: + enabled: true + persistence: + enabled: true + +cassandra: + enabled: true + tlsEncryptionSecretName: tip-common-cassandra-certs + image: + debug: true + persistence: + enabled: true + storageClass: standard + replicaCount: 1 + cluster: + name: TipWlanCluster + seedCount: 1 + internodeEncryption: all + clientEncryption: true + exporter: + enabled: false + serviceMonitor: + enabled: false + additionalLabels: + release: prometheus-operator + dbUser: + user: cassandra + password: cassandra + resources: + limits: {} + requests: + cpu: 1 + memory: 3Gi + postgresql: enabled: true + postgresqlDatabase: tip + image: + debug: true + metrics: + enabled: false + serviceMonitor: + enabled: falsea + namespace: monitoring + additionalLabels: + release: prometheus-operator + postgresqlUsername: postgres postgresqlPassword: postgres -## NOTE: If we are using glusterfs as Storage class, we don't really need -## replication turned on, since the data is anyway replicated on glusterfs nodes -## Replication is useful: -## a. When we use HostPath as storage mechanism -## b. If master goes down and one of the slave is promoted as master + pgHbaConfiguration: | + hostssl replication repl_user 0.0.0.0/0 md5 clientcert=0 + hostssl postgres postgres 0.0.0.0/0 cert clientcert=1 + hostssl postgres postgres ::/0 cert clientcert=1 + hostssl all all 0.0.0.0/0 md5 clientcert=1 replication: enabled: true + user: repl_user + password: repl_password slaveReplicas: 1 persistence: enabled: true storageClass: standard - readinessProbe: - initialDelaySeconds: 30 + volumePermissions: + enabled: true livenessProbe: - initialDelaySeconds: 30 + enabled: false + readinessProbe: + enabled: false + tls: + enabled: true + certificatesSecret: tip-common-postgres-certs + certFilename: cert.crt + certKeyFilename: cert.key + certCAFilename: cacert.pem + initdbScriptsConfigMap: tip-common-postgres-scripts + extraEnv: + - name: PGSSLCERT + value: /opt/tip-wlan/certs/postgresclientcert.pem + - name: PGSSLKEY + value: /opt/tip-wlan/certs/postgresclientkey_dec.pem + - name: PGSSLROOTCERT + value: /opt/tip-wlan/certs/cacert.pem + primary: + extraInitContainers: + - command: [ "sh", "-c", "chmod 0600 /opt/bitnami/postgresql/certs/postgresclientkey_dec.pem" ] + image: busybox:latest + name: chmod-client-cert-additional + securityContext: + runAsUser: 0 + volumeMounts: + - mountPath: /opt/bitnami/postgresql/certs + name: postgresql-certificates diff --git a/tip-wlan/resources/environments/dev-microk8s.yaml b/tip-wlan/resources/environments/dev-microk8s.yaml index d25e139..1f47a5c 100644 --- a/tip-wlan/resources/environments/dev-microk8s.yaml +++ b/tip-wlan/resources/environments/dev-microk8s.yaml @@ -1,47 +1,59 @@ -# This is a development override file. -# It overrides the default Tip-Wlan parent chart behaviour -# -# It can be tweaked, based on the need to support different -# dev environments. -# This file expects to have a GlusterFS storage solution running -# before "helm install" is performed. -################################################################# -# Global configuration overrides. -# -# These overrides will affect all helm charts (ie. applications) -# that are listed below and are 'enabled'. -################################################################# +shared: + scalability: &jvm-options + tip_wlan_ovsdb_listener_threadPoolSize: 50 + tip_wlan_AsyncExecutor_CorePoolSize: 10 + tip_wlan_AsyncExecutor_MaxPoolSize: 50 + tip_wlan_AsyncExecutor_QueueCapacity: 50 + tip_wlan_httpClientConfig_maxConnectionsTotal: 100 + tip_wlan_httpClientConfig_maxConnectionsPerRoute: 10 + tip_wlan_maxHttpThreads: 100 + JVM_MEM_OPTIONS: " " + singleDataSource_maxTotalConnections: 8 + singleDataSource_maxIdleConnections: 8 + singleDataSource_maxPreparedStatements: 200 + singleDataSource_maxIdlePreparedStatements: 200 + singleDataSource_maxTotalConnections: 8 + singleDataSource_maxIdleConnections: 8 + singleDataSource_maxPreparedStatements: 200 + singleDataSource_maxIdlePreparedStatements: 200 + global: - # Change to an unused port prefix range to prevent port conflicts - # with other instances running within the same k8s cluster nodePortPrefix: 302 - nsPrefix: tip - # image pull policy + nodePortPrefixExt: 304 + pullPolicy: Always - repository: tip-tip-wlan-cloud-docker-repo.jfrog.io - # override default mount path root directory - # referenced by persistent volumes and log files - persistence: - # flag to enable debugging - application support required - debugEnabled: true + integratedDeployment: false + testingEnabled: false + testingTimestamp: -# Annotations for namespace + kafka: + image: confluentinc/cp-kafka:5.0.1 + port: 9092 + topics: + - name: wlan_service_metrics + partitions: 1 + replicationFactor: 1 + - name: system_events + partitions: 1 + replicationFactor: 1 + - name: customer_events + partitions: 1 + replicationFactor: 1 + creds: + sslKeyPassword: mypassword + sslKeystorePassword: mypassword + sslTruststorePassword: mypassword + +dockerRegistrySecret: ewoJImF1dGhzIjogewoJCSJ0aXAtdGlwLXdsYW4tY2xvdWQtZG9ja2VyLXJlcG8uamZyb2cuaW8iOiB7CgkJCSJhdXRoIjogImRHbHdMWEpsWVdRNmRHbHdMWEpsWVdRPSIKCQl9Cgl9LAoJIkh0dHBIZWFkZXJzIjogewoJCSJVc2VyLUFnZW50IjogIkRvY2tlci1DbGllbnQvMTkuMDMuOCAobGludXgpIgoJfQp9 annotations: { "helm.sh/resource-policy": keep } -# createReleaseNamespace: false - -# Docker registry secret -dockerRegistrySecret: ewoJImF1dGhzIjogewoJCSJ0aXAtdGlwLXdsYW4tY2xvdWQtZG9ja2VyLXJlcG8uamZyb2cuaW8iOiB7CgkJCSJhdXRoIjogImRHbHdMWEpsWVdRNmRHbHdMWEpsWVdRPSIKCQl9Cgl9LAoJIkh0dHBIZWFkZXJzIjogewoJCSJVc2VyLUFnZW50IjogIkRvY2tlci1DbGllbnQvMTkuMDMuOCAobGludXgpIgoJfQp9 -################################################################# -# Enable/disable and configure helm charts (ie. applications) -# to customize the TIP-WLAN deployment. -################################################################# opensync-gw-static: enabled: false + opensync-gw-cloud: enabled: true externalhost: @@ -51,26 +63,13 @@ opensync-gw-cloud: persistence: enabled: true filestore: - url: "https://wlan-filestore.wlan.local" + url: https://wlan-filestore.wlan.local service: type: LoadBalancer annotations: metallb.universe.tf/allow-shared-ip: default scalability: - #how many concurrent connections single instance of OpenSyncGateway can accept - tip_wlan_ovsdb_listener_threadPoolSize: 50 - #asynchronous task executor - monitor metrics and adjust if tasks start being rejected - tip_wlan_AsyncExecutor_CorePoolSize: 10 - tip_wlan_AsyncExecutor_MaxPoolSize: 50 - tip_wlan_AsyncExecutor_QueueCapacity: 50 - #max total number of persistent connections in the http client pool - tip_wlan_httpClientConfig_maxConnectionsTotal: 100 - #max number of persistent connections in the http client pool per destination - tip_wlan_httpClientConfig_maxConnectionsPerRoute: 10 - #max number of concurrent REST API calls a single instance of this service can process - tip_wlan_maxHttpThreads: 100 - #memory tuning parameters for the JVM - max size, initialsize, garbage collection tuning options, etc. - JVM_MEM_OPTIONS: " " + <<: *jvm-options opensync-mqtt-broker: enabled: true @@ -82,6 +81,7 @@ opensync-mqtt-broker: type: LoadBalancer annotations: metallb.universe.tf/allow-shared-ip: default + wlan-cloud-graphql-gw: enabled: true env: @@ -95,7 +95,7 @@ wlan-cloud-graphql-gw: tls: - hosts: - wlan-ui-graphql.wlan.local -# secretName: nginx-ingress-controller-default-server-secret + wlan-cloud-static-portal: enabled: true env: @@ -111,6 +111,7 @@ wlan-cloud-static-portal: tls: - hosts: - wlan-ui.wlan.local + wlan-portal-service: enabled: true persistence: @@ -122,18 +123,7 @@ wlan-portal-service: annotations: metallb.universe.tf/allow-shared-ip: default scalability: - #asynchronous task executor - monitor metrics and adjust if tasks start being rejected - tip_wlan_AsyncExecutor_CorePoolSize: 20 - tip_wlan_AsyncExecutor_MaxPoolSize: 150 - tip_wlan_AsyncExecutor_QueueCapacity: 150 - #max total number of persistent connections in the http client pool - tip_wlan_httpClientConfig_maxConnectionsTotal: 150 - #max number of persistent connections in the http client pool per destination - tip_wlan_httpClientConfig_maxConnectionsPerRoute: 50 - #max number of concurrent REST API calls a single instance of this service can process - tip_wlan_maxHttpThreads: 250 - #memory tuning parameters for the JVM - max size, initialsize, garbage collection tuning options, etc. - JVM_MEM_OPTIONS: " " + <<: *jvm-options wlan-prov-service: enabled: true @@ -152,26 +142,7 @@ wlan-prov-service: singleDataSourcePassword: tip_password singleDataSourceSslKeyPassword: mypassword scalability: - #asynchronous task executor - monitor metrics and adjust if tasks start being rejected - tip_wlan_AsyncExecutor_CorePoolSize: 10 - tip_wlan_AsyncExecutor_MaxPoolSize: 75 - tip_wlan_AsyncExecutor_QueueCapacity: 75 - #max total number of persistent connections in the http client pool - tip_wlan_httpClientConfig_maxConnectionsTotal: 100 - #max number of persistent connections in the http client pool per destination - tip_wlan_httpClientConfig_maxConnectionsPerRoute: 20 - #max number of concurrent REST API calls a single instance of this service can process - tip_wlan_maxHttpThreads: 250 - #memory tuning parameters for the JVM - max size, initialsize, garbage collection tuning options, etc. - JVM_MEM_OPTIONS: " " - #max number of connections to PostgreSQL database - singleDataSource_maxTotalConnections: 8 - #max number of idle connections to PostgreSQL database - singleDataSource_maxIdleConnections: 8 - #max number of cached prepared statements used in PostgreSQL database - singleDataSource_maxPreparedStatements: 200 - #max number of cached idle prepared statements used in PostgreSQL database - singleDataSource_maxIdlePreparedStatements: 200 + <<: *jvm-options wlan-ssc-service: enabled: true @@ -186,18 +157,7 @@ wlan-ssc-service: username: tip-read password: tip-read scalability: - #asynchronous task executor - monitor metrics and adjust if tasks start being rejected - tip_wlan_AsyncExecutor_CorePoolSize: 10 - tip_wlan_AsyncExecutor_MaxPoolSize: 50 - tip_wlan_AsyncExecutor_QueueCapacity: 50 - #max total number of persistent connections in the http client pool - tip_wlan_httpClientConfig_maxConnectionsTotal: 100 - #max number of persistent connections in the http client pool per destination - tip_wlan_httpClientConfig_maxConnectionsPerRoute: 10 - #max number of concurrent REST API calls a single instance of this service can process - tip_wlan_maxHttpThreads: 250 - #memory tuning parameters for the JVM - max size, initialsize, garbage collection tuning options, etc. - JVM_MEM_OPTIONS: " " + <<: *jvm-options wlan-spc-service: enabled: true @@ -206,19 +166,8 @@ wlan-spc-service: sslKeystorePassword: mypassword sslTruststorePassword: mypassword scalability: - #asynchronous task executor - monitor metrics and adjust if tasks start being rejected - tip_wlan_AsyncExecutor_CorePoolSize: 10 - tip_wlan_AsyncExecutor_MaxPoolSize: 50 - tip_wlan_AsyncExecutor_QueueCapacity: 50 - #max total number of persistent connections in the http client pool - tip_wlan_httpClientConfig_maxConnectionsTotal: 250 - #max number of persistent connections in the http client pool per destination - tip_wlan_httpClientConfig_maxConnectionsPerRoute: 10 - #max number of concurrent REST API calls a single instance of this service can process - tip_wlan_maxHttpThreads: 250 - #memory tuning parameters for the JVM - max size, initialsize, garbage collection tuning options, etc. - JVM_MEM_OPTIONS: " " - + <<: *jvm-options + nginx-ingress-controller: enabled: true controller: @@ -227,59 +176,131 @@ nginx-ingress-controller: annotations: metallb.universe.tf/allow-shared-ip: default config: - externalStatusAddress: "api.wlan.local" + externalStatusAddress: api.wlan.local defaultTLS: cert: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZXakNDQTBLZ0F3SUJBZ0lVUU5hUC9zcHZSSHRCVEFLd1lSTndieFJmRkFzd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0hURWJNQmtHQTFVRUF3d1NkMnhoYmkxMWFTNTNiR0Z1TG14dlkyRnNNQjRYRFRJd01EZ3lOekl3TWpZMQpObG9YRFRNd01EZ3lOVEl3TWpZMU5sb3dIVEViTUJrR0ExVUVBd3dTZDJ4aGJpMTFhUzUzYkdGdUxteHZZMkZzCk1JSUNJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBZzhBTUlJQ0NnS0NBZ0VBd1JhZ2lEV3pDTllCdFd3QmNLK2YKVGtrUW1NdCtRQWdUallyMEtTOERQSkNKZjZLa1BmWkhDdTN3NEx2cnh6WTlObWllaDJYVTgzNGFtZEp4SXVDdwo2SWJObzZ6c2tqc3lmb084d0ZEbWxMVldMZWc1SDlHOWRvZW0rV1RlS1BhRUhpM29xdXpOZ3Q2d0xzM212dk9BClR2aVRJb2M4OEVMams0ZFNSMlQ0ZGhoMHFLQ0NqK0hkWEJBNlYvOWJpcnUralYrL2t4RVF1TDJ6TTM5RHZWZDgKOWtzMzV6TVZVemUzNmxENElDT25sN2hnYVROQmk0NU85c2RMRDBZYVVtamlGd1FsdEpVZG1QS3BhQWRidmpVTwpuc3VwbkRZam0rVW0rOWFFcHFNNHRlMjNlZkM4TjhqMXVrZXh6SnJFMkdlRi9XQi9ZMUxGSUcyd2pxVm5zUGNzCm5GRjRZZDlFQlJSbmUxRVplWEJ1M0ZFTEZ5NmxDT0hJMTQ2b0JjYy9JYjYxN3JkVEtYcXh0di8yTkw2L1RxRmsKbnMvRUVqdmU2a1FZemxCWndXSFdwWndRZmczbW82TmFvRlpwVGFnOThNeXU1clpvT29mVGN4WEg2cExtNVB4MQpPQXpnTG5hOU8rMkZtQTRGanJnSGNNWTFOSXp5blpMK0RIOGZpYnQxRi92MkYyTUErUjl2bzg0dlI1Uk9HTmRECnZhMkFwZXZrTGNqUWcvTHdzWHYwZ1RvcFEvWEl6ZWpoNmJkVWtPcktTd0p6VDJDOS9lOUdRbjBncHBWOExCdUsKMXpRSG9ST0xuQTQxTUNGdlFMUUhvK1h0OEtHdytVYmFseTZoT3hCWkY1MUwvQmJxamtESDlBRUZhSkxwdGlFeQpxbjFFNXYrM3doZ0ZTNUlaVDhJVzV1VUNBd0VBQWFPQmtUQ0JqakFkQmdOVkhRNEVGZ1FVeTJiQVV5TlBYSFM5CjNWVFNEK3dvTjd0M3E4RXdId1lEVlIwakJCZ3dGb0FVeTJiQVV5TlBYSFM5M1ZUU0Qrd29ON3QzcThFd0R3WUQKVlIwVEFRSC9CQVV3QXdFQi96QTdCZ05WSFJFRU5EQXlnaHAzYkdGdUxYVnBMV2R5WVhCb2NXd3VkMnhoYmk1cwpiMk5oYklJT1lYQnBMbmRzWVc0dWJHOWpZV3lIQk1Db0FBRXdEUVlKS29aSWh2Y05BUUVMQlFBRGdnSUJBS0grCmJxSmVlMTFuMzRTWWdCRHZnb1o4bEpMUVJ3c0ZucUV4Y1NyL3BsWjdHVklHRkg1L1EyS3lvOVZ5RWlUUHdySXMKS3NFckMxZXZINnh0MVVSZk16cDA1elZRMExZTTUra3NhbVJEYWdBZzNNMWNtN29LT2Rtcy9kcXpQZTJnWmZHSgpwVmR0VlcxQ0hyTDBSTFRSOTNoN2tnU2lCbFNFSVlNb2VLZk41SDlBYXZKNEtyeXlnUXM2M2trR1E1TTllc0FwCnU2YkIzMDd6eWZ6Z1MzdG1Rc1UwMXJnSmZoRUhRL1krQWs5d0R1T2d2bWZ4MFRXZ0FPR2JLcTZUdThNS1lkZWoKSWU3clYxRzVVdjdLZmdvelZYNzZnMktkblRWQmZzcFNLbzN6eXJaa2NrekFwdlV1OUllZkhkVG9lNEpNRVUweQpmazdsRVUvZXh6Qnl5TnhwKzZoZHUvWklnM3hiMXlBMW9WWThORWQxckwxekFWaVBlMzUxU0VORUtlSnBSYW5DCmtDTDNSQUZrYnhRN0loYWNqb3g4YmVsUitnbW84Y3lGWnBqOVhhb1BsU0ZTY2R3ejU3M0NUMGg5N3Y3NkE3c3cKeUMrQ2lTcDg1Z1dFVjV2Z0JpdE5KN1I5b25qQmRzdUgybGdFdE1EM0pOT3M4Y0NTUmloWXhyaXdaU3FoVDdvLwp0Y0lsY0o4NFc1bTZYNnpISjNHbXR1S0czUVBOT21zMC9WVm9EVHA5cWRwTCtFazE3dUIyQTQxTnB4ejNVUytsCjZ5SytwZFFRajdBTHpLdVJmT3lnODBYYk53MnY0U25wSTVxYlhGQlJ1bTUyZjg2c1BlbUZxMUtjdU5XZTRFVkMKeERHM2VLbHUrZGxsVXRLeC9QTjZ5ZmxiVDV4Y0dnY2Rtcnd6UmFXUwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUpRUUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQ1Nzd2dna25BZ0VBQW9JQ0FRREJGcUNJTmJNSTFnRzEKYkFGd3I1OU9TUkNZeTM1QUNCT05pdlFwTHdNOGtJbC9vcVE5OWtjSzdmRGd1K3ZITmowMmFKNkhaZFR6ZmhxWgowbkVpNExEb2hzMmpyT3lTT3pKK2c3ekFVT2FVdFZZdDZEa2YwYjEyaDZiNVpONG85b1FlTGVpcTdNMkMzckF1CnplYSs4NEJPK0pNaWh6endRdU9UaDFKSFpQaDJHSFNvb0lLUDRkMWNFRHBYLzF1S3U3Nk5YNytURVJDNHZiTXoKZjBPOVYzejJTemZuTXhWVE43ZnFVUGdnSTZlWHVHQnBNMEdMams3Mngwc1BSaHBTYU9JWEJDVzBsUjJZOHFsbwpCMXUrTlE2ZXk2bWNOaU9iNVNiNzFvU21vemkxN2JkNThMdzN5UFc2UjdITW1zVFlaNFg5WUg5alVzVWdiYkNPCnBXZXc5eXljVVhoaDMwUUZGR2Q3VVJsNWNHN2NVUXNYTHFVSTRjalhqcWdGeHo4aHZyWHV0MU1wZXJHMi8vWTAKdnI5T29XU2V6OFFTTzk3cVJCak9VRm5CWWRhbG5CQitEZWFqbzFxZ1ZtbE5xRDN3eks3bXRtZzZoOU56RmNmcQprdWJrL0hVNERPQXVkcjA3N1lXWURnV091QWR3eGpVMGpQS2RrdjRNZngrSnUzVVgrL1lYWXdENUgyK2p6aTlICmxFNFkxME85cllDbDYrUXR5TkNEOHZDeGUvU0JPaWxEOWNqTjZPSHB0MVNRNnNwTEFuTlBZTDM5NzBaQ2ZTQ20KbFh3c0c0clhOQWVoRTR1Y0RqVXdJVzlBdEFlajVlM3dvYkQ1UnRxWExxRTdFRmtYblV2OEZ1cU9RTWYwQVFWbwprdW0ySVRLcWZVVG0vN2ZDR0FWTGtobFB3aGJtNVFJREFRQUJBb0lDQUMyR2hEc1pUaWtiTERQMlR6Q2VkOVVoCmJRUlpsbDdLaUxHcXZYNm9VdjhJcFNLdTJrS3h1blpkTzVvQk5NbzNnNTg4YzRSQkFrQ1d6dmJObzFjeDJ3UTQKSkd3ZTdYaGM5TDdYbUwxUFZjNWlJdnVYOFVBTFY3eUdwMXZONklPSC9BYVJsSFlZZHl3UURVSTcwZGZiMmJqRQo2d3dORHRVbk1Ea3NncjNLbExwamNiNEFla2dxWE9MRUFMMld1Nkt1T1hOankrdUU3b2hnVWN3bWlYWXZGb3VMCm1KYXVlS3l5U202NHdJZnpZQ1JwbUhHMVlCTGpic0xJb20zcmZYRkl3V1hqMkhBSGFIOFRWOVhyUmpwR2tEZm8KbFFqN3l0R0s2ZkllMWcva0ZBN3hDWDE2d1NYMS85bjM1WGYwVmMwZ08zdE9NVHJkM1JTVVNEaVp6eVR1WWxuZwpETEdmYXZjRS82QXJ5cTlWZ3hyUXdXbnZhd0hIcWxBWUtxVHpJYkRJS0Y3SjRYTE9FckFtRE50T1I2Lzc1WjJ3CnVPQlFYT0N3NFM1dWxWdzhIZUM0NGlFTmxJYU5lNDNWTkZUTGtRM3lCeW96VVlYWTN2eEJXMWpURFpFOTB5YTUKZzk4cmFiYWhIS0lockpGYzNXYTE0RWhicUE2TVVLSXRRTkk4K1N1Rk1KV3R4VW1iM1cxK2dHbXJvTmo1TU9kYQpzdjV5OThTYS93UUc4dGc0cmdNQ0xpQVNHL3hudDB3RURrNXFDVUUxRzRSdkdOeUYxU09zNk82c1BTOTg4Umd4CnJuamQvWWZoME5xVnhHcHFGNnhpQVgvZXkyU0NGUWNybEtmNnhGREF4YjI4RTdaNnRQSUZCTWxpQ1IrbzdYR3MKZDNvUWVuMThCalM1NjdtR2ZmNkJBb0lCQVFEanFFcHZqOVhJVVB3bk1RZitRY3R0R1pXZEp2bFZSa1BSMW9maApSVWI2UHdFRkEwdVQyM011ZmFvNGI4bWIrM2Vra1BkYTZmbWJqUGFUckQrbk5YNGxyRE5oYytvcVY4aFVEQnA0CmpVcEg3OXorTVNUZVVQclpnS3VMeEdqaDJiK0FWYVZjZTI2STVYUXVoUnR6ZHFYZDlIeSs4YXpYRTltbHlPQ00KMUpEK2VHZWxhaVJMbEZBbVRDNDNoNlV5T0Q5SmZOSW1oWDQ2WDJRRlFsbGc1cWxVdWQ4Ukx3eFViZTJoYzhTWQp4VnVvYVZSSUdBSmhqRkd3ZVhnRjdzc0tQNXBZMHRkTlNvSGsxeHRnUmVJTlllZFU1cmtpKzloZTN0cStqWUdJCmxVcVVzYzNzN3c4cUk1UXk5NGdmcUI5Lzd4K3BFdGEvak9leE4yL1pGOFJGSXVucEFvSUJBUURaSUpUaUUxKzkKc2xnQ0NGVllLR3Z5aE5odkppck94enlOUWU3YjIvZmxQNzVHd0pTTWpZZTdoTmhGK3JrZHRJcXF5dWxyeGF3YgpPbWliU0FCSG5kT20ycDRMdDhaK20vQXZaRUgzVklLdWkwY0xVbTlKRXNsWURVcFIrdG5BemloNzdrS2FlVzlnCk1wdlpiUzZGdXE2ZlBZQUJyK3dXeU1IazR0UnRNZ3duUFRtSzZQTW85b3FIUURTSVJjL3N0N2hBTUwwMDdtNlEKOTJkRXRqNTNtSTBURTRISVhtY3hZbjV5NGVJLy85aEFMb2xFa0ZHWDU0SmNMdWpDWWkwQ3RIU0xDcnNmQkJwZgpDS2NaMk5sWFNiYVREU1prZWhnQWFWTlM2OVp1K1o2eGFvNmZZMjVxSnNmeXlaUkNjSzJYY0FoUDV2QWNUbWhQClNKUFJZc1dSNXZ1ZEFvSUJBRmtRRXFiWWg1TkprNHdsazNIMS9ZYWVGcmtYY1QzYU1sZ2FiS2hGdVFIWHVpZGkKNWFOZm5BMFpIb25idWV6ckVTQnhra09mKzRYT1BQMEN5eGc0UmpTb3pLVVlld2k3dE9Ta280cDhCQTVtbVhkYwpkSWNBK1ZJMEUyaW5tenlZT21JVG41Q3h2VW1UTXNPc1VWUDNtK1pjYXAwczRTaDNYSk9PSmNNU3VmTEQyaENOCm1NdDBwM0tFSlNTV1RadDdBODlWSk1YclBibktiYy9jNkNpUHRMa3Z5a1BudXhRZ3VYR0xYK05BZXA1RkxyTFIKcWNUTjUzdDUyZW5BUlBDcWQxQytrM3BxWnF6SE5xK1FSMkppNWVTQ0t2V3p2eTlHVWg5d0xyZm5aL2tLSW56SgovWTNIdzRlNDdTa3RWYjF3S0Z1MXdndklMVEJZZHNwZ2tPbFhRbGtDZ2dFQUtKYVJuazFXMldRc1ZYenZUMEtICkkxZTRDZGNOcTRmTkJ1N3JVc2drNkFMcGM5cHVLblFPaW54RDNaa0gzOGl2SDB3OUpEdFlkK0tNU1hMRk1wNEwKUWFhZVlyeGc2NndFMHljZnViZGZrbmRRdVlvWWFZV01nOXhBSjJFSU1hV1lKY3FkUXJrdW04SDZKa1BsclhQLwpUcDgxZlp0QU8rWWRjTWNDUk1OVlNFU0dyRFB0dUp1VnU4REIwVE9Uc2NHS1BOMmZrUFI5VUxZZTVOWllpUXpJCldtZU1IRU9oY0xiandsLzlaazlTUW5Vd2pkT1luUmZXNDVxVlFqa09CdkpxMHM4WHVhMlBySEkyb250SjdhcEcKNmVoTVkvMzYzS0RUeGExMmNWcFNVd0lEVlVKR0VxdmJOc1I5NVltZ3VhMWtzR01RUVlwYXIyOTJ5bTUzVmxYaQpkUUtDQVFCTUFYS0RaNVZobHBRR1VlUk1FNVhqVm1KOE1WdlZTUzV3NzBGOC9CS0ZnZFBJNnR2Nkx5UGh3OTRPCmxZVldoOXJmdUpmbWllK1ZJSWhaeSthUVNpVVhGQUtTdjZFTWJ1bXdjN1pUNEkyYitDTXQxUEhaTEZtUEN0OXAKOEorUDdoaDlRYWRBYzZqZEdSa0NMNkpMU3VoeWhMbW90SG9IS0ZJazdhNENNZGl2QnB3SVdxMWVScHd0aWRrNwpIdytrdlJ5YW5DMUJVU1dYNGxJcW1LanAyR1B2UDVVdVV2RUlPNitqaWFyWTJDTUNKb3BtcVJ2WWQzNGtSVkF1CjZueFl4a05neEFQSnVWN2tkZVVzQXg5Q1FZcFQ1blFmendtdlVGa0FraHJoTmw5dUJRUDhMdkZORFQ0cWU0bFcKUWw0cXRFZFNiZDVxVWVVdkgzOG5JMmpTVDVMawotLS0tLUVORCBQUklWQVRFIEtFWS0tLS0tCg== wildcardTLS: - # self signed wildcard cert for *.wlan.local cert: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZEekNDQXZlZ0F3SUJBZ0lVYSthaVJZWG9QTGliSS9wdVJCdi9DZ2RTTDNzd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0Z6RVZNQk1HQTFVRUF3d01LaTUzYkdGdUxteHZZMkZzTUI0WERUSXdNVEl5TVRJd05UQXpNVm9YRFRNdwpNVEl4T1RJd05UQXpNVm93RnpFVk1CTUdBMVVFQXd3TUtpNTNiR0Z1TG14dlkyRnNNSUlDSWpBTkJna3Foa2lHCjl3MEJBUUVGQUFPQ0FnOEFNSUlDQ2dLQ0FnRUEwQjhuZE1raGIzZEN6N0I2aS9kRlFWenJwaEtQK2RmY2JKN1gKMzB3MU1FWDIvM3ZvVStkRlBNbnZrS3hEdFJwanZCbnhCczF6L1VmajlyUFhDSzZkazNNYU5DajRQYVUxem9WQQppK1Z6amc0ZG5XNjJxWG1qYVYrYUMrQm5zQndyQmx2THQ0dkh1eFRLbHh1RnR4THdid3VObGJvS1lVN01kV3oyCllMY3QzUWZBWElVb2FRK1RTMUZGdVdFeEZOTFRidlBGZWNoajB4ZnhyOU5BcU9aTXI0RGE0NHMzVERxMVVyRTIKbjhaZXFxVXZ1YUE4ZmEzQjNVZVRFNmJ4OEdhN1JybG5Dakd3UDRGVml3ajdvellmanV6T2JOM2dlcjdWcEpLMQpMSjdIdDBBemZlRm9aQ2xPbUVBd1p5alFwRGZOckdNTCs1dWtIK2JxWngyaUo5UndFcDNmdlE4em5jN1Q4dHJDCmxzMjRWNUpySWhUQXlCcTZRWVNnSXdXM2V5TmVpUnQ0ZHp6Sk5rNnd4cFp0WE96WTFwamJrV2FMaEhKOW1LRWoKU3lqVVBnS3dKSVlmb3BJbTJoUzl1dVZHZDdiU1MyV055aHJSOU5LSG5Lamo5Y0IrUWU0eEh0Z1pEcm1GZ1ZpZQp0cXZBUHhJL0ZkV1pSN3RmT2JCNTR3alMxVFk3TEd6cll4TDZSMWNjZDE4WUppcGNTS05xa05ORlllZ092VkNICmFldW1OTUdVNlZZalJWS1JmQXMva2FzcWxleGpheSt0SXNtd3dDZGoxUUN3UitRa2VEZFdoNE8vQzM1NENRb28KTkxZYzRNRk8xbVVDY2NsbUgvbFBvcTd1anBCMWI2VmFBNVprNFhjVUpRc0c4SUlSMDFHTFM5RW1HVVZaeTlOWApwV2dCbXNVQ0F3RUFBYU5UTUZFd0hRWURWUjBPQkJZRUZOZlVJSGhXdnFwUzg2ZC82SnJvbmxFYzZMU1NNQjhHCkExVWRJd1FZTUJhQUZOZlVJSGhXdnFwUzg2ZC82SnJvbmxFYzZMU1NNQThHQTFVZEV3RUIvd1FGTUFNQkFmOHcKRFFZSktvWklodmNOQVFFTEJRQURnZ0lCQUtlTW9PckhLZ3BGemtkckVhMVhSSVRUOHFZanhKc04yNmFIMFovLwp1dDRXVkE4ckNDNzV4VkpaNnpBQWlBOFE2eTRYSHBzRzl2ZSs1QlJIWEdCS0lYOU5FZGNrbWdNdExzQ2xOR0JCCkxkN3lWd3hhaGVCQzhVTWIrVTAxMlNwaFc3K0t6UFJhQ3g4cHNMMUlFQUkyblQ1MzlCNDBmR2NyTktNSDRqZGkKdkxad3VxT00rZnJucFJ1MkZlK3Bja2Fwek92SEJTb0I3THovR1dmMWUwZ0llc1B4WEdmVG9hbGM1SzU5bDF1TQpCTkhpUW15S3E4TS9MbllMejhyOWp3dHNKU2lLYUljelpISjNtQ0ZUb3ljREF3NTl3WEdmWXZWcFBMaWZXTTJxCm1uSlJKM2dQS1lzOUhXWFgyYktoSmZoMjRLOTN2M1duMVRUellYOGtTbWlnRG0wTUhOSTNwZktlMmJqVW9MNmgKMlQ4bWhRbjdPQ2dvZHMvOXczR1dOdmFxYTAySHRnc0tTbk9YdmpSNXFMaVFLRjdhMi95TTlrNWNQcUdHaW1GYgppUWV3eUgvMWw2YjQ0T0s2RGwwMVltWFltNUVqR3plckp2aU90eUhSaWhtME01VmNBWWJaYkE0S1Y1eHhLZjRqClIwaktwQXdqbEpzTDdRMk9zTC9IRkxmaDV1RU1HMXlmTzF1blZkVURKK1FBZHJQUG5tZTZVTVFQZm1UcGx1WjAKS3pvOXY3NEpYV0pwQkNtaWNTbFBQdnB3cXZLTk5iOWd6b0hjOXFheWMwNWVxRldRbzNNZjIzYU82b05wU2ZuaAp5aWMvczFQcC9ZS2FHakVSQXB1UmRvYTlWT1diUncycFZMei9rZVNraS9QTDJFRFc4RUVHYjFXcUFBMkJPVVhDCi9oYXQKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUpRd0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQ1Mwd2dna3BBZ0VBQW9JQ0FRRFFIeWQweVNGdmQwTFAKc0hxTDkwVkJYT3VtRW8vNTE5eHNudGZmVERVd1JmYi9lK2hUNTBVOHllK1FyRU8xR21POEdmRUd6WFA5UitQMgpzOWNJcnAyVGN4bzBLUGc5cFRYT2hVQ0w1WE9PRGgyZGJyYXBlYU5wWDVvTDRHZXdIQ3NHVzh1M2k4ZTdGTXFYCkc0VzNFdkJ2QzQyVnVncGhUc3gxYlBaZ3R5M2RCOEJjaFNocEQ1TkxVVVc1WVRFVTB0TnU4OFY1eUdQVEYvR3YKMDBDbzVreXZnTnJqaXpkTU9yVlNzVGFmeGw2cXBTKzVvRHg5cmNIZFI1TVRwdkh3WnJ0R3VXY0tNYkEvZ1ZXTApDUHVqTmgrTzdNNXMzZUI2dnRXa2tyVXNuc2UzUUROOTRXaGtLVTZZUURCbktOQ2tOODJzWXd2N202UWY1dXBuCkhhSW4xSEFTbmQrOUR6T2R6dFB5MnNLV3piaFhrbXNpRk1ESUdycEJoS0FqQmJkN0kxNkpHM2gzUE1rMlRyREcKbG0xYzdOaldtTnVSWm91RWNuMllvU05MS05RK0FyQWtoaCtpa2liYUZMMjY1VVozdHRKTFpZM0tHdEgwMG9lYwpxT1Axd0g1QjdqRWUyQmtPdVlXQldKNjJxOEEvRWo4VjFabEh1MTg1c0huakNOTFZOanNzYk90akV2cEhWeHgzClh4Z21LbHhJbzJxUTAwVmg2QTY5VUlkcDY2WTB3WlRwVmlORlVwRjhDeitScXlxVjdHTnJMNjBpeWJEQUoyUFYKQUxCSDVDUjROMWFIZzc4TGZuZ0pDaWcwdGh6Z3dVN1daUUp4eVdZZitVK2lydTZPa0hWdnBWb0RsbVRoZHhRbApDd2J3Z2hIVFVZdEwwU1laUlZuTDAxZWxhQUdheFFJREFRQUJBb0lDQVFDUVRkbXN4enl3cmUrY1ZCQlVkaW9GCjdTalRhTEY5bWFlVGhQdkhMMjc5dnJWSlpoK3I5WUp6YU16NzhnV3NUOVR4ZXNjOVlUMVlVLzJEZENUWU4wSzUKRnlrSEc1VXNJUjVTeU4vOVlDWWtURE5La3BhQ29mMmxOWTE1U0twOFdMdVlXQlBEZTE4TW41anM5ejlhdGY0Ugo4Ti9GL2szdU5KWGRvYVNmWU1Pakt4bTh6UE05RFhpaTA0SlZ6RWNjMmlXU0crSkQwNmNybWNHUm1SZVBSTWZOCk5Mb1E1ZGw4dUlRN0J2Y0tCNkJpRDlFc2t5YitPWGxmTlo2TUZNaFNXTmpuYSt3L0REN1plWkxYcVczWk45RGYKNStBbGFoNlkzVE1EUGxueXkxRk5CVzN1alZrMWdkS21ESFBEUTNDUFBNWVdEa01qdlVJcWdKRHMySVl6dWIvTwpXRjRVUTV5UEJhZzluaWp1dS9uMVZDdGZuSkxwakZIakU1VzdkK3p1UGh6aUJ1WDFOcjRtOVVJdEpaSTNsYmJtCmdvZFlMdGl4b3RwNWF3ang1eXA3MU1zUHlTZzcrbHBPenA4dStuRENJcnc0K0VSME56MG8yTXFmcmJ2VklGQXIKWHIyc2YrejljbmtxalBWWEZaVks3em1TUHI5N0YrbTV4RHpURG9lTG53aVlhUUpOQ0ZhejhMVERjNldVT2w4SQpLOWhHd3FaK0llTlgreW16em16Nkx6WWVPaGlrRmNRaUI0UXVPSjdWWnZWRmVoS3JJMXJLWHJDRU01VmpJZXBkCkhzR0c1eTlLUkcxdEszSU5ScmI0SHlhRDF6SHJSTHRneFpLT1BvWDN0UjNmbTJ1aGova3dwelZnWTltRXJDWDkKd2I4SVA5TXdRR3REQVNBcjZWVmJvUUtDQVFFQThIeWlaK1lVeFEzQnprL1hoNmZMWWNYakE3NTJrQ204VWZzWQp0d1Z4N0EyNW5YRStiUDRIT3UyVC9kTlc0Tkw1elZPT0JkaWZIcTJQVFNVMGYzQUFHL0pNcnVzM3NrNHd4azM5CitYYlh0dHltWkdxb3FEcVN3TUw2czVpY1RnangvenRhSXk1TWFKYWhUYUpNdFRQQlVpZ3U3enhoeGNwVlhNVUMKTklHcFl5Mkt5R2hyMjVVOFdlR0RYQm9SS2xYUXJXYkNZeW1kMXdYQStEaVl0dzA5eit0VHhPNTRodjFCZkJKZwpWMGd0VWdJU0I2WEZDMU9CWDZXQ1pXYlhCN2hPaHhISjNkNHAyQlZyN0gxL2JDQ0ZvVDY5by9WQVNHRmdtTHRiCnpGalRNbjFIaTluVW5jUFlScWpsN1h0NWdPOHBOa3BwMjVrNHIxRVludWhIazcrYzdRS0NBUUVBM1l3THozNloKNEVPRndvODIrUlVId2lkaFExOEdrU1JvWStKVm1udXJpSXdHZTk3ZmRTVk91d092SDlZSVhsRWpjRitoOHFQVQpJVnpIOXBuYXZjTENEMnhIOWZ5d09ML3pmYmJnYnExZjV4Y3BOUXlYM1JnTGFDUVpLNkpJa3NzOUtDb0dhSzlaCmpMVm41MjFFZlFBRE5DSi93YlRCb3dLQ0dTNDUzSzRBaWFEWHN6TkJLUk5MOHVaWWYwK0x0U2IzV3lkZVQ2eUgKdGZiSXR3NlBSS1lxb2NaeGIrM0pWQWFHcGxScjVZSlNDU1BtTjFMSjU0djlTcXBIVnJMNzJudFNwKzdDODJ6SgpJajVOSXFEOGFsOVZ3WFB5dExRd25hYWc1TW5ka0NLQ3R0MlVHSGZwMEh3ZTJTL1hkemppS2gzZTZaT3MyMSt1CitQUHVrSkUxTTZzU09RS0NBUUJjWVJRbDR6MUJRUHFjM1JESEhJN0UvVFlxWHdTK2RqblFLQ3VqU3FVcmIwNUoKQzVKV1hmSzdFVDVUTjliY3dFNlRNRENUVUZZM2U2WmJsUm9vaGdhVXRhdjlXWC9vcjU2TzNyRGNIbW5ZNWNQSgpPU3VXakFHSnFKeVRWdUZjSEpXUlhPUlFOVjNHbzI1Tkd6WnFPUHBmSys1em1mZFkrbE4yTW51WlhlR0twcGowClNTQjlsa003cDZSRlFnSXNDQkVFTzBBYXhZYkxiWHRtSHArVFdiUFA1ZThrN0JKQ2tKQ1NMNkR3aGxwYWNVOHAKdnVVRlo4dC95VjFneEhOL2xLNGR0cGliOE5hVUdnNStKdXRHeHV0dU9HS3kwK2dncGI5c2pEUkVPQzdRNjAwTApqTjdleDdlUjFSbVY4Mk9HUXRqSzhTVGU1V25mOXNBRmN1YmorNncxQW9JQkFHYXM4Z2hQRHpkOWM2OXd1alNFCkI1MTJyTUFSZVRTcEgrd3l5Q09aYnkwUVlDem1aTCtnODdUK2h4b0ZFc25MWnRZOHJBeU0ydEkvY3JrYUl1TlIKTUtqL01QYVREb1N1aVVWWkRQaWVSMVVOU2Q2NUlHU3FNUmNwcTdTcU9HSTM2UGNGU3dVWFJ6Uk1Hb1NLQW5UQQpIYnY2eFNUY0JlWHJVcW9pMzFRa0hFR3NsbXNKdFFnNVZqaVRncTQyQ25TQlE2QXVSYW85Tm9RaGhISTZRREc3CnBRUm11TW43OVJPSkZyeGRZY2Z6TnR2ZmxHRk5jQjlzcEk0SERwcml4cEJDR1ZPVTl5cmozdStNMmlqVFhVaGIKT0o0NGcySTJKRlhjRkxNVHp5aHVwZy9qN3kvTDIwUHhVa2Fyd25zUmxOZWFFbVpFTjVkUDZBS2U0cENEaTVtUApqaGtDZ2dFQkFMUmtVeG9oZDh2ZVBwR3hPbWlOak5HekpiTDlscGx0TWxhR0dPQ3JOUkZSeEppblgzWU9UVnhiCkRFVlpqaXRHNldydzFxaDdnZXAzeEdJaWZHQ1lZV3pNc0RZTitueGtwV0lRRmZOV3dYemNRWlhrTEduZVlUdTAKSVU2RjY5Myt1Q0tkcHVCdVl0d3BQNEJCVkNCRTVON0FzRGV4bFBYTzk1cEw3ZzR4OG5RckdNeGJlRXVOdytaTwpPYmYvTnFFMGZZcURkaERiVHI0UDR6bUpBRlpYeDlKMjNJdWRMUFI3MDZITGZ5bDMrb1pUS2Y2ZWdEL1drWXZGCllLdEtDZzI1UmtSYmZBakZkeDlpOVkzcDlPNEFNVUNaRVFIOWQwU1d6LzJWR0VmYzVha09YL2xvWlAyUXF3c2UKeXMyc0k1U0Z5TEd1ZGM3R2MzVTd5UGd0RVN0elVoWT0KLS0tLS1FTkQgUFJJVkFURSBLRVktLS0tLQo= -zookeeper: - enabled: true - replicaCount: 1 - persistence: - enabled: true - storageClass: microk8s-hostpath kafka: enabled: true replicaCount: 1 - persistence: - enabled: true - storageClass: microk8s-hostpath - creds: - sslKeystorePassword: mypassword - sslTruststorePassword: mypassword - sslKeyPassword: mypassword -cassandra: - enabled: true image: debug: true - cluster: - replicaCount: 1 - seedCount: 1 + auth: + clientProtocol: mtls + interBrokerProtocol: tls + jksSecret: tip-common-kafka-certs + jksPassword: mypassword + tlsEndpointIdentificationAlgorithm: "" + jaas: + clientUsers: + - brokerUser + clientPassword: + - brokerPassword + extraEnvVars: + - name: KAFKA_CFG_SSL_KEYSTORE_TYPE + value: PKCS12 + allowPlaintextListener: true persistence: enabled: true storageClass: microk8s-hostpath - creds: - sslKeystorePassword: mypassword - sslTruststorePassword: mypassword + metrics: + serviceMonitor: + enabled: false + namespace: monitoring + selector: + release: prometheus-operator + zookeeper: + enabled: true + persistence: + enabled: true + +cassandra: + enabled: true + tlsEncryptionSecretName: tip-common-cassandra-certs + image: + debug: true + persistence: + enabled: true + storageClass: microk8s-hostpath + replicaCount: 1 + cluster: + name: TipWlanCluster + seedCount: 1 + internodeEncryption: all + clientEncryption: true + exporter: + enabled: false + serviceMonitor: + enabled: false + additionalLabels: + release: prometheus-operator + dbUser: + user: cassandra + password: cassandra + resources: + limits: {} + requests: + cpu: 1 + memory: 3Gi + postgresql: enabled: true + postgresqlDatabase: tip + image: + debug: true + metrics: + enabled: false + serviceMonitor: + enabled: falsea + namespace: monitoring + additionalLabels: + release: prometheus-operator + postgresqlUsername: postgres postgresqlPassword: postgres -## NOTE: If we are using glusterfs as Storage class, we don't really need -## replication turned on, since the data is anyway replicated on glusterfs nodes -## Replication is useful: -## a. When we use HostPath as storage mechanism -## b. If master goes down and one of the slave is promoted as master + pgHbaConfiguration: | + hostssl replication repl_user 0.0.0.0/0 md5 clientcert=0 + hostssl postgres postgres 0.0.0.0/0 cert clientcert=1 + hostssl postgres postgres ::/0 cert clientcert=1 + hostssl all all 0.0.0.0/0 md5 clientcert=1 replication: enabled: true + user: repl_user + password: repl_password slaveReplicas: 1 persistence: enabled: true storageClass: microk8s-hostpath - readinessProbe: - initialDelaySeconds: 30 + volumePermissions: + enabled: true livenessProbe: - initialDelaySeconds: 30 + enabled: false + readinessProbe: + enabled: false + tls: + enabled: true + certificatesSecret: tip-common-postgres-certs + certFilename: cert.crt + certKeyFilename: cert.key + certCAFilename: cacert.pem + initdbScriptsConfigMap: tip-common-postgres-scripts + extraEnv: + - name: PGSSLCERT + value: /opt/tip-wlan/certs/postgresclientcert.pem + - name: PGSSLKEY + value: /opt/tip-wlan/certs/postgresclientkey_dec.pem + - name: PGSSLROOTCERT + value: /opt/tip-wlan/certs/cacert.pem + primary: + extraInitContainers: + - command: [ "sh", "-c", "chmod 0600 /opt/bitnami/postgresql/certs/postgresclientkey_dec.pem" ] + image: busybox:latest + name: chmod-client-cert-additional + securityContext: + runAsUser: 0 + volumeMounts: + - mountPath: /opt/bitnami/postgresql/certs + name: postgresql-certificates diff --git a/tip-wlan/resources/environments/dev-no-gluster.yaml b/tip-wlan/resources/environments/dev-no-gluster.yaml index 26f943a..7ab67da 100644 --- a/tip-wlan/resources/environments/dev-no-gluster.yaml +++ b/tip-wlan/resources/environments/dev-no-gluster.yaml @@ -1,46 +1,22 @@ -# This is a development override file. -# It overrides the default Tip-Wlan parent chart behaviour -# -# This override file should be used when you don't have any -# storage solution for creating persistent volumes. -################################################################# -# Global configuration overrides. -# -# These overrides will affect all helm charts (ie. applications) -# that are listed below and are 'enabled'. -################################################################# global: - # Change to an unused port prefix range to prevent port conflicts - # with other instances running within the same k8s cluster nodePortPrefix: 302 nodePortPrefixExt: 304 - nsPrefix: tip - # image pull policy + pullPolicy: Always - repository: tip-tip-wlan-cloud-docker-repo.jfrog.io - # override default mount path root directory - # referenced by persistent volumes and log files - persistence: - # flag to enable debugging - application support required - debugEnabled: true + integratedDeployment: false + testingEnabled: false + testingTimestamp: -# Annotations for namespace +dockerRegistrySecret: ewoJImF1dGhzIjogewoJCSJ0aXAtdGlwLXdsYW4tY2xvdWQtZG9ja2VyLXJlcG8uamZyb2cuaW8iOiB7CgkJCSJhdXRoIjogImRHbHdMWEpsWVdRNmRHbHdMWEpsWVdRPSIKCQl9Cgl9LAoJIkh0dHBIZWFkZXJzIjogewoJCSJVc2VyLUFnZW50IjogIkRvY2tlci1DbGllbnQvMTkuMDMuOCAobGludXgpIgoJfQp9 annotations: { "helm.sh/resource-policy": keep } -createReleaseNamespace: false - -# Docker registry secret -dockerRegistrySecret: ewoJImF1dGhzIjogewoJCSJ0aXAtdGlwLXdsYW4tY2xvdWQtZG9ja2VyLXJlcG8uamZyb2cuaW8iOiB7CgkJCSJhdXRoIjogImRHbHdMWEpsWVdRNmRHbHdMWEpsWVdRPSIKCQl9Cgl9LAoJIkh0dHBIZWFkZXJzIjogewoJCSJVc2VyLUFnZW50IjogIkRvY2tlci1DbGllbnQvMTkuMDMuOCAobGludXgpIgoJfQp9 -################################################################# -# Enable/disable and configure helm charts (ie. applications) -# to customize the TIP-WLAN deployment. -################################################################# opensync-gw-static: enabled: false + opensync-gw-cloud: enabled: true externalhost: @@ -50,20 +26,25 @@ opensync-gw-cloud: persistence: enabled: true filestore: - url: "https://tip-wlan-opensync-gw-cloud:9096" + url: https://tip-wlan-opensync-gw-cloud:9096 + opensync-mqtt-broker: enabled: true replicaCount: 1 persistence: enabled: false + wlan-cloud-graphql-gw: enabled: true + wlan-cloud-static-portal: enabled: true + wlan-portal-service: enabled: true persistence: - enabled: true + enabled: true + wlan-prov-service: enabled: true creds: @@ -76,6 +57,7 @@ wlan-prov-service: schema_repo: username: tip-read password: tip-read + wlan-ssc-service: enabled: true creds: @@ -88,12 +70,14 @@ wlan-ssc-service: schema_repo: username: tip-read password: tip-read + wlan-spc-service: enabled: true creds: sslKeyPassword: mypassword sslKeystorePassword: mypassword sslTruststorePassword: mypassword + wlan-port-forwarding-gateway-service: enabled: true creds: @@ -101,6 +85,7 @@ wlan-port-forwarding-gateway-service: externallyVisible: host: api.wlan.demo.lab.wlan.tip.build port: 30401 + nginx-ingress-controller: enabled: true controller: @@ -109,28 +94,121 @@ nginx-ingress-controller: } config: externalStatusAddress: "192.168.56.101" -zookeeper: - enabled: true - replicaCount: 1 - persistence: - enabled: false + kafka: enabled: true replicaCount: 1 + image: + debug: true + auth: + clientProtocol: mtls + interBrokerProtocol: tls + jksSecret: tip-common-kafka-certs + jksPassword: mypassword + tlsEndpointIdentificationAlgorithm: "" + jaas: + clientUsers: + - brokerUser + clientPassword: + - brokerPassword + extraEnvVars: + - name: KAFKA_CFG_SSL_KEYSTORE_TYPE + value: PKCS12 + allowPlaintextListener: true persistence: - enabled: false + enabled: true + metrics: + serviceMonitor: + enabled: false + namespace: monitoring + selector: + release: prometheus-operator + zookeeper: + enabled: true + persistence: + enabled: true + cassandra: enabled: true - cluster: - replicaCount: 3 - seedCount: 2 + tlsEncryptionSecretName: tip-common-cassandra-certs + image: + debug: true persistence: + enabled: true + replicaCount: 1 + cluster: + name: TipWlanCluster + seedCount: 1 + internodeEncryption: all + clientEncryption: true + exporter: enabled: false + serviceMonitor: + enabled: false + additionalLabels: + release: prometheus-operator + dbUser: + user: cassandra + password: cassandra + resources: + limits: {} + requests: + cpu: 1 + memory: 3Gi + postgresql: enabled: true + postgresqlDatabase: tip + image: + debug: true + metrics: + enabled: false + serviceMonitor: + enabled: falsea + namespace: monitoring + additionalLabels: + release: prometheus-operator + postgresqlUsername: postgres postgresqlPassword: postgres + pgHbaConfiguration: | + hostssl replication repl_user 0.0.0.0/0 md5 clientcert=0 + hostssl postgres postgres 0.0.0.0/0 cert clientcert=1 + hostssl postgres postgres ::/0 cert clientcert=1 + hostssl all all 0.0.0.0/0 md5 clientcert=1 replication: enabled: true + user: repl_user + password: repl_password slaveReplicas: 1 persistence: - enabled: false \ No newline at end of file + enabled: true + volumePermissions: + enabled: true + livenessProbe: + enabled: false + readinessProbe: + enabled: false + tls: + enabled: true + certificatesSecret: tip-common-postgres-certs + certFilename: cert.crt + certKeyFilename: cert.key + certCAFilename: cacert.pem + initdbScriptsConfigMap: tip-common-postgres-scripts + extraEnv: + - name: PGSSLCERT + value: /opt/tip-wlan/certs/postgresclientcert.pem + - name: PGSSLKEY + value: /opt/tip-wlan/certs/postgresclientkey_dec.pem + - name: PGSSLROOTCERT + value: /opt/tip-wlan/certs/cacert.pem + primary: + extraInitContainers: + - command: [ "sh", "-c", "chmod 0600 /opt/bitnami/postgresql/certs/postgresclientkey_dec.pem" ] + image: busybox:latest + name: chmod-client-cert-additional + securityContext: + runAsUser: 0 + volumeMounts: + - mountPath: /opt/bitnami/postgresql/certs + name: postgresql-certificates diff --git a/tip-wlan/resources/environments/dev.yaml b/tip-wlan/resources/environments/dev.yaml index 084aa3e..518e619 100644 --- a/tip-wlan/resources/environments/dev.yaml +++ b/tip-wlan/resources/environments/dev.yaml @@ -1,48 +1,41 @@ -# This is a development override file. -# It overrides the default Tip-Wlan parent chart behaviour -# -# It can be tweaked, based on the need to support different -# dev environments. -# This file expects to have a GlusterFS storage solution running -# before "helm install" is performed. -################################################################# -# Global configuration overrides. -# -# These overrides will affect all helm charts (ie. applications) -# that are listed below and are 'enabled'. -################################################################# +shared: + scalability: &jvm-options + tip_wlan_ovsdb_listener_threadPoolSize: 50 + tip_wlan_AsyncExecutor_CorePoolSize: 10 + tip_wlan_AsyncExecutor_MaxPoolSize: 50 + tip_wlan_AsyncExecutor_QueueCapacity: 50 + tip_wlan_httpClientConfig_maxConnectionsTotal: 100 + tip_wlan_httpClientConfig_maxConnectionsPerRoute: 10 + tip_wlan_maxHttpThreads: 100 + JVM_MEM_OPTIONS: " " + singleDataSource_maxTotalConnections: 8 + singleDataSource_maxIdleConnections: 8 + singleDataSource_maxPreparedStatements: 200 + singleDataSource_maxIdlePreparedStatements: 200 + singleDataSource_maxTotalConnections: 8 + singleDataSource_maxIdleConnections: 8 + singleDataSource_maxPreparedStatements: 200 + singleDataSource_maxIdlePreparedStatements: 200 + global: - # Change to an unused port prefix range to prevent port conflicts - # with other instances running within the same k8s cluster nodePortPrefix: 302 nodePortPrefixExt: 304 - nsPrefix: tip - # image pull policy + pullPolicy: Always - repository: tip-tip-wlan-cloud-docker-repo.jfrog.io - # override default mount path root directory - # referenced by persistent volumes and log files - persistence: - # flag to enable debugging - application support required - debugEnabled: true + integratedDeployment: false + testingEnabled: false + testingTimestamp: -# Annotations for namespace +dockerRegistrySecret: ewoJImF1dGhzIjogewoJCSJ0aXAtdGlwLXdsYW4tY2xvdWQtZG9ja2VyLXJlcG8uamZyb2cuaW8iOiB7CgkJCSJhdXRoIjogImRHbHdMWEpsWVdRNmRHbHdMWEpsWVdRPSIKCQl9Cgl9LAoJIkh0dHBIZWFkZXJzIjogewoJCSJVc2VyLUFnZW50IjogIkRvY2tlci1DbGllbnQvMTkuMDMuOCAobGludXgpIgoJfQp9 annotations: { "helm.sh/resource-policy": keep } -createReleaseNamespace: false - -# Docker registry secret -dockerRegistrySecret: ewoJImF1dGhzIjogewoJCSJ0aXAtdGlwLXdsYW4tY2xvdWQtZG9ja2VyLXJlcG8uamZyb2cuaW8iOiB7CgkJCSJhdXRoIjogImRHbHdMWEpsWVdRNmRHbHdMWEpsWVdRPSIKCQl9Cgl9LAoJIkh0dHBIZWFkZXJzIjogewoJCSJVc2VyLUFnZW50IjogIkRvY2tlci1DbGllbnQvMTkuMDMuOCAobGludXgpIgoJfQp9 -################################################################# -# Enable/disable and configure helm charts (ie. applications) -# to customize the TIP-WLAN deployment. -################################################################# opensync-gw-static: enabled: false + opensync-gw-cloud: enabled: true externalhost: @@ -53,21 +46,57 @@ opensync-gw-cloud: enabled: true filestore: url: "https://tip-wlan-opensync-gw-cloud:9096" + scalability: + <<: *jvm-options + opensync-mqtt-broker: enabled: true replicaCount: 1 persistence: enabled: true - storageClass: "glusterfs-storage" + storageClass: glusterfs-storage + wlan-cloud-graphql-gw: enabled: true + env: + portalsvc: tip-wlan-wlan-portal-service:9051 + ingress: + hosts: + - host: wlan-ui-graphql.wlan.local + paths: [ + / + ] + tls: + - hosts: + - wlan-ui-graphql.wlan.local + secretName: nginx-ingress-controller-default-server-secret + wlan-cloud-static-portal: enabled: true + env: + graphql: https://wlan-ui-graphql.wlan.local + service: + type: NodePort + ingress: + hosts: + - host: wlan-ui.wlan.local + paths: [ + / + ] + tls: + - hosts: + - wlan-ui.wlan.local + secretName: nginx-ingress-controller-default-server-secret + wlan-portal-service: enabled: true persistence: enabled: true - storageClass: "glusterfs-storage" + storageClass: glusterfs-storage + filestoreSize: 1Gi + scalability: + <<: *jvm-options + wlan-prov-service: enabled: true creds: @@ -84,6 +113,9 @@ wlan-prov-service: singleDataSourceUsername: tip_user singleDataSourcePassword: tip_password singleDataSourceSslKeyPassword: mypassword + scalability: + <<: *jvm-options + wlan-ssc-service: enabled: true creds: @@ -92,16 +124,22 @@ wlan-ssc-service: sslTruststorePassword: mypassword cassandra: tip_user: tip_user - tip_password: tip_password + tip_password: tip_password schema_repo: username: tip-read password: tip-read + scalability: + <<: *jvm-options + wlan-spc-service: enabled: true creds: sslKeyPassword: mypassword sslKeystorePassword: mypassword sslTruststorePassword: mypassword + scalability: + <<: *jvm-options + wlan-port-forwarding-gateway-service: enabled: true creds: @@ -109,6 +147,7 @@ wlan-port-forwarding-gateway-service: externallyVisible: host: api.wlan.demo.lab.wlan.tip.build port: 30401 + nginx-ingress-controller: enabled: true controller: @@ -117,52 +156,124 @@ nginx-ingress-controller: } config: externalStatusAddress: "192.168.56.101" -zookeeper: - enabled: true - replicaCount: 1 - persistence: - enabled: true - storageClass: "glusterfs-storage" + kafka: enabled: true replicaCount: 1 + image: + debug: true + auth: + clientProtocol: mtls + interBrokerProtocol: tls + jksSecret: tip-common-kafka-certs + jksPassword: mypassword + tlsEndpointIdentificationAlgorithm: "" + jaas: + clientUsers: + - brokerUser + clientPassword: + - brokerPassword + extraEnvVars: + - name: KAFKA_CFG_SSL_KEYSTORE_TYPE + value: PKCS12 + allowPlaintextListener: true persistence: enabled: true - storageClass: "glusterfs-storage" - creds: - sslKeystorePassword: mypassword - sslTruststorePassword: mypassword - sslKeyPassword: mypassword + storageClass: glusterfs-storage + metrics: + serviceMonitor: + enabled: false + namespace: monitoring + selector: + release: prometheus-operator + zookeeper: + enabled: true + persistence: + enabled: true + cassandra: enabled: true - cluster: -## NOTE: If we are using glusterfs as Storage class, we don't really need -## replication turned on, since the data is anyway replicated on glusterfs nodes -## Replication is useful when we use HostPath as storage mechanism -## For Hostpath storage, recommendation is cluster_size: 3 and seed_size: 2 - replicaCount: 3 - seedCount: 2 + tlsEncryptionSecretName: tip-common-cassandra-certs + image: + debug: true persistence: enabled: true - storageClass: "glusterfs-storage" - creds: - sslKeystorePassword: mypassword - sslTruststorePassword: mypassword + storageClass: glusterfs-storage + replicaCount: 1 + cluster: + name: TipWlanCluster + seedCount: 1 + internodeEncryption: all + clientEncryption: true + exporter: + enabled: false + serviceMonitor: + enabled: false + additionalLabels: + release: prometheus-operator + dbUser: + user: cassandra + password: cassandra + resources: + limits: {} + requests: + cpu: 1 + memory: 3Gi + postgresql: enabled: true + postgresqlDatabase: tip + image: + debug: true + metrics: + enabled: false + serviceMonitor: + enabled: falsea + namespace: monitoring + additionalLabels: + release: prometheus-operator + postgresqlUsername: postgres postgresqlPassword: postgres -## NOTE: If we are using glusterfs as Storage class, we don't really need -## replication turned on, since the data is anyway replicated on glusterfs nodes -## Replication is useful: -## a. When we use HostPath as storage mechanism -## b. If master goes down and one of the slave is promoted as master + pgHbaConfiguration: | + hostssl replication repl_user 0.0.0.0/0 md5 clientcert=0 + hostssl postgres postgres 0.0.0.0/0 cert clientcert=1 + hostssl postgres postgres ::/0 cert clientcert=1 + hostssl all all 0.0.0.0/0 md5 clientcert=1 replication: enabled: true + user: repl_user + password: repl_password slaveReplicas: 1 persistence: enabled: true - storageClass: "glusterfs-storage" - readinessProbe: - initialDelaySeconds: 30 + storageClass: glusterfs-storage + volumePermissions: + enabled: true livenessProbe: - initialDelaySeconds: 30 \ No newline at end of file + enabled: false + readinessProbe: + enabled: false + tls: + enabled: true + certificatesSecret: tip-common-postgres-certs + certFilename: cert.crt + certKeyFilename: cert.key + certCAFilename: cacert.pem + initdbScriptsConfigMap: tip-common-postgres-scripts + extraEnv: + - name: PGSSLCERT + value: /opt/tip-wlan/certs/postgresclientcert.pem + - name: PGSSLKEY + value: /opt/tip-wlan/certs/postgresclientkey_dec.pem + - name: PGSSLROOTCERT + value: /opt/tip-wlan/certs/cacert.pem + primary: + extraInitContainers: + - command: [ "sh", "-c", "chmod 0600 /opt/bitnami/postgresql/certs/postgresclientkey_dec.pem" ] + image: busybox:latest + name: chmod-client-cert-additional + securityContext: + runAsUser: 0 + volumeMounts: + - mountPath: /opt/bitnami/postgresql/certs + name: postgresql-certificates diff --git a/tip-wlan/resources/environments/disable-allcharts.yaml b/tip-wlan/resources/environments/disable-allcharts.yaml index cfc1e7c..53b8617 100644 --- a/tip-wlan/resources/environments/disable-allcharts.yaml +++ b/tip-wlan/resources/environments/disable-allcharts.yaml @@ -1,146 +1,42 @@ -# This override file is useful to test one or more subcharts. -# It overrides the default Tip-Wlan parent chart behaviour -# -# Example use to enable a single subchart (from tip-wlan/ directory): -# -# helm install opensync-wifi-controller tip-wlan/ -n default -# -f tip-wlan/resources/environments/disable-allcharts.yaml -# --set opensync-gw-static.enabled=true -# -################################################################# -# Global configuration overrides. -# -# These overrides will affect all helm charts (ie. applications) -# that are listed below and are 'enabled'. -################################################################# global: - # Change to an unused port prefix range to prevent port conflicts - # with other instances running within the same k8s cluster nodePortPrefix: 302 nodePortPrefixExt: 304 - nsPrefix: tip - # image pull policy - pullPolicy: IfNotPresent + pullPolicy: Always repository: tip-tip-wlan-cloud-docker-repo.jfrog.io - # override default mount path root directory - # referenced by persistent volumes and log files - persistence: - # flag to enable debugging - application support required - debugEnabled: true - -createReleaseNamespace: false + integratedDeployment: false + testingEnabled: createDockerRegistrySecret: false -################################################################# -# Enable/disable and configure helm charts (ie. applications) -# to customize the TIP-WLAN deployment. -################################################################# + opensync-gw-static: enabled: false opensync-gw-cloud: enabled: false - externalhost: - address: - ovsdb: tip-wlan-opensync-gw-cloud - mqtt: tip-wlan-opensync-mqtt-broker - persistence: - enabled: true - filestore: - url: "https://tip-wlan-opensync-gw-cloud:9096" opensync-mqtt-broker: enabled: false - replicaCount: 1 - persistence: - enabled: true - storageClass: "glusterfs-storage" wlan-cloud-graphql-gw: enabled: false wlan-cloud-static-portal: enabled: false wlan-portal-service: enabled: false - persistence: - enabled: true - storageClass: "glusterfs-storage" wlan-prov-service: enabled: false - creds: - enabled: true - db: - postgresUser: - password: postgres - tipUser: - password: tip_password - schema_repo: - username: tip-read - password: tip-read wlan-ssc-service: enabled: false - creds: - sslKeyPassword: mypassword - sslKeystorePassword: mypassword - sslTruststorePassword: mypassword - cassandra: - tip_user: tip_user - tip_password: tip_password - schema_repo: - username: tip-read - password: tip-read wlan-spc-service: enabled: false - creds: - sslKeyPassword: mypassword - sslKeystorePassword: mypassword - sslTruststorePassword: mypassword wlan-port-forwarding-gateway-service: enabled: false - creds: - websocketSessionTokenEncKey: MyToKeN0MyToKeN1 + nginx-ingress-controller: enabled: false - controller: - nodeSelector: { - type: master - } - config: - externalStatusAddress: "192.168.56.101" -zookeeper: - enabled: false - replicaCount: 1 - persistence: - enabled: true - storageClass: "glusterfs-storage" + kafka: enabled: false - replicaCount: 1 - persistence: - enabled: true - storageClass: "glusterfs-storage" cassandra: enabled: false - cluster: -## NOTE: If we are using glusterfs as Storage class, we don't really need -## replication turned on, since the data is anyway replicated on glusterfs nodes -## Replication is useful when we use HostPath as storage mechanism -## For Hostpath storage, recommendation is cluster_size: 3 and seed_size: 2 - replicaCount: 3 - seedCount: 2 - persistence: - enabled: true - storageClass: "glusterfs-storage" postgresql: enabled: false - postgresqlPassword: postgres -## NOTE: If we are using glusterfs as Storage class, we don't really need -## replication turned on, since the data is anyway replicated on glusterfs nodes -## Replication is useful: -## a. When we use HostPath as storage mechanism -## b. If master goes down and one of the slave is promoted as master - replication: - enabled: true - slaveReplicas: 1 - persistence: - enabled: true - storageClass: "glusterfs-storage" \ No newline at end of file diff --git a/tip-wlan/resources/environments/migration.yaml b/tip-wlan/resources/environments/migration.yaml new file mode 100644 index 0000000..392ebdd --- /dev/null +++ b/tip-wlan/resources/environments/migration.yaml @@ -0,0 +1,139 @@ +global: + kafka: + image: confluentinc/cp-kafka:5.0.1 + port: 9092 + topics: + - name: wlan_service_metrics + partitions: 1 + replicationFactor: 1 + - name: system_events + partitions: 1 + replicationFactor: 1 + - name: customer_events + partitions: 1 + replicationFactor: 1 + creds: + sslKeyPassword: mypassword + sslKeystorePassword: mypassword + sslTruststorePassword: mypassword + +kafka: + enabled: true + replicaCount: 1 + image: + debug: true + auth: + clientProtocol: mtls + interBrokerProtocol: tls + jksSecret: tip-common-kafka-certs + jksPassword: mypassword + tlsEndpointIdentificationAlgorithm: "" + jaas: + clientUsers: + - brokerUser + clientPassword: + - brokerPassword + extraEnvVars: + - name: KAFKA_CFG_SSL_KEYSTORE_TYPE + value: PKCS12 + allowPlaintextListener: true + persistence: + enabled: true + storageClass: REPLACEME + metrics: + serviceMonitor: + enabled: false + namespace: monitoring + selector: + release: prometheus-operator + zookeeper: + enabled: true + persistence: + enabled: true + +cassandra: + enabled: true + tlsEncryptionSecretName: tip-common-cassandra-certs + image: + debug: true + persistence: + enabled: true + storageClass: REPLACEME + replicaCount: 1 + cluster: + name: TipWlanCluster + seedCount: 1 + internodeEncryption: all + clientEncryption: true + exporter: + enabled: false + serviceMonitor: + enabled: false + additionalLabels: + release: prometheus-operator + dbUser: + user: cassandra + password: cassandra + resources: + limits: {} + requests: + cpu: 1 + memory: 3Gi + +postgresql: + enabled: true + postgresqlDatabase: tip + image: + debug: true + metrics: + enabled: false + serviceMonitor: + enabled: false + namespace: monitoring + additionalLabels: + release: prometheus-operator + postgresqlUsername: postgres + postgresqlPassword: postgres + pgHbaConfiguration: | + hostssl replication repl_user 0.0.0.0/0 md5 clientcert=0 + hostssl postgres postgres 0.0.0.0/0 cert clientcert=1 + hostssl postgres postgres ::/0 cert clientcert=1 + hostssl all all 0.0.0.0/0 md5 clientcert=1 + replication: + enabled: true + user: repl_user + password: repl_password + slaveReplicas: 1 + persistence: + enabled: true + existingClaim: data-tip-wlan-postgresql-master-0 + volumePermissions: + enabled: true + livenessProbe: + enabled: false + readinessProbe: + enabled: false + tls: + enabled: true + certificatesSecret: tip-common-postgres-certs + certFilename: cert.crt + certKeyFilename: cert.key + certCAFilename: cacert.pem + initdbScriptsConfigMap: tip-common-postgres-scripts + extraEnv: + - name: PGSSLCERT + value: /opt/tip-wlan/certs/postgresclientcert.pem + - name: PGSSLKEY + value: /opt/tip-wlan/certs/postgresclientkey_dec.pem + - name: PGSSLROOTCERT + value: /opt/tip-wlan/certs/cacert.pem + primary: + extraInitContainers: + - command: [ "sh", "-c", "chmod 0600 /opt/bitnami/postgresql/certs/postgresclientkey_dec.pem" ] + image: busybox:latest + name: chmod-client-cert-additional + securityContext: + runAsUser: 0 + volumeMounts: + - mountPath: /opt/bitnami/postgresql/certs + name: postgresql-certificates diff --git a/tip-wlan/charts/postgresql/files/docker-entrypoint-initdb.d/creation-replication-user-role.sh b/tip-wlan/resources/scripts/creation-replication-user-role.sh similarity index 54% rename from tip-wlan/charts/postgresql/files/docker-entrypoint-initdb.d/creation-replication-user-role.sh rename to tip-wlan/resources/scripts/creation-replication-user-role.sh index 459235a..7efab54 100644 --- a/tip-wlan/charts/postgresql/files/docker-entrypoint-initdb.d/creation-replication-user-role.sh +++ b/tip-wlan/resources/scripts/creation-replication-user-role.sh @@ -3,8 +3,8 @@ # Creates user repl_user using ssl certs if [[ $POSTGRES_REPLICATION_MODE == "master" ]] then - psql 'host=localhost port=5432 user=postgres sslmode=verify-ca sslcert=/opt/tip-wlan/certs/postgresclientcert.pem sslkey=/opt/tip-wlan/certs/postgresclientkey_dec.pem sslrootcert=/opt/tip-wlan/certs/cacert.pem' -tc \ + psql 'host=localhost port=5432 user=postgres sslmode=verify-ca sslcert=/opt/bitnami/postgresql/certs/postgresclientcert.pem sslkey=/opt/bitnami/postgresql/certs/postgresclientkey_dec.pem sslrootcert=/opt/bitnami/postgresql/certs/cacert.pem' -tc \ "SELECT 1 FROM pg_roles WHERE rolname = '$POSTGRES_REPLICATION_USER'" | grep -q 1 \ - || psql 'host=localhost port=5432 user=postgres sslmode=verify-ca sslcert=/opt/tip-wlan/certs/postgresclientcert.pem sslkey=/opt/tip-wlan/certs/postgresclientkey_dec.pem sslrootcert=/opt/tip-wlan/certs/cacert.pem' -c \ + || psql 'host=localhost port=5432 user=postgres sslmode=verify-ca sslcert=/opt/bitnami/postgresql/certs/postgresclientcert.pem sslkey=/opt/bitnami/postgresql/certs/postgresclientkey_dec.pem sslrootcert=/opt/bitnami/postgresql/certs/cacert.pem' -c \ "CREATE ROLE $POSTGRES_REPLICATION_USER WITH REPLICATION LOGIN ENCRYPTED PASSWORD '$POSTGRES_REPLICATION_PASSWORD';" fi \ No newline at end of file diff --git a/tip-wlan/templates/cassandra-dependencies.yaml b/tip-wlan/templates/cassandra-dependencies.yaml new file mode 100644 index 0000000..83271ed --- /dev/null +++ b/tip-wlan/templates/cassandra-dependencies.yaml @@ -0,0 +1,30 @@ +--- +apiVersion: v1 +kind: Secret +metadata: + name: tip-common-cassandra-certs + namespace: {{ .Release.Namespace }} +type: Opaque +data: + truststore: {{ .Files.Get "resources/certs/truststore.jks" | b64enc }} + truststore-password: {{ .Values.global.creds.sslTruststorePassword | b64enc }} + keystore: {{ .Files.Get "resources/certs/cassandra_server_keystore.jks" | b64enc }} + keystore-password: {{ .Values.global.creds.sslKeystorePassword | b64enc }} + cassandraservercert.pem: {{ .Files.Get "resources/certs/cassandraservercert.pem" | b64enc }} + cassandraserverkey_dec.pem: {{ .Files.Get "resources/certs/cassandraserverkey_dec.pem" | b64enc }} + +--- +apiVersion: v1 +kind: Secret +metadata: + name: tip-common-cassandra-client-certs + namespace: {{ .Release.Namespace }} +type: Opaque +data: + cacert.pem: {{ .Files.Get "resources/certs/cacert.pem" | b64enc }} + cassandra_server_keystore.jks: {{ .Files.Get "resources/certs/cassandra_server_keystore.jks" | b64enc }} + cassandraservercert.pem: {{ .Files.Get "resources/certs/cassandraservercert.pem" | b64enc }} + cassandraserverkey_dec.pem: {{ .Files.Get "resources/certs/cassandraserverkey_dec.pem" | b64enc }} + kafka-server.pkcs12: {{ .Files.Get "resources/certs/kafka-server.pkcs12" | b64enc }} + truststore.jks: {{ .Files.Get "resources/certs/truststore.jks" | b64enc }} + server.pkcs12: {{ .Files.Get "resources/certs/server.pkcs12" | b64enc }} \ No newline at end of file diff --git a/tip-wlan/templates/docker-secret.yaml b/tip-wlan/templates/docker-secret.yaml index 7dea1cd..4c2f313 100644 --- a/tip-wlan/templates/docker-secret.yaml +++ b/tip-wlan/templates/docker-secret.yaml @@ -2,8 +2,8 @@ apiVersion: v1 kind: Secret metadata: - name: {{ include "common.namespace" . }}-docker-registry-key - namespace: {{ include "common.namespace" . }} + name: {{ .Release.Namespace }}-docker-registry-key + namespace: {{ .Release.Namespace }} labels: app: {{ include "common.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/tip-wlan/templates/kafka-dependencies.yaml b/tip-wlan/templates/kafka-dependencies.yaml new file mode 100644 index 0000000..7b291a3 --- /dev/null +++ b/tip-wlan/templates/kafka-dependencies.yaml @@ -0,0 +1,97 @@ +apiVersion: v1 +kind: Secret +metadata: + name: tip-common-kafka-certs + namespace: {{ .Release.Namespace }} +type: Opaque +data: + kafka-0.keystore.jks: {{ .Files.Get "resources/certs/kafka-server.pkcs12" | b64enc }} + kafka.truststore.jks: {{ .Files.Get "resources/certs/truststore.jks" | b64enc }} + +--- +apiVersion: v1 +kind: Secret +metadata: + name: tip-common-kafka-client-certs + namespace: {{ .Release.Namespace }} +type: Opaque +data: + client_keystore.jks: {{ .Files.Get "resources/certs/client_keystore.jks" | b64enc }} + kafka-server.pkcs12: {{ .Files.Get "resources/certs/kafka-server.pkcs12" | b64enc }} + truststore.jks: {{ .Files.Get "resources/certs/truststore.jks" | b64enc }} + server.pkcs12: {{ .Files.Get "resources/certs/server.pkcs12" | b64enc }} + + +{{ if .Values.global.kafka.topics }} +{{- $zk := printf "%s-zookeeper-headless" .Release.Name -}} +--- +apiVersion: batch/v1 +kind: Job +metadata: + name: {{ .Release.Name }}-kafka-config-{{ .Release.Revision }} + namespace: {{ .Release.Namespace }} +spec: + backoffLimit: 10 + template: + spec: + restartPolicy: OnFailure + initContainers: + - name: depends-on + image: {{ .Values.global.kafka.image }} + command: + - bash + - -c + - | + until kafka-configs --zookeeper {{ $zk }} --entity-type topics --describe || (( count++ >= 6 )) + do + echo "Waiting for Zookeeper..." + sleep 20 + done + until nc -z {{ $.Release.Name }}-kafka {{ .Values.global.kafka.port }} || (( retries++ >= 6 )) + do + echo "Waiting for Kafka..." + sleep 20 + done + containers: + - name: kafka-config + image: confluentinc/cp-kafka:5.0.1 + command: + - bash + - -c + - | + set -e + {{- range $n, $topic := .Values.global.kafka.topics }} + {{- if and $topic.partitions $topic.replicationFactor $topic.reassignPartitions }} + cat << EOF > {{ $topic.name }}-increase-replication-factor.json + {"version":1, "partitions":[ + {{- $partitions := (int $topic.partitions) }} + {{- $replicas := (int $topic.replicationFactor) }} + {{- range $i := until $partitions }} + {"topic":"{{ $topic.name }}","partition":{{ $i }},"replicas":[{{- range $j := until $replicas }}{{ $j }}{{- if ne $j (sub $replicas 1) }},{{- end }}{{- end }}]}{{- if ne $i (sub $partitions 1) }},{{- end }} + {{- end }} + ]} + EOF + kafka-reassign-partitions --zookeeper {{ $zk }} --reassignment-json-file {{ $topic.name }}-increase-replication-factor.json --execute + kafka-reassign-partitions --zookeeper {{ $zk }} --reassignment-json-file {{ $topic.name }}-increase-replication-factor.json --verify + {{- else if and $topic.partitions $topic.replicationFactor }} + kafka-topics --zookeeper {{ $zk }} --create --if-not-exists --force --topic {{ $topic.name }} --partitions {{ $topic.partitions }} --replication-factor {{ $topic.replicationFactor }} + {{- else if $topic.partitions }} + kafka-topics --zookeeper {{ $zk }} --alter --force --topic {{ $topic.name }} --partitions {{ $topic.partitions }} || true + {{- end }} + {{- if $topic.defaultConfig }} + kafka-configs --zookeeper {{ $zk }} --entity-type topics --entity-name {{ $topic.name }} --alter --force --delete-config {{ nospace $topic.defaultConfig }} || true + {{- end }} + {{- if $topic.config }} + kafka-configs --zookeeper {{ $zk }} --entity-type topics --entity-name {{ $topic.name }} --alter --force --add-config {{ nospace $topic.config }} + {{- end }} + kafka-configs --zookeeper {{ $zk }} --entity-type topics --entity-name {{ $topic.name }} --describe + {{- if $topic.acls }} + {{- range $a, $acl := $topic.acls }} + {{ if and $acl.user $acl.operations }} + kafka-acls --authorizer-properties zookeeper.connect={{ $zk }} --force --add --allow-principal User:{{ $acl.user }}{{- range $operation := $acl.operations }} --operation {{ $operation }} {{- end }} --topic {{ $topic.name }} {{ $topic.extraParams }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + +{{- end -}} diff --git a/tip-wlan/templates/namespace.yaml b/tip-wlan/templates/namespace.yaml deleted file mode 100644 index 950a7cf..0000000 --- a/tip-wlan/templates/namespace.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if and .Release.Namespace (.Values.createReleaseNamespace | default false) -}} -apiVersion: v1 -kind: Namespace -metadata: - name: {{ include "common.namespace" . }} - labels: - release: {{ .Release.Name }} -{{- if .Values.annotations }} - annotations: -{{ toYaml .Values.annotations | indent 4 }} -{{- end }} -{{- end -}} \ No newline at end of file diff --git a/tip-wlan/templates/postgres-dependencies.yaml b/tip-wlan/templates/postgres-dependencies.yaml new file mode 100644 index 0000000..6035b16 --- /dev/null +++ b/tip-wlan/templates/postgres-dependencies.yaml @@ -0,0 +1,38 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: tip-common-postgres-scripts + namespace: {{ .Release.Namespace }} +data: +{{ tpl (.Files.Glob "resources/scripts/creation-replication-user-role.sh").AsConfig . | indent 2 }} + +--- +apiVersion: v1 +kind: Secret +metadata: + name: tip-common-postgres-certs + namespace: {{ .Release.Namespace }} +type: Opaque +data: + cacert.pem: {{ .Files.Get "resources/certs/cacert.pem" | b64enc }} + cert.crt: {{ .Files.Get "resources/certs/servercert.pem" | b64enc }} + cert.key: {{ .Files.Get "resources/certs/serverkey_dec.pem" | b64enc }} + postgresclientcert.pem: {{ .Files.Get "resources/certs/postgresclientcert.pem" | b64enc }} + postgresclientkey_dec.pem: {{ .Files.Get "resources/certs/postgresclientkey_dec.pem" | b64enc }} + +--- +apiVersion: v1 +kind: Secret +metadata: + name: tip-common-postgres-client-certs + namespace: {{ .Release.Namespace }} +type: Opaque +data: + cacert.pem: {{ .Files.Get "resources/certs/cacert.pem" | b64enc }} + client_keystore.jks: {{ .Files.Get "resources/certs/client_keystore.jks" | b64enc }} + postgresclient.p12: {{ .Files.Get "resources/certs/postgresclient.p12" | b64enc }} + postgresclientcert.pem: {{ .Files.Get "resources/certs/postgresclientcert.pem" | b64enc }} + postgresclientkey_dec.pem: {{ .Files.Get "resources/certs/postgresclientkey_dec.pem" | b64enc }} + server.pkcs12: {{ .Files.Get "resources/certs/server.pkcs12" | b64enc }} + truststore.jks: {{ .Files.Get "resources/certs/truststore.jks" | b64enc }} diff --git a/tip-wlan/values-test.yaml b/tip-wlan/values-test.yaml index 9adf898..a89593f 100644 --- a/tip-wlan/values-test.yaml +++ b/tip-wlan/values-test.yaml @@ -1,7 +1,3 @@ -# Default values for Tip-Wlan -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - ################################################################# # Global configuration overrides. # @@ -12,8 +8,6 @@ global: # Change to an unused port prefix range to prevent port conflicts # with other instances running within the same k8s cluster nodePortPrefix: 302 - # namespace to deploy the release - nsPrefix: tip repository: tip-tip-wlan-cloud-docker-repo.jfrog.io # image pull policy @@ -31,10 +25,7 @@ global: # Integrated Deployment which deploys Prov Service, Portal Service and # SSC Service in a single docker image - integratedDeployment: false - -# Namespace related -createReleaseNamespace: true + integratedDeployment: false # DockerRegistry Secret createDockerRegistrySecret: true @@ -66,8 +57,7 @@ wlan-integrated-cloud-component-service: enabled: true nginx-ingress-controller: enabled: true -zookeeper: - enabled: true + kafka: enabled: true cassandra: diff --git a/tip-wlan/values.yaml b/tip-wlan/values.yaml index e04f70f..a8ff262 100644 --- a/tip-wlan/values.yaml +++ b/tip-wlan/values.yaml @@ -1,31 +1,46 @@ -# Default values for Tip-Wlan -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. +shared: + scalability: &jvm-options + #how many concurrent connections single instance of OpenSyncGateway can accept + tip_wlan_ovsdb_listener_threadPoolSize: 50 + #asynchronous task executor - monitor metrics and adjust if tasks start being rejected + tip_wlan_AsyncExecutor_CorePoolSize: 10 + tip_wlan_AsyncExecutor_MaxPoolSize: 50 + tip_wlan_AsyncExecutor_QueueCapacity: 50 + #max total number of persistent connections in the http client pool + tip_wlan_httpClientConfig_maxConnectionsTotal: 100 + #max number of persistent connections in the http client pool per destination + tip_wlan_httpClientConfig_maxConnectionsPerRoute: 10 + #max number of concurrent REST API calls a single instance of this service can process + tip_wlan_maxHttpThreads: 100 + #memory tuning parameters for the JVM - max size, initialsize, garbage collection tuning options, etc. + JVM_MEM_OPTIONS: " " + #max number of connections to PostgreSQL database + singleDataSource_maxTotalConnections: 8 + #max number of idle connections to PostgreSQL database + singleDataSource_maxIdleConnections: 8 + #max number of cached prepared statements used in PostgreSQL database + singleDataSource_maxPreparedStatements: 200 + #max number of cached idle prepared statements used in PostgreSQL database + singleDataSource_maxIdlePreparedStatements: 200 + #max number of connections to PostgreSQL database + singleDataSource_maxTotalConnections: 8 + #max number of idle connections to PostgreSQL database + singleDataSource_maxIdleConnections: 8 + #max number of cached prepared statements used in PostgreSQL database + singleDataSource_maxPreparedStatements: 200 + #max number of cached idle prepared statements used in PostgreSQL database + singleDataSource_maxIdlePreparedStatements: 200 -################################################################# -# Global configuration overrides. -# -# These overrides will affect all helm charts (ie. applications) -# that are listed below and are 'enabled'. -################################################################# global: # Change to an unused port prefix range to prevent port conflicts # with other instances running within the same k8s cluster nodePortPrefix: 302 nodePortPrefixExt: 304 - # namespace to deploy the release - nsPrefix: tip repository: tip-tip-wlan-cloud-docker-repo.jfrog.io # image pull policy pullPolicy: Always - # default mount path root directory referenced - # by persistent volumes and log files - persistence: - - # override default resource limit flavor for all charts - flavor: unlimited # flag to enable debugging - application support required debugEnabled: false @@ -35,12 +50,7 @@ global: integratedDeployment: false testingEnabled: false - - testingTimestamp: - - -# Namespace related -createReleaseNamespace: true + testingTimestamp: # DockerRegistry Secret createDockerRegistrySecret: true @@ -76,8 +86,6 @@ wlan-integrated-cloud-component-service: enabled: false nginx-ingress-controller: enabled: false -zookeeper: - enabled: false kafka: enabled: false cassandra: