moved validation into separate job

.github/workflows/helm-validation.yml

@@ -15,24 +15,26 @@ jobs:
           ssh-key: ${{ secrets.GH_AUTOMATION_KEY }}
           submodules: true
       - name: Validators setup
+        working-directory: /tmp
         env:
           KUBESCORE_VERSON: 1.7.1
         run: |
           mkdir /tmp/k8s-validators
-          cd /tmp/k8s-validators
 
           curl -LO https://github.com/instrumenta/kubeval/releases/latest/download/kubeval-linux-amd64.tar.gz
           tar xf kubeval-linux-amd64.tar.gz
-          rm -f kubeval-linux-amd64.tar.gz LICENSE README.md
+          rm -f kubeval-linux-amd64.tar.gz
 
           curl -LO https://github.com/zegl/kube-score/releases/download/v${{ env.KUBESCORE_VERSON }}/kube-score_${{ env.KUBESCORE_VERSON }}_linux_amd64.tar.gz
           tar xf kube-score_${{ env.KUBESCORE_VERSON }}_linux_amd64.tar.gz
-          rm -f kube-score_${{ env.KUBESCORE_VERSON }}_linux_amd64.tar.gz LICENSE README.md
+          rm -f kube-score_${{ env.KUBESCORE_VERSON }}_linux_amd64.tar.gz
 
           curl -LO https://get.helm.sh/helm-v3.2.4-linux-amd64.tar.gz
           tar xf helm-v3.2.4-linux-amd64.tar.gz
           mv linux-amd64/helm .
           rm -fr helm-v3.2.4-linux-amd64.tar.gz linux-amd64
+
+          echo "::add-path::/tmp/k8s-validators/"
       - name: Cache validators
         uses: actions/cache@v1
         with:
@@ -42,15 +44,15 @@ jobs:
         working-directory: tip-wlan
         run: |
           echo "Kubeval test"
-          helm template -f values-test.yaml . | /tmp/k8s-validators/kubeval --ignore-missing-schemas
+          helm template -f values-test.yaml . | kubeval --ignore-missing-schemas
 
           echo "Kube-score test"
-          helm template -f values-test.yaml . | /tmp/k8s-validators/kube-score score -
+          helm template -f values-test.yaml . | kube-score score -
       - name: Test glusterfs
         working-directory: glusterfs/kube-templates
         run: |
           echo "Kubeval test"
-          /tmp/k8s-validators/kubeval *.yaml
+          kubeval *.yaml
 
           echo "Kube-score test"
-          /tmp/k8s-validators/kube-score score *.yaml
+          kube-score score *.yaml

.gitignore

@@ -1,5 +0,0 @@
-*.pem
-*.jks
-*.pkcs12
-*.p12
-*.DS_Store

LICENSE

@@ -1,29 +0,0 @@
-BSD 3-Clause License
-
-Copyright (c) 2020, Telecom Infra Project
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -45,132 +45,3 @@ This repository contains helm charts for various deployment types of the tip wla
  - Run the following command under tip-wlan-helm directory _after_ the components are running:
  	- helm test <RELEASE_NAME> -n default
 	(For more details add --debug flag to the above command) 
-
-
-# Local environment
-
-In `wlan-pki-cert-scripts` repository edit the following files and add/replace strings as specified below:
-
-```
-mqtt-server.cnf:
-
--commonName_default   = opensync-mqtt-broker.zone1.lab.wlan.tip.build
-+commonName_default   = opensync-mqtt-broker.wlan.local
-
-
-openssl-server.cnf:
--DNS.1  = opensync-redirector.zone1.lab.wlan.tip.build
--DNS.2  = opensync-controller.zone1.lab.wlan.tip.build
-+DNS.1  = opensync-redirector.wlan.local
-+DNS.2  = opensync-controller.wlan.local
- DNS.3  = tip-wlan-postgresql
--DNS.4  = ftp.example.com
-```
-
-In `wlan-pki-cert-scripts` repository run `./generate_all.sh` to generate CA and certificates, then run `./copy-certs-to-helm.sh <local path to wlan-cloud-helm repo>` in order to copy certificates to helm charts.
-
-Optionally, in order to speedup first and subsequent runs, you may cache some images:
-
-```
-minikube cache add zookeeper:3.5.5
-minikube cache add bitnami/postgresql:11.8.0-debian-10-r58
-minikube cache add postgres:latest
-minikube cache add gcr.io/k8s-minikube/storage-provisioner:v3
-minikube cache add eclipse-mosquitto:latest
-minikube cache add opsfleet/depends-on
-```
-
-These images may occasionally need to be updated with these commands:
-
-```
-minikube cache reload ## reload images from the upstream
-eval $( minikube docker-env )
-for img in $( docker images --format '{{.Repository}}:{{.Tag}}' | egrep 'busybox|alpine|confluentinc/cp-kafka|zookeeper|k8s.gcr.io/pause|nginx/nginx-ingress|bitnami/cassandra|bitnami/postgresql|postgres|bitnami/minideb' ); do
-	minikube cache add $img;
-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```
-
-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```
-
-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.
-
-Services may be exposed to the local machine or local network with ssh, kubectl or kubefwd with port forwarding, please examples below.
-
-Kubefwd:
-
-kubefwd is used to forward Kubernetes services to a local workstation, easing the development of applications that communicate with other services. It is for development purposes only. For production/staging environments services need to be exposed via load balancers.
-Download latest release from https://github.com/eugenetaranov/kubefwd/releases and run the binary.
-
-Forward to all interfaces (useful if you need to connect from other devices in your local network):
-
-```
-sudo kubefwd services --namespace tip -l "app.kubernetes.io/name in (nginx-ingress-controller,wlan-portal-service,opensync-gw-cloud,opensync-mqtt-broker)" --allinterfaces --extrahosts wlan-ui-graphql.wlan.local,wlan-ui.wlan.local
-```
-
-Kubectl port forwarding (alternative to kubefwd):
-```
-kubectl -n tip port-forward --address 0.0.0.0 $(kubectl -n tip get pods -l app=tip-wlan-nginx-ingress-controller -o jsonpath='{.items[0].metadata.name}') 443:443 &
-kubectl -n tip port-forward --address 0.0.0.0 $(kubectl -n tip get pods -l app.kubernetes.io/name=wlan-portal-service -o jsonpath='{.items[0].metadata.name}') 9051:9051 &
-kubectl -n tip port-forward --address 0.0.0.0 $(kubectl -n tip get pods -l app.kubernetes.io/name=opensync-gw-cloud -o jsonpath='{.items[0].metadata.name}') 6643:6643 &
-kubectl -n tip port-forward --address 0.0.0.0 $(kubectl -n tip get pods -l app.kubernetes.io/name=opensync-gw-cloud -o jsonpath='{.items[0].metadata.name}') 6640:6640 &
-kubectl -n tip port-forward --address 0.0.0.0 $(kubectl -n tip get pods -l app.kubernetes.io/name=opensync-mqtt-broker -o jsonpath='{.items[0].metadata.name}') 1883:1883 &
-```
-
-Add certificate to the trust store.
-
-Firefox:
-
-1. Open settings, `Privacy and security`, `View certificates`.
-
-2. Click on `Add Exception...`, enter `https://wlan-ui.wlan.local` into Location field, click on `Get certificate`, check `Permanently store this exception` and click on `Confirm Security Exception`.
-Repeat the step for `https://wlan-ui-graphql.wlan.local`
-
-
-Chrome and other browsers using system certificate store:
-
-1. Save certificate below into the file `wlan-ui-graphql.wlan.local.crt` (it is the one defined at tip-wlan/resources/environments/dev-local.yaml:143):
-
-```
------BEGIN CERTIFICATE-----
-MIIFWjCCA0KgAwIBAgIUQNaP/spvRHtBTAKwYRNwbxRfFAswDQYJKoZIhvcNAQEL
-BQAwHTEbMBkGA1UEAwwSd2xhbi11aS53bGFuLmxvY2FsMB4XDTIwMDgyNzIwMjY1
-NloXDTMwMDgyNTIwMjY1NlowHTEbMBkGA1UEAwwSd2xhbi11aS53bGFuLmxvY2Fs
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwRagiDWzCNYBtWwBcK+f
-TkkQmMt+QAgTjYr0KS8DPJCJf6KkPfZHCu3w4LvrxzY9Nmieh2XU834amdJxIuCw
-6IbNo6zskjsyfoO8wFDmlLVWLeg5H9G9doem+WTeKPaEHi3oquzNgt6wLs3mvvOA
-TviTIoc88ELjk4dSR2T4dhh0qKCCj+HdXBA6V/9biru+jV+/kxEQuL2zM39DvVd8
-9ks35zMVUze36lD4ICOnl7hgaTNBi45O9sdLD0YaUmjiFwQltJUdmPKpaAdbvjUO
-nsupnDYjm+Um+9aEpqM4te23efC8N8j1ukexzJrE2GeF/WB/Y1LFIG2wjqVnsPcs
-nFF4Yd9EBRRne1EZeXBu3FELFy6lCOHI146oBcc/Ib617rdTKXqxtv/2NL6/TqFk
-ns/EEjve6kQYzlBZwWHWpZwQfg3mo6NaoFZpTag98Myu5rZoOofTcxXH6pLm5Px1
-OAzgLna9O+2FmA4FjrgHcMY1NIzynZL+DH8fibt1F/v2F2MA+R9vo84vR5ROGNdD
-va2ApevkLcjQg/LwsXv0gTopQ/XIzejh6bdUkOrKSwJzT2C9/e9GQn0gppV8LBuK
-1zQHoROLnA41MCFvQLQHo+Xt8KGw+Ubaly6hOxBZF51L/BbqjkDH9AEFaJLptiEy
-qn1E5v+3whgFS5IZT8IW5uUCAwEAAaOBkTCBjjAdBgNVHQ4EFgQUy2bAUyNPXHS9
-3VTSD+woN7t3q8EwHwYDVR0jBBgwFoAUy2bAUyNPXHS93VTSD+woN7t3q8EwDwYD
-VR0TAQH/BAUwAwEB/zA7BgNVHREENDAyghp3bGFuLXVpLWdyYXBocWwud2xhbi5s
-b2NhbIIOYXBpLndsYW4ubG9jYWyHBMCoAAEwDQYJKoZIhvcNAQELBQADggIBAKH+
-bqJee11n34SYgBDvgoZ8lJLQRwsFnqExcSr/plZ7GVIGFH5/Q2Kyo9VyEiTPwrIs
-KsErC1evH6xt1URfMzp05zVQ0LYM5+ksamRDagAg3M1cm7oKOdms/dqzPe2gZfGJ
-pVdtVW1CHrL0RLTR93h7kgSiBlSEIYMoeKfN5H9AavJ4KryygQs63kkGQ5M9esAp
-u6bB307zyfzgS3tmQsU01rgJfhEHQ/Y+Ak9wDuOgvmfx0TWgAOGbKq6Tu8MKYdej
-Ie7rV1G5Uv7KfgozVX76g2KdnTVBfspSKo3zyrZkckzApvUu9IefHdToe4JMEU0y
-fk7lEU/exzByyNxp+6hdu/ZIg3xb1yA1oVY8NEd1rL1zAViPe351SENEKeJpRanC
-kCL3RAFkbxQ7Ihacjox8belR+gmo8cyFZpj9XaoPlSFScdwz573CT0h97v76A7sw
-yC+CiSp85gWEV5vgBitNJ7R9onjBdsuH2lgEtMD3JNOs8cCSRihYxriwZSqhT7o/
-tcIlcJ84W5m6X6zHJ3GmtuKG3QPNOms0/VVoDTp9qdpL+Ek17uB2A41Npxz3US+l
-6yK+pdQQj7ALzKuRfOyg80XbNw2v4SnpI5qbXFBRum52f86sPemFq1KcuNWe4EVC
-xDG3eKlu+dllUtKx/PN6yflbT5xcGgcdmrwzRaWS
------END CERTIFICATE-----
-
-```
-
-2. Double click on it, enter the system admin password, if prompted.

glusterfs/kube-templates/glusterfs-storage-class.yaml

@@ -4,7 +4,7 @@ metadata:
   name: glusterfs-storage
 provisioner: kubernetes.io/glusterfs
 allowVolumeExpansion: true
-reclaimPolicy: Delete
+reclaimPolicy: Retain
 parameters:
   resturl: "http://192.168.56.101:31080"
   restuser: "admin"

tip-wlan/Chart.yaml

@@ -54,12 +54,6 @@ dependencies:
   - 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

tip-wlan/charts/cassandra/.helmignore

@@ -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

tip-wlan/charts/cassandra/Chart.yaml

@@ -1,21 +1,12 @@
-name: cassandra
 apiVersion: v2
-version: 5.5.3
+name: cassandra
+version: 0.1.0
 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
+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.
 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
+keywords:
+- cassandra
+- database
+- nosql

tip-wlan/charts/cassandra/resources/config/certs/README.md

@@ -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

tip-wlan/charts/cassandra/resources/config/cqlshrc.default

@@ -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_<ks>_<table>.err where <ks> is your keyspace and <table> 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

tip-wlan/charts/cassandra/resources/config/cqlshrc.tip-wlan

@@ -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 = 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_<ks>_<table>.err where <ks> is your keyspace and <table> 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

tip-wlan/charts/cassandra/templates/NOTES.txt

@@ -1,65 +1,35 @@
-** Please be patient while the chart is being deployed **
+Cassandra CQL can be accessed via port {{ .Values.config.ports.cql }} on the following DNS name from within your cluster:
+Cassandra Thrift can be accessed via port {{ .Values.config.ports.thrift }} on the following DNS name from within your cluster:
 
-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 you want to connect to the remote instance with your local Cassandra CQL cli. To forward the API port to localhost:9042 run the following:
+- kubectl port-forward --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ include "common.name" . }},release={{ .Release.Name }} -o jsonpath='{ .items[0].metadata.name }') 9042:{{ .Values.config.ports.cql }}
 
+If you want to connect to the Cassandra CQL run the following:
 {{- 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
+- export CQL_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "common.fullname" . }})
+- export CQL_HOST=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+- cqlsh $CQL_HOST $CQL_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
-
+  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 {{ include "common.fullname" . }}'
+- export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "common.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+- echo cqlsh $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 }}
+- kubectl port-forward --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "common.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") 9042:{{ .Values.config.ports.cql }}
+  echo cqlsh 127.0.0.1 9042
 {{- end }}
 
-{{- if and (contains "bitnami/" .Values.image.repository) (not (.Values.image.tag | toString | regexFind "-r\\d+$|sha256:")) }}
+You can also see the cluster status by run the following:
+- kubectl exec -it --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ include "common.name" . }},release={{ .Release.Name }} -o jsonpath='{.items[0].metadata.name}') nodetool status
 
-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/
+To tail the logs for the Cassandra pod run the following:
+- kubectl logs -f --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ include "common.name" . }},release={{ .Release.Name }} -o jsonpath='{ .items[0].metadata.name }')
 
-{{- end }}
+{{- if not .Values.persistence.enabled }}
+
+Note that the cluster is running with node-local storage instead of PersistentVolumes. In order to prevent data loss,
+pods will be decommissioned upon termination. Decommissioning may take some time, so you might also want to adjust the
+pod termination gace period, which is currently set to {{ .Values.podSettings.terminationGracePeriodSeconds }} seconds.
+
+{{- end}}

tip-wlan/charts/cassandra/templates/_helpers.tpl

@@ -1,71 +1,17 @@
-{{/* vim: set filetype=mustache: */}}
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "cassandra.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
 
 {{/*
-Return the appropriate apiVersion for networkpolicy.
+Create the name of the service account to use
 */}}
-{{- define "networkPolicy.apiVersion" -}}
-{{- if semverCompare ">=1.4-0, <1.7-0" .Capabilities.KubeVersion.GitVersion -}}
-{{- print "extensions/v1beta1" -}}
+{{- define "cassandra.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+    {{ default (include "cassandra.fullname" .) .Values.serviceAccount.name }}
 {{- else -}}
-{{- print "networking.k8s.io/v1" -}}
+    {{ default "default" .Values.serviceAccount.name }}
 {{- 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 -}}

tip-wlan/charts/cassandra/templates/backup/cronjob.yaml

@@ -0,0 +1,90 @@
+{{- if .Values.backup.enabled }}
+{{- $release := .Release }}
+{{- $values := .Values }}
+{{- $backup := $values.backup }}
+{{- range $index, $schedule := $backup.schedule }}
+---
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+  name: {{ include "common.fullname" $ }}-backup-{{ $schedule.keyspace | replace "_" "-" }}
+  labels:
+    app: {{ include "common.name" $ }}-cain
+    chart: {{ template "cassandra.chart" $ }}
+    release: "{{ $release.Name }}"
+    heritage: "{{ $release.Service }}"
+spec:
+  schedule: {{ $schedule.cron | quote }}
+  concurrencyPolicy: Forbid
+  startingDeadlineSeconds: 120
+  jobTemplate:
+    spec:
+      template:
+        metadata:
+          annotations:
+            {{ toYaml $backup.annotations }}
+        spec:
+          restartPolicy: OnFailure
+          serviceAccountName: {{ template "cassandra.serviceAccountName" $ }}
+          containers:
+          - name: cassandra-backup
+            image: "{{ $backup.image.repository }}:{{ $backup.image.tag }}"
+            command: ["cain"]
+            args:
+            - backup
+            - --namespace
+            - {{ $release.Namespace }}
+            - --selector
+            - release={{ $release.Name }},app={{ include "common.name" $ }}
+            - --keyspace
+            - {{ $schedule.keyspace }}
+            - --dst
+            - {{ $backup.destination }}
+            {{- with $backup.extraArgs }}
+{{ toYaml . | indent 12 }}
+            {{- end }}
+            env:
+{{- if $backup.google.serviceAccountSecret }}
+            - name: GOOGLE_APPLICATION_CREDENTIALS
+              value: "/etc/secrets/google/credentials.json"
+{{- end }}
+          {{- with $backup.env }}
+{{ toYaml . | indent 12 }}
+          {{- end }}
+          {{- with $backup.resources }}
+            resources:
+{{ toYaml . | indent 14 }}
+          {{- end }}
+{{- if $backup.google.serviceAccountSecret }}
+            volumeMounts:
+            - name: google-service-account
+              mountPath: /etc/secrets/google/
+{{- end }}
+{{- if $backup.google.serviceAccountSecret }}
+          volumes:
+          - name: google-service-account
+            secret:
+              secretName: {{ $backup.google.serviceAccountSecret | quote }}
+{{- end }}
+          affinity:
+            podAffinity:
+              preferredDuringSchedulingIgnoredDuringExecution:
+              - weight: 1
+                podAffinityTerm:
+                  labelSelector:
+                    matchExpressions:
+                    - key: app
+                      operator: In
+                      values:
+                      - {{ include "common.fullname" $ }}
+                    - key: release
+                      operator: In
+                      values:
+                      - {{ $release.Name }}
+                  topologyKey: "kubernetes.io/hostname"
+          {{- with $values.tolerations }}
+          tolerations:
+{{ toYaml . | indent 12 }}
+          {{- end }}
+{{- end }}
+{{- end }}

tip-wlan/charts/cassandra/templates/backup/rbac.yaml

@@ -0,0 +1,50 @@
+{{- if .Values.backup.enabled }}
+{{- if .Values.serviceAccount.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ template "cassandra.serviceAccountName" . }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ template "cassandra.chart" . }}
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+---
+{{- end }}
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ include "common.fullname" . }}-backup
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ template "cassandra.chart" . }}
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+rules:
+- apiGroups: [""]
+  resources: ["pods", "pods/log"]
+  verbs: ["get", "list"]
+- apiGroups: [""]
+  resources: ["pods/exec"]
+  verbs: ["create"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ include "common.fullname" . }}-backup
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ template "cassandra.chart" . }}
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ include "common.fullname" . }}-backup
+subjects:
+- kind: ServiceAccount
+  name: {{ template "cassandra.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
+{{- end }}

tip-wlan/charts/cassandra/templates/configmap.yaml

@@ -1,7 +1,14 @@
-apiVersion: v1
+{{- if .Values.configOverrides }}
 kind: ConfigMap
+apiVersion: v1
 metadata:
-  name: cassandra-configurations-override
+  name: {{ include "common.name" . }}
   namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
 data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
+{{ toYaml .Values.configOverrides | indent 2 }}
+{{- end }}

tip-wlan/charts/cassandra/templates/headless-svc.yaml

@@ -1,29 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.fullname" . }}-headless
-  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 }}

tip-wlan/charts/cassandra/templates/networkpolicy.yaml

@@ -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 }}

tip-wlan/charts/cassandra/templates/secret.yaml

@@ -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 }}

tip-wlan/charts/cassandra/templates/service.yaml

@@ -3,30 +3,44 @@ 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 }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ template "cassandra.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
   {{- end }}
+spec:
+  clusterIP: None
+  type: {{ .Values.service.type }}
   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 }}
+    {{- if .Values.exporter.enabled }}
+  - name: metrics
+    port: 5556
+    targetPort: {{ .Values.exporter.port }}
     {{- end }}
-  selector: {{- include "common.selectorLabels" . | nindent 4 }}
+  - name: intra
+    port: 7000
+    targetPort: 7000
+  - name: tls
+    port: 7001
+    targetPort: 7001
+  - name: jmx
+    port: 7199
+    targetPort: 7199
+  - name: cql
+    port: {{ default 9042 .Values.config.ports.cql }}
+    targetPort: {{ default 9042 .Values.config.ports.cql }}
+  - name: thrift
+    port: {{ default 9160 .Values.config.ports.thrift }}
+    targetPort: {{ default 9160 .Values.config.ports.thrift }}
+  {{- if .Values.config.ports.agent }}
+  - name: agent
+    port: {{ .Values.config.ports.agent }}
+    targetPort: {{ .Values.config.ports.agent }}
+  {{- end }}
+  selector:
+    app: {{ include "common.name" . }}
+    release: {{ .Release.Name }}

tip-wlan/charts/cassandra/templates/statefulset.yaml

@@ -3,304 +3,219 @@ kind: StatefulSet
 metadata:
   name: {{ include "common.fullname" . }}
   namespace: {{ include "common.namespace" . }}
-  labels: {{- include "common.labels" . | nindent 4 }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ template "cassandra.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
 spec:
   selector:
-    matchLabels: {{- include "common.selectorLabels" . | nindent 6 }}
-  serviceName: {{ include "common.fullname" . }}-headless
-  replicas: {{ .Values.cluster.replicaCount }}
+    matchLabels:
+      app: {{ include "common.name" . }}
+      release: {{ .Release.Name }}
+  serviceName: {{ include "common.fullname" . }}
+  replicas: {{ .Values.config.cluster_size }}
+  podManagementPolicy: {{ .Values.podManagementPolicy }}
   updateStrategy:
-    type: {{ .Values.statefulset.updateStrategy }}
-    {{- if (eq "Recreate" .Values.statefulset.updateStrategy) }}
-    rollingUpdate: null
-    {{- else if .Values.statefulset.rollingUpdatePartition }}
-    rollingUpdate:
-      partition: {{ .Values.statefulset.rollingUpdatePartition }}
-    {{- end }}
+    type: {{ .Values.updateStrategy.type }}
   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) }}
+      labels:
+        app: {{ include "common.name" . }}
+        release: {{ .Release.Name }}
+{{- if .Values.podLabels }}
+{{ toYaml .Values.podLabels | indent 8 }}
+{{- end }}
+{{- if .Values.podAnnotations }}
       annotations:
-        {{- if .Values.podAnnotations }}
-        {{- toYaml .Values.podAnnotations | nindent 8 }}
-        {{- end }}
-        {{- if .Values.metrics.podAnnotations }}
-        {{- toYaml .Values.metrics.podAnnotations | nindent 8 }}
-        {{- end }}
-      {{- end }}
+{{ toYaml .Values.podAnnotations | indent 8 }}
+{{- 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 }}
+      {{- if .Values.schedulerName }}
+      schedulerName: "{{ .Values.schedulerName }}"
       {{- end }}
+      hostNetwork: {{ .Values.hostNetwork }}
+{{- if .Values.selector }}
+{{ toYaml .Values.selector | indent 6 }}
+{{- end }}
       {{- if .Values.securityContext.enabled }}
       securityContext:
         fsGroup: {{ .Values.securityContext.fsGroup }}
         runAsUser: {{ .Values.securityContext.runAsUser }}
       {{- end }}
-      {{- if and .Values.volumePermissions.enabled .Values.persistence.enabled }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+{{- end }}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.configOverrides }}
       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 }}
+      - name: config-copier
+        image: busybox
+        command: [ 'sh', '-c', 'cp /configmap-files/* /cassandra-configs/ && chown 999:999 /cassandra-configs/*']
+        volumeMounts:
+{{- range $key, $value := .Values.configOverrides }}
+        - name: cassandra-config-{{ $key | replace "." "-" | replace "_" "--" }}
+          mountPath: /configmap-files/{{ $key }}
+          subPath: {{ $key }}
+{{- end }}
+        - name: cassandra-configs
+          mountPath: /cassandra-configs/
+{{- 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 }}
+{{- if .Values.exporter.enabled }}
+      - name: cassandra-exporter
+        image: "{{ .Values.exporter.image.repo }}:{{ .Values.exporter.image.tag }}"
+        resources:
+{{ toYaml .Values.exporter.resources | indent 10 }}
+        env:
+          - name: CASSANDRA_EXPORTER_CONFIG_listenPort
+            value: {{ .Values.exporter.port | quote }}
+          - name: JVM_OPTS
+            value: {{ .Values.exporter.jvmOpts | quote }}
+        ports:
+          - name: metrics
+            containerPort: {{ .Values.exporter.port }}
+            protocol: TCP
+          - name: jmx
+            containerPort: 5555
+        livenessProbe:
+          tcpSocket:
+            port: {{ .Values.exporter.port }}
+        readinessProbe:
+          httpGet:
+            path: /metrics
+            port: {{ .Values.exporter.port }}
+          initialDelaySeconds: 20
+          timeoutSeconds: 45
+{{- end }}
+      - name: {{ include "common.fullname" . }}
+        image: "{{ .Values.image.repo }}:{{ .Values.image.tag }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
+{{- if .Values.commandOverrides }}
+        command: {{ .Values.commandOverrides }}
+{{- end }}
+{{- if .Values.argsOverrides }}
+        args: {{ .Values.argsOverrides }}
+{{- end }}
+        resources:
+{{ toYaml .Values.resources | indent 10 }}
+        env:
+        {{- $seed_size := default 1 .Values.config.seed_size | int -}}
+        {{- $global := . }}
+        - name: CASSANDRA_SEEDS
+          {{- if .Values.hostNetwork }}
+          value: {{ required "You must fill \".Values.config.seeds\" with list of Cassandra seeds when hostNetwork is set to true" .Values.config.seeds | quote }}
+          {{- else }}
+          value: "{{- range $i, $e := until $seed_size }}{{ include "common.fullname" $global }}-{{ $i }}.{{ include "common.fullname" $global }}.{{ $global.Values.global.nsPrefix }}.svc.{{ $global.Values.config.cluster_domain }}{{- if (lt ( add1 $i ) $seed_size ) }},{{- end }}{{- end }}"
           {{- 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
+        - name: MAX_HEAP_SIZE
+          value: {{ default "8192M" .Values.config.max_heap_size | quote }}
+        - name: HEAP_NEWSIZE
+          value: {{ default "200M" .Values.config.heap_new_size | quote }}
+        - name: CASSANDRA_ENDPOINT_SNITCH
+          value: {{ default "SimpleSnitch" .Values.config.endpoint_snitch | quote }}
+        - name: CASSANDRA_CLUSTER_NAME
+          value: {{ default "Cassandra" .Values.config.cluster_name | quote }}
+        - name: CASSANDRA_DC
+          value: {{ default "DC1" .Values.config.dc_name | quote }}
+        - name: CASSANDRA_RACK
+          value: {{ default "RAC1" .Values.config.rack_name | quote }}
+        - name: CASSANDRA_START_RPC
+          value: {{ default "false" .Values.config.start_rpc | quote }}
+        - name: POD_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        {{- range $key, $value := .Values.env }}
+        - name: {{ $key | quote }}
+          value: {{ $value | quote }}
         {{- end }}
+        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 }}
+        readinessProbe:
+          exec:
+            command: [ "/bin/sh", "-c", "nodetool status | grep -E \"^UN\\s+{{ .Values.readinessProbe.address }}\"" ]
+          initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+          successThreshold: {{ .Values.readinessProbe.successThreshold }}
+          failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+        ports:
+        - name: intra
+          containerPort: 7000
+        - name: tls
+          containerPort: 7001
+        - name: jmx
+          containerPort: 7199
+        - name: cql
+          containerPort: {{ default 9042 .Values.config.ports.cql }}
+        - name: thrift
+          containerPort: {{ default 9160 .Values.config.ports.thrift }}
+        {{- if .Values.config.ports.agent }}
+        - name: agent
+          containerPort: {{ .Values.config.ports.agent }}
+        {{- end }}
+        volumeMounts:
+        - name: data
+          mountPath: /var/lib/cassandra
+        {{- if .Values.configOverrides }}
+        - name: cassandra-configs
+          mountPath: /etc/cassandra
+        {{- end }}
+        {{- if not .Values.persistence.enabled }}
+        lifecycle:
+          preStop:
+            exec:
+              command: ["/bin/sh", "-c", "exec nodetool decommission"]
+        {{- end }}
+      terminationGracePeriodSeconds: {{ default 30 .Values.podSettings.terminationGracePeriodSeconds }}
       {{- if .Values.image.pullSecrets }}
       imagePullSecrets:
         - name: {{ .Values.image.pullSecrets }}
       {{- end }}
+{{- if or .Values.configOverrides (not .Values.persistence.enabled) }}
       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 }}
+{{- end }}
+{{- range $key, $value := .Values.configOverrides }}
+      - configMap:
+          name: cassandra
+        name: cassandra-config-{{ $key | replace "." "-" | replace "_" "--" }}
+{{- end }}
+{{- if .Values.configOverrides }}
+      - name: cassandra-configs
+        emptyDir: {}
+{{- end }}
 {{- if not .Values.persistence.enabled }}
-        - name: data
-          emptyDir: {}
+      - 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 }}
+  - metadata:
+      name: data
+      labels:
+        app: {{ include "common.name" . }}
+        release: {{ .Release.Name }}
+    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 }}

tip-wlan/charts/cassandra/templates/tests/test-cassandra-record-insert-del.yaml

@@ -11,12 +11,12 @@ metadata:
 spec:
   containers:
   - name: {{ include "common.name" . }}-test-cassandra-basic
-    image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
+    image: {{ .Values.image.repo }}:{{ .Values.image.tag }}
     command:
     - sh
     - -c
     - |
-      cqlsh --cqlshrc /bitnami/cassandra/conf/cqlshrc.tip-wlan -e \
+      cqlsh {{ include "common.fullname" . }}.{{ include "common.namespace" . }}.svc.{{ .Values.config.cluster_domain }} -e \
       "CREATE KEYSPACE MYDB WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 }; \
       use MYDB; \
       CREATE TABLE BOOKS (id int PRIMARY KEY, title text, year text); \
@@ -26,28 +26,5 @@ spec:
       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 }}

tip-wlan/charts/cassandra/values.yaml

@@ -1,114 +1,28 @@
-## 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/
-##
+## Cassandra image version
+## ref: https://hub.docker.com/r/library/cassandra/
 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
-  ##
+  repo: cassandra
+  tag: 3.11.6
   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
-  ## Set to true if you would like to see extra information on logs
-  ## It turns BASH debugging in minideb-extras-base
-  ##
-  debug: false
+  ## Specify ImagePullSecrets for Pods
+  ## ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
+  # pullSecrets: myregistrykey
 
-## 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
-##
+## Specify a service type
+## ref: http://kubernetes.io/docs/user-guide/services/
 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: {}
+  annotations: ""
 
-## Enable persistence using Persistent Volume Claims
-## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
+## Use an alternate scheduler, e.g. "stork".
+## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
 ##
+# schedulerName:
+
+## Persist data to a persistent volume
 persistence:
-  ## If true, use a Persistent Volume Claim, If false, use emptyDir
-  ##
   enabled: false
-  ## Persistent Volume Storage Class
+  ## cassandra data Persistent Volume Storage Class
   ## If defined, storageClassName: <storageClass>
   ## If set to "-", storageClassName: "", which disables dynamic provisioning
   ## If undefined (the default) or set to null, no storageClassName spec is
@@ -116,216 +30,207 @@ persistence:
   ##   GKE, AWS & OpenStack)
   ##
   storageClass: "-"
-  ## Persistent Volume Claim annotations
-  ##
-  annotations:
-  ## Persistent Volume Access Mode
-  ##
-  accessModes:
-    - ReadWriteOnce
-  ## Persistent Volume size
-  ##
+  accessMode: ReadWriteOnce
   size: 1Gi
 
-## Cassandra pods' resource requests and limits
+## Configure 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:
-  # 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: 2
+resources: {}
+  # requests:
   #   memory: 4Gi
-  requests: {}
   #   cpu: 2
+  # limits:
   #   memory: 4Gi
+  #   cpu: 2
 
-## 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
+## Change cassandra configuration parameters below:
+## ref: http://docs.datastax.com/en/cassandra/3.0/cassandra/configuration/configCassandra_yaml.html
+## Recommended max heap size is 1/2 of system memory
+## Recommended heap new size is 1/4 of max heap size
+## ref: http://docs.datastax.com/en/cassandra/3.0/cassandra/operations/opsTuneJVM.html
+config:
+  cluster_domain: cluster.local
+  cluster_name: cassandra
+  cluster_size: 3
+  seed_size: 2
+  num_tokens: 256
+  # If you want Cassandra to use this datacenter and rack name,
+  # you need to set endpoint_snitch to GossipingPropertyFileSnitch.
+  # Otherwise, these values are ignored and datacenter1 and rack1
+  # are used.
+  dc_name: DC1
+  rack_name: RAC1
+  endpoint_snitch: SimpleSnitch
+  max_heap_size: 2048M
+  heap_new_size: 512M
+  start_rpc: false
+  ports:
+    cql: 9042
+    thrift: 9160
+    # If a JVM Agent is in place
+    # agent: 61621
 
-## JVM Settings
-##
-jvm:
-  ## Extra JVM options
-  ##
-  extraOpts:
+## Cassandra config files overrides
+configOverrides: {}
 
-  ## Memory settings: These are calculated automatically
-  ## unless specified otherwise
-  ##
-  # maxHeapSize: 4G
-  # newHeapSize: 800M
+## Cassandra docker command overrides
+commandOverrides: []
 
-## Database credentials
-##
-dbUser:
-  user: cassandra
-  forcePassword: false
-  password: cassandra
-  # existingSecret:
+## Cassandra docker args overrides
+argsOverrides: []
 
-## ConfigMap with cql scripts. Useful for creating a keyspace
-## and pre-populating data
-##
-# initDBConfigMap:
+## Custom env variables.
+## ref: https://hub.docker.com/_/cassandra/
+env: {}
 
-## 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
-##
+## Liveness and Readiness probe values.
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/
 livenessProbe:
-  enabled: true
-  initialDelaySeconds: 60
+  initialDelaySeconds: 90
   periodSeconds: 30
   timeoutSeconds: 5
   successThreshold: 1
-  failureThreshold: 5
+  failureThreshold: 3
 readinessProbe:
-  enabled: true
-  initialDelaySeconds: 60
-  periodSeconds: 10
+  initialDelaySeconds: 90
+  periodSeconds: 30
   timeoutSeconds: 5
   successThreshold: 1
-  failureThreshold: 5
+  failureThreshold: 3
+  address: "${POD_IP}"
+
+## Configure node selector. Edit code below for adding selector to pods
+## ref: https://kubernetes.io/docs/user-guide/node-selection/
+# selector:
+  # nodeSelector:
+    # cloud.google.com/gke-nodepool: pool-db
 
 ## 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: {}
 
+## Additional pod-level settings
+podSettings:
+  # Change this to give pods more time to properly leave the cluster when not using persistent storage.
+  terminationGracePeriodSeconds: 30
+
+## Pod distruption budget
+podDisruptionBudget: {}
+  # maxUnavailable: 1
+  # minAvailable: 2
+
+podManagementPolicy: OrderedReady
+updateStrategy:
+  type: OnDelete
+
+## Pod Security Context
+securityContext:
+  enabled: false
+  fsGroup: 999
+  runAsUser: 999
+
 ## 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
+## Node tolerations for pod assignment
 ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
-##
 tolerations: []
 
-## StatefulSet settings
-##
-statefulset:
-  updateStrategy: OnDelete
-  # rollingUpdatePartition:
+rbac:
+  # Specifies whether RBAC resources should be created
+  create: true
 
-## Pod Security Context
-## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
-##
-securityContext:
-  enabled: true
-  fsGroup: 1001
-  runAsUser: 1001
+serviceAccount:
+  # Specifies whether a ServiceAccount should be created
+  create: true
+  # The name of the ServiceAccount to use.
+  # If not set and create is true, a name is generated using the fullname template
+  # name:
 
-## Container entrypoint and cmd (useful for using different images)
-##
-entrypoint: "/entrypoint.sh"
-cmd: "/run.sh"
+# Use host network for Cassandra pods
+# You must pass seed list into config.seeds property if set to true
+hostNetwork: false
 
-## 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.
+  ## 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:
+## Backup cronjob configuration
+## Ref: https://github.com/maorfr/cain
+backup:
   enabled: false
+
+  # Schedule to run jobs. Must be in cron time format
+  # Ref: https://crontab.guru/
+  schedule:
+  - keyspace: keyspace1
+    cron: "0 7 * * *"
+  - keyspace: keyspace2
+    cron: "30 7 * * *"
+
+  annotations:
+    # Example for authorization to AWS S3 using kube2iam
+    # Can also be done using environment variables
+    iam.amazonaws.com/role: cain
+
   image:
-    registry: docker.io
-    pullPolicy: IfNotPresent
-    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/
-  ##
+    repository: maorfr/cain
+    tag: 0.6.0
+
+  # Additional arguments for cain
+  # Ref: https://github.com/maorfr/cain#usage
+  extraArgs: []
+
+  # Add additional environment variables
+  env:
+  # Example environment variable required for AWS credentials chain
+  - name: AWS_REGION
+    value: us-east-1
+
   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
+    requests:
+      memory: 1Gi
+      cpu: 1
+    limits:
+      memory: 1Gi
+      cpu: 1
+
+  # Name of the secret containing the credentials of the service account used by GOOGLE_APPLICATION_CREDENTIALS, as a credentials.json file
+  # google:
+    # serviceAccountSecret:
+
+  # Destination to store the backup artifacts
+  # Supported cloud storage services: AWS S3, Minio S3, Azure Blob Storage, Google Cloud Storage
+  # Additional support can added. Visit this repository for details
+  # Ref: https://github.com/maorfr/skbn
+  destination: s3://bucket/cassandra
+
+## Cassandra exported configuration
+## ref: https://github.com/criteo/cassandra_exporter
+exporter:
+  enabled: false
+  serviceMonitor:
+    enabled: false
+    additionalLabels: {}
+      # prometheus: default
+  image:
+    repo: criteord/cassandra_exporter
+    tag: 2.0.2
+  port: 5556
+  jvmOpts: ""
+  resources: {}
+    # limits:
+    #   cpu: 1
+    #   memory: 1Gi
+    # requests:
+    #   cpu: 1
+    #   memory: 1Gi

tip-wlan/charts/common/Chart.yaml

@@ -1,11 +1,18 @@
-# Chart for deploying Common templates that are used by other charts
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed 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.
 
 apiVersion: v1
 description: Common templates for inclusion in other charts
 name: common
 version: 0.1.0
-
-dependencies:
-  - name: efs-provisioner
-    version: 1.0.0
-    condition: efs-provisioner.enabled

tip-wlan/charts/common/charts/efs-provisioner/Chart.yaml

@@ -1,7 +0,0 @@
-# Chart for deploying EFS Provisioner including it's storage class
-#
-
-apiVersion: v1
-description: EFS-Provisioner Chart to be used by other charts for file storage
-name: efs-provisioner
-version: 1.0.0

tip-wlan/charts/common/charts/efs-provisioner/templates/deployment.yaml

@@ -1,41 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "common.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.provisioner.replicaCount }}
-  strategy: 
-    type: {{ .Values.provisioner.strategyType }}
-  selector:
-    matchLabels:
-      {{- include "common.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      labels:
-        {{- include "common.selectorLabels" . | nindent 8 }}
-    spec:
-      serviceAccountName: {{ include "common.serviceAccountName" . }}
-      containers:
-        - name: {{ .Chart.Name }}
-          image: {{ .Values.provisioner.image.name }}:{{ .Values.provisioner.image.tag }}
-          imagePullPolicy: {{ .Values.global.pullPolicy }}
-          env:
-          - name: FILE_SYSTEM_ID
-            value: {{ .Values.provisioner.efsFileSystemId }}
-          - name: AWS_REGION
-            value: {{ .Values.provisioner.awsRegion }}
-          - name: DNS_NAME
-            value: {{ .Values.provisioner.dnsName }}
-          - name: PROVISIONER_NAME
-            value: {{ .Values.provisioner.provisionerName }}
-          volumeMounts:
-          - name: pv-volume
-            mountPath: /persistentvolumes
-      volumes:
-        - name: pv-volume
-          nfs:
-            server: {{ .Values.provisioner.efsDnsName }}
-            path: /

tip-wlan/charts/common/charts/efs-provisioner/templates/rbac.yaml

@@ -1,103 +0,0 @@
-kind: Role
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: {{ include "common.name" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  verbs:
-  - get
-  - list
-  - watch
-  - create
-  - update
-  - patch
----
-kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: {{ include "common.name" . }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "common.serviceAccountName" . }}-{{ .Values.provisioner.nameExtension}}
-    namespace: {{ include "common.namespace" . }}
-roleRef:
-  kind: Role
-  name: {{ include "common.name" . }}
-  apiGroup: rbac.authorization.k8s.io
----
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: {{ include "common.name" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumes
-  verbs:
-  - get
-  - list
-  - watch
-  - create
-  - delete
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumeclaims
-  verbs:
-  - get
-  - list
-  - watch
-  - update
-- apiGroups:
-  - "storage.k8s.io"
-  resources:
-  - storageclasses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
-  - update
-  - patch
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  verbs:
-  - get
-  - list
-  - watch
-  - create
-  - update
-  - patch
----
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: {{ include "common.name" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-subjects:
-- kind: ServiceAccount
-  name: {{ include "common.serviceAccountName" . }}
-  namespace: {{ include "common.namespace" . }}
-roleRef:
-  kind: ClusterRole
-  name: {{ include "common.name" . }}
-  apiGroup: rbac.authorization.k8s.io

tip-wlan/charts/common/charts/efs-provisioner/templates/serviceaccount.yaml

@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "common.serviceAccountName" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}

tip-wlan/charts/common/charts/efs-provisioner/templates/storage-class.yaml

@@ -1,6 +0,0 @@
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: {{ .Values.provisioner.storageClass }}
-provisioner: {{ .Values.provisioner.provisionerName }}
-allowVolumeExpansion: true

tip-wlan/charts/common/charts/efs-provisioner/values.yaml

@@ -1,28 +0,0 @@
-#################################################################
-# Global configuration default values that can be inherited by
-# all subcharts.
-#################################################################
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: efs-provisioner
-
-## EFS Provisioner related properties
-provisioner:
-  nameExtension: efs-provisioner
-  replicaCount: 1
-  strategyType: Recreate
-  image:
-    name: quay.io/external_storage/efs-provisioner
-    tag: latest
-  efsFileSystemId: fs-8a3fa867
-  awsRegion: ca-central-1
-  dnsName: ""
-  provisionerName: shared-provisioner
-  efsDnsName: fs-8a3fa867.efs.ca-central-1.amazonaws.com
-  storageClass: aws-efs

tip-wlan/charts/common/templates/_env.tpl

@@ -10,8 +10,32 @@
 {{- end -}}
 
 {{- define "common.env" -}}
-- name: {{ .Values.env.ssc_url }}
+- name: {{ .Values.env.url.alarm }}
   value: "{{ .Values.env.protocol }}://{{ .Release.Name }}-{{ .Values.env.ssc.service }}:{{ .Values.env.ssc.port}}"
-- name: {{ .Values.env.prov_url }}
+- name: {{ .Values.env.url.client }}
+  value: "{{ .Values.env.protocol }}://{{ .Release.Name }}-{{ .Values.env.ssc.service }}:{{ .Values.env.ssc.port}}"
+- name: {{ .Values.env.url.cloudEventDispatcher }}
+  value: "{{ .Values.env.protocol }}://{{ .Release.Name }}-{{ .Values.env.ssc.service }}:{{ .Values.env.ssc.port}}"
+- name: {{ .Values.env.url.customer }}
   value: "{{ .Values.env.protocol }}://{{ .Release.Name }}-{{ .Values.env.prov.service }}:{{ .Values.env.prov.port}}"
+- name: {{ .Values.env.url.firmware }}
+  value: "{{ .Values.env.protocol }}://{{ .Release.Name }}-{{ .Values.env.prov.service }}:{{ .Values.env.prov.port}}"
+- name: {{ .Values.env.url.location }}
+  value: "{{ .Values.env.protocol }}://{{ .Release.Name }}-{{ .Values.env.prov.service }}:{{ .Values.env.prov.port}}"
+- name: {{ .Values.env.url.profile }}
+  value: "{{ .Values.env.protocol }}://{{ .Release.Name }}-{{ .Values.env.ssc.service }}:{{ .Values.env.ssc.port}}"
+- name: {{ .Values.env.url.serviceMetrics }}
+  value: "{{ .Values.env.protocol }}://{{ .Release.Name }}-{{ .Values.env.prov.service }}:{{ .Values.env.prov.port}}"
+- name: {{ .Values.env.url.equipment }}
+  value: "{{ .Values.env.protocol }}://{{ .Release.Name }}-{{ .Values.env.prov.service }}:{{ .Values.env.prov.port}}"
+- name: {{ .Values.env.url.manufacturer }}
+  value: "{{ .Values.env.protocol }}://{{ .Release.Name }}-{{ .Values.env.prov.service }}:{{ .Values.env.prov.port}}"
+- name: {{ .Values.env.url.portalUser }}
+  value: "{{ .Values.env.protocol }}://{{ .Release.Name }}-{{ .Values.env.prov.service }}:{{ .Values.env.prov.port}}"
+- name: {{ .Values.env.url.routing }}
+  value: "{{ .Values.env.protocol }}://{{ .Release.Name }}-{{ .Values.env.ssc.service }}:{{ .Values.env.ssc.port}}"
+- name: {{ .Values.env.url.status }}
+  value: "{{ .Values.env.protocol }}://{{ .Release.Name }}-{{ .Values.env.ssc.service }}:{{ .Values.env.ssc.port}}"
+- name: {{ .Values.env.url.systemEvent }}
+  value: "{{ .Values.env.protocol }}://{{ .Release.Name }}-{{ .Values.env.ssc.service }}:{{ .Values.env.ssc.port}}"
 {{- end -}}

tip-wlan/charts/common/templates/_ports.tpl

@@ -1,28 +0,0 @@
-{{/*
-    This template will be used to iterate through the debug-ports and generate
-    debug-ports mapping
-  */}}
-
-{{- define "container.dev.debugport" -}}
-  {{- if .Values.debug.enabled }}
-  {{- range $index, $portid := .Values.debugPorts }}
-  - name: debugport-{{ $index }}
-    containerPort: {{ $portid }}
-    protocol: TCP
-  {{- end }}
-  {{- end }}
-{{- end -}}
-
-{{- define "service.dev.debugport" -}}
-  {{- if .Values.debug.enabled }}
-  {{- range $index, $portid := .Values.debugPorts }}
-  - port: {{ $portid }}
-    targetPort: {{ $portid }}
-    protocol: TCP
-    name: debugport-{{ $index }}
-    {{- if eq $.Values.service.type "NodePort" }}
-    nodePort: {{ $portid }}
-    {{- end }}   
-  {{- end }}
-  {{- end }}
-{{- end -}}

tip-wlan/charts/common/templates/_svc.tpl

@@ -18,27 +18,6 @@ else use user-provided URL
 {{- end -}}
 {{- end -}}  
 
-{{/*
-  Resolve the Kafka service-name to apply to a chart. 
-*/}}
-{{- define "kafka.service" -}}
-{{- printf "%s-%s" .Release.Name .Values.kafka.url | trunc 63 -}}
-{{- end -}}
-
-{{/*
-  Resolve the Cassandra service-name to apply to a chart. 
-*/}}
-{{- define "cassandra.service" -}}
-{{- printf "%s-%s" .Release.Name .Values.cassandra.url | trunc 63 -}}
-{{- end -}}
-
-{{/*
-  Resolve the MQTT service-name to apply to a chart. 
-*/}}
-{{- define "mqtt.service" -}}
-{{- printf "%s-%s" .Release.Name .Values.mqtt.url | trunc 63 -}}
-{{- end -}}
-
 {{/*
   Resolve the integratedcloudcomponent service-name to apply to a chart. 
 */}}
@@ -58,26 +37,4 @@ else use user-provided URL
 */}}
 {{- define "ssc.service" -}}
   {{- printf "%s-%s:%.f" .Release.Name .Values.ssc.url .Values.ssc.port | trunc 63 -}}
-{{- end -}}
-
-{{/*
-  Resolve the Opensync-gw service-name to apply to a chart. 
-*/}}
-{{- define "opensyncgw.service" -}}
-  {{- 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 
-*/}}
-{{- define "portal.sharedPvc.name" -}}
-{{- printf "%s-%s-%s-%.f" .Values.portal.sharedPvc.name .Release.Name .Values.portal.url .Values.portal.sharedPvc.ordinal | trunc 63 -}}
-{{- end -}}
-
-{{/*
-  Resolve the filestore-directory name that's would mounted to 2 charts - Portal and Opensync-gw 
-*/}}
-{{- define "filestore.dir.name" -}}
-  {{- printf "%s" .Values.filestore.internal | trunc 63 -}}
 {{- end -}}

tip-wlan/charts/common/values.yaml

@@ -1,8 +1,4 @@
 #################################################################
 # Global configuration default values that can be inherited by
 # all subcharts.
-#################################################################
-
-# Enabling common components
-efs-provisioner:
-  enabled: false
+#################################################################

tip-wlan/charts/kafka/resources/config/certs/README.md

@@ -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

tip-wlan/charts/kafka/templates/configmap.yaml

@@ -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=tip-wlan-kafka-headless:9093

tip-wlan/charts/kafka/templates/secret.yaml

@@ -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 }}

tip-wlan/charts/kafka/templates/service-brokers.yaml

@@ -8,7 +8,7 @@ metadata:
 spec:
   ports:
   - name: broker
-    port: {{ .Values.headless.sslPort }}
+    port: 9092
     targetPort: kafka
   selector:
   {{- include "kafka.broker.matchLabels" . | nindent 4 }}

tip-wlan/charts/kafka/templates/service-headless.yaml

@@ -12,15 +12,10 @@ metadata:
 {{- 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 }}
+    port: {{ .Values.headless.port }}
+{{- if .Values.headless.targetPort }}
+    targetPort: {{ .Values.headless.targetPort }}
 {{- end }}
   clusterIP: None
   selector:

tip-wlan/charts/kafka/templates/statefulset.yaml

@@ -91,7 +91,7 @@ spec:
           successThreshold: {{ .Values.readinessProbe.successThreshold }}
           failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
         ports:
-        - containerPort: {{ .Values.headless.sslPort }}
+        - containerPort: 9092
           name: kafka
         {{- if .Values.external.enabled }}
           {{- $replicas := .Values.replicas | int }}
@@ -170,24 +170,6 @@ spec:
           {{- 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 }}
@@ -207,12 +189,6 @@ spec:
           {{- 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: {}

tip-wlan/charts/kafka/templates/tests/test-topic-create-produce-consume.yaml

@@ -14,47 +14,17 @@ spec:
     - 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 #####"
+      kafka-topics --zookeeper {{ include "zookeeper.url" . }} --topic helm-test-topic-create-consume-produce --create --partitions 1 --replication-factor 1 --if-not-exists && \
       # Create a message
-      MESSAGE="`date -u`"
+      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 #####"
+      echo "$MESSAGE" | kafka-console-producer --broker-list {{ include "common.fullname" . }}:9092 --topic helm-test-topic-create-consume-produce && \
       # 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
+      kafka-console-consumer --bootstrap-server {{ include "common.fullname" . }}-headless:9092 --topic helm-test-topic-create-consume-produce --from-beginning --timeout-ms 2000 --max-messages 1 | grep "$MESSAGE"
       # 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 }}

tip-wlan/charts/kafka/values.yaml

@@ -135,7 +135,6 @@ headless:
   # annotations:
   # targetPort:
   port: 9092
-  sslPort: 9093
 
 ## External access.
 ##
@@ -183,22 +182,6 @@ configurationOverrides:
   # "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:
@@ -286,9 +269,6 @@ topics:
   - name: system_events
     partitions: 1
     replicationFactor: 1
-  - name: customer_events
-    partitions: 1
-    replicationFactor: 1
   # - name: myNewTopicWithConfig
   #   partitions: 8
   #   replicationFactor: 3
@@ -353,8 +333,3 @@ zookeeper:
   #       labelSelector:
   #         matchLabels:
   #           release: zookeeper
-
-creds:
-  sslTruststorePassword: DUMMY_PASSWORD
-  sslKeystorePassword: DUMMY_PASSWORD
-  sslKeyPassword: DUMMY_PASSWORD

tip-wlan/charts/nginx-ingress-controller/templates/controller-configmap.yaml

@@ -6,5 +6,4 @@ metadata:
   labels:
     {{- include "common.labels" . | nindent 4 }}  
 data:
-    external-status-address: {{ .Values.controller.config.externalStatusAddress }}
-    client-max-body-size: {{ .Values.controller.config.clientMaxBodySize }}
+    external-status-address: {{ .Values.controller.config.externalStatusAddress }}

tip-wlan/charts/nginx-ingress-controller/templates/controller-deployment.yaml

@@ -56,7 +56,7 @@ spec:
           containerPort: 80
         - name: https
           containerPort: 443
-{{ if and (.Values.controller.customPorts) (not .Values.byPassNginxForTcpConnections.enabled )}}
+{{ if .Values.controller.customPorts }}
 {{ toYaml .Values.controller.customPorts | indent 8 }}
 {{ end }}
 {{- if .Values.prometheus.create }}
@@ -127,7 +127,5 @@ spec:
           - -prometheus-metrics-listen-port={{ .Values.prometheus.port }}
           - -enable-custom-resources={{ .Values.controller.enableCustomResources }}
           - -enable-tls-passthrough={{ .Values.controller.enableTLSPassthrough }}
-    {{- if not .Values.byPassNginxForTcpConnections.enabled }}
           - -global-configuration=$(POD_NAMESPACE)/{{ include "common.name" . }}-global-configuration
-    {{- end}}
 {{- end }}

tip-wlan/charts/nginx-ingress-controller/templates/controller-global-configuration.yaml

@@ -1,4 +1,3 @@
-{{- if not .Values.byPassNginxForTcpConnections.enabled -}}
 apiVersion: k8s.nginx.org/v1alpha1
 kind: GlobalConfiguration 
 metadata:
@@ -14,5 +13,4 @@ spec:
     protocol: TCP
   - name: opensync-mqtt-port-listener
     port: 1883
-    protocol: TCP
-{{- end -}}
+    protocol: TCP

tip-wlan/charts/nginx-ingress-controller/templates/controller-service.yaml

@@ -27,7 +27,7 @@ spec:
 {{- end }}
   type: {{ .Values.controller.service.type }}
   ports:
-{{- if and (.Values.controller.service.customPorts) (not .Values.byPassNginxForTcpConnections.enabled )}}
+{{- if .Values.controller.service.customPorts }}
 {{ toYaml .Values.controller.service.customPorts | indent 2 }}
 {{ end }}
 {{- if .Values.controller.service.httpPort.enable }}

tip-wlan/charts/nginx-ingress-controller/values.yaml

@@ -53,9 +53,6 @@ controller:
     ## External IP Address
     externalStatusAddress: "192.168.56.101"
 
-    ## Max message size coming from the Client
-    clientMaxBodySize: "20m"
-
   ## It is recommended to use your own TLS certificates and keys
   defaultTLS:
     ## The base64-encoded TLS certificate for the default HTTPS server. If not specified, a pre-generated self-signed certificate is used.
@@ -272,13 +269,6 @@ rbac:
   ## Configures RBAC.
   create: true
 
-  ## This property will prevent exposing TCP ports for passthrough connections
-  ## Instead we are opening up these services as NodePorts
-  ## We were seeing issues with AP <-- --> MQTT connecitivity when using NGINX 
-  ## as passthrough for TCP Connections
-byPassNginxForTcpConnections:
-  enabled: true
-
 prometheus:
   ## Expose NGINX or NGINX Plus metrics in the Prometheus format.
   create: false

tip-wlan/charts/opensync-gw-cloud/resources/config/logback.xml

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- For assistance related to logback-translator or configuration  -->
-<!-- files in general, please contact the logback user mailing list -->
-<!-- at http://www.qos.ch/mailman/listinfo/logback-user             -->
-<!--                                                                -->
-<!-- For professional support please see                            -->
-<!--    http://www.qos.ch/shop/products/professionalSupport         -->
-<!--                                                                -->
-<configuration>
-  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <appender name="mqttDataFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>/app/logs/mqttData.log</file>
-    <append>true</append>
-    <encoder>
-      <pattern>%date %msg%n</pattern>
-    </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>/app/logs/mqttData.%i.log.gz</fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>3</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>20MB</maxFileSize>
-    </triggeringPolicy>
-  </appender>
-  
-  <appender name="logfile" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>/app/logs/opensyncgw.log</file>
-    <append>true</append>
-    <encoder>
-      <pattern>%date %level [%thread] %logger{36} [%file:%line] %msg%n</pattern>
-    </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>/app/logs/opensyncgw.%i.log.gz</fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>3</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>20MB</maxFileSize>
-    </triggeringPolicy>
-  </appender>
-      
-  <!--
-  details: http://logback.qos.ch/manual/configuration.html#auto_configuration
-   
-  runtime configuration, if need to override the defaults: 
-  	-Dlogback.configurationFile=/path/to/logback.xml
-  
-  for log configuration debugging - use 
-  	-Dlogback.statusListenerClass=ch.qos.logback.core.status.OnConsoleStatusListener
-  
-  log levels:
-	OFF ERROR WARN INFO DEBUG TRACE  
-   -->
-  <logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
-  <logger name="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping" level="INFO"/>
-  <logger name="org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer" level="INFO"/>
-  
-  <logger name="com.telecominfraproject.wlan" level="DEBUG"/>
-  <logger name="com.netflix.servo.tag.aws.AwsInjectableTag" level="OFF"/>
-  <logger name="com.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/>
-  <logger name="com.vmware.ovsdb.netty.OvsdbConnectionHandler" level="ERROR"/>
-
-  <logger name="MQTT_DATA" level="DEBUG" additivity="false">
-    <appender-ref ref="mqttDataFile"/>
-  </logger>
-
-  <root level="WARN">
-    <appender-ref ref="logfile"/>
-    <appender-ref ref="stdout"/>
-  </root>
-
-</configuration>

tip-wlan/charts/opensync-gw-cloud/templates/configmap.yaml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-log-config
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/logback.xml").AsConfig . | indent 2 }}

tip-wlan/charts/opensync-gw-cloud/templates/deployment.yaml

@@ -1,9 +1,7 @@
 {{- $icc := include "integratedcloudcomponent.service" . -}}
 {{- $prov := include "prov.service" . -}}
 {{- $ssc := include "ssc.service" . -}}
-{{- $mqtt := include "mqtt.service" . -}}
 {{- $ns := include "common.namespace" . -}}
-{{- $file_store_path := include "filestore.dir.name" . -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -27,13 +25,6 @@ spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       initContainers:
-        - name: wait-for-services
-          image: opsfleet/depends-on:latest
-          args:
-          - "-service={{ .Release.Name }}-opensync-mqtt-broker"
-          - "-service={{ .Release.Name }}-wlan-prov-service"
-          - "-service={{ .Release.Name }}-wlan-ssc-service"
-          - -check_interval=5
       {{- if .Values.global.integratedDeployment }}
         - name: {{ include "common.name" . }}-readiness-int-cloud
           image: alpine
@@ -42,6 +33,7 @@ spec:
           - sh
           - -c
           - |
+            echo "151.101.112.249 dl-cdn.alpinelinux.org" >> /etc/hosts
             apk add curl
             url=https://{{ $icc }}/ping
             counter=0
@@ -55,22 +47,73 @@ spec:
               echo Http Response code of ping request = $status
             done
             if [ $status -eq 200 ]
+            then
+              echo ${url} service is ready!
+            else
+              echo ${url} service failed to respond after 50 secs
+              exit 1
+            fi 
+      {{- else }}
+        - name: {{ include "common.name" . }}-readiness-prov
+          image: alpine
+          imagePullPolicy: {{ .Values.global.pullPolicy }}
+          command:
+          - sh
+          - -c
+          - |
+            echo "151.101.112.249 dl-cdn.alpinelinux.org" >> /etc/hosts
+            apk add curl
+            url=https://{{ $prov }}/ping
+            counter=0
+            status=$(curl --insecure --head --location --connect-timeout 5 --write-out %{http_code} --silent --output /dev/null ${url});
+            while [ $counter -lt 10 ] && [ $status -ne 200 ] 
+            do
+              echo ${url} service isnt ready. Tried $counter times
+              sleep 5
+              counter=`expr $counter + 1`
+              status=$(curl --insecure --head --location --connect-timeout 5 --write-out %{http_code} --silent --output /dev/null ${url});
+              echo Http Response code of ping request = $status
+            done
+            if [ $status -eq 200 ]
             then
               echo ${url} service is ready!
             else
               echo ${url} service failed to respond after 50 secs
               exit 1
             fi
+        - name: {{ include "common.name" . }}-readiness-ssc
+          image: alpine
+          imagePullPolicy: {{ .Values.global.pullPolicy }}
+          command:
+          - sh
+          - -c
+          - |
+            echo "151.101.112.249 dl-cdn.alpinelinux.org" >> /etc/hosts
+            apk add curl
+            url=https://{{ $ssc }}/ping
+            counter=0
+            status=$(curl --insecure --head --location --connect-timeout 5 --write-out %{http_code} --silent --output /dev/null ${url});
+            while [ $counter -lt 10 ] && [ $status -ne 200 ] 
+            do
+              echo ${url} service isnt ready. Tried $counter times
+              sleep 5
+              counter=`expr $counter + 1`
+              status=$(curl --insecure --head --location --connect-timeout 5 --write-out %{http_code} --silent --output /dev/null ${url});
+              echo Http Response code of ping request = $status
+            done
+            if [ $status -eq 200 ]
+            then
+              echo ${url} service is ready!
+            else
+              echo ${url} service failed to respond after 50 secs
+              exit 1
+            fi        
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          {{- if .Values.global.testingEnabled }}
-          image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}-{{.Values.global.testingTimestamp}}
-          {{- else }}
           image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
-          {{- end }}
           imagePullPolicy: {{ .Values.global.pullPolicy }}
           {{- if .Values.probes.enabled }}
           livenessProbe:
@@ -89,44 +132,7 @@ spec:
             failureThreshold: {{ .Values.probes.readinessProbe.failureThreshold }}
             periodSeconds: {{ .Values.probes.readinessProbe.periodSeconds }}
             successThreshold: {{ .Values.probes.readinessProbe.successThreshold }}
-          {{- end }}
-          env:
-            {{- include "common.env" . | nindent 12 }}
-            - name: OVSDB_MANAGER
-              value: {{ .Values.externalhost.address.ovsdb }}
-            - name: OVSDB_EXTERNAL_PORT
-              value: "{{ .Values.externalhost.ports.ovsdb }}"
-            - name: OVSDB_MANAGER_IP
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-            - name: MQTT_SERVER_INTERNAL
-              value: {{ .Release.Name }}-{{ .Values.mqtt.url }}
-            - name: MQTT_SERVER_EXTERNAL
-              value: {{ .Values.externalhost.address.mqtt }}
-            - name: MQTT_BROKER_EXTERNAL_PORT
-              value: "{{ .Values.externalhost.ports.mqtt }}"
-            {{- if .Values.global.integratedDeployment }}
-            - name: INTEGRATED_SERVER
-              value: {{ .Release.Name }}-{{ .Values.integratedcloudcomponent.url }}
-            {{- else }}
-            - name: PROV_SERVER
-              value: {{ .Release.Name }}-{{ .Values.prov.url }}
-            - name: SSC_SERVER
-              value: {{ .Release.Name }}-{{ .Values.ssc.url }}
-            {{- end }}
-            - name: FILE_STORE_DIRECTORY_INTERNAL
-              value: {{ $file_store_path }}
-            - name: FILE_STORE_URL
-              value: {{ .Values.filestore.url }}
-            - name: DEFAULT_LAN_NAME
-              value: {{ .Values.ethernetType.lanName }}
-            - name: DEFAULT_LAN_TYPE
-              value: {{ .Values.ethernetType.lanType }}
-            - name: DEFAULT_WAN_TYPE
-              value: {{ .Values.ethernetType.wanType }}
-            - name: DEFAULT_WAN_NAME
-              value: {{ .Values.ethernetType.wanName }}
+          {{- end }}       
           volumeMounts:
           - mountPath: /opt/tip-wlan/certs/client_keystore.jks
             name: certificates
@@ -143,11 +149,6 @@ spec:
           - mountPath: /opt/tip-wlan/certs/ssl.properties
             name: certificates
             subPath: ssl.properties
-          - mountPath: /app/opensync/logback.xml
-            name: logback-config
-            subPath: logback.xml
-          - mountPath: {{ $file_store_path }}
-            name: file-store-data
           ports:
             - name: {{ .Values.service.name1 }}
               containerPort: {{ .Values.service.port1 }}
@@ -155,17 +156,6 @@ spec:
             - name: {{ .Values.service.name2 }}
               containerPort: {{ .Values.service.port2 }}
               protocol: TCP
-            - name: {{ .Values.service.name3 }}
-              containerPort: {{ .Values.service.port3 }}
-              protocol: TCP
-            - name: {{ .Values.service.name4 }}
-              containerPort: {{ .Values.service.port4 }}
-              protocol: TCP
-            {{- if .Values.debug.enabled }}
-            - name: {{ .Values.service.name5 }}
-              containerPort: {{ .Values.service.port5 }}
-              protocol: TCP
-            {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
@@ -185,13 +175,3 @@ spec:
       - name: certificates
         secret:
           secretName: {{ include "common.fullname" . }}-certs
-      - name: logback-config
-        configMap:
-            name: {{ include "common.fullname" . }}-log-config
-      - name: file-store-data
-      {{- if .Values.persistence.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ include "portal.sharedPvc.name" . }}
-      {{- else }}
-        emptyDir: {}
-      {{- end }}

tip-wlan/charts/opensync-gw-cloud/templates/rbac.yaml

@@ -1,24 +0,0 @@
----
-kind: Role
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: {{ include "common.fullname" . }}-depends-on
-  namespace: {{ include "common.namespace" . }}
-rules:
-- apiGroups: ["batch", "apps", ""]
-  resources: ["pods", "services", "jobs"]
-  verbs: ["get", "list", "watch"]
-
----
-kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: {{ include "common.fullname" . }}-depends-on
-  namespace: {{ include "common.namespace" . }}
-subjects:
-- kind: ServiceAccount
-  name: {{ include "common.serviceAccountName" . }}
-roleRef:
-  kind: Role
-  name: {{ include "common.fullname" . }}-depends-on
-  apiGroup: rbac.authorization.k8s.io

tip-wlan/charts/opensync-gw-cloud/templates/service.yaml

@@ -5,10 +5,6 @@ metadata:
   namespace: {{ include "common.namespace" . }}
   labels:
     {{- include "common.labels" . | nindent 4 }}
-  {{- with .Values.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -16,38 +12,9 @@ spec:
       targetPort: {{ .Values.service.port1 }}
       protocol: TCP
       name: {{ .Values.service.name1 }}
-      {{- if and .Values.service.nodePortStatic (eq .Values.service.type "NodePort") }}
-      nodePort: {{ .Values.global.nodePortPrefix }}{{ .Values.service.nodePort1 }}
-      {{- end }}
     - port: {{ .Values.service.port2 }}
       targetPort: {{ .Values.service.port2 }}
       protocol: TCP
       name: {{ .Values.service.name2 }}
-      {{- if and .Values.service.nodePortStatic (eq .Values.service.type "NodePort") }}
-      nodePort: {{ .Values.global.nodePortPrefix }}{{ .Values.service.nodePort2 }}
-      {{- end }}
-    - port: {{ .Values.service.port3 }}
-      targetPort: {{ .Values.service.port3 }}
-      protocol: TCP
-      name: {{ .Values.service.name3 }}
-      {{- if and .Values.service.nodePortStatic (eq .Values.service.type "NodePort") }}
-      nodePort: {{ .Values.global.nodePortPrefix }}{{ .Values.service.nodePort3 }}
-      {{- end }}
-    - port: {{ .Values.service.port4 }}
-      targetPort: {{ .Values.service.port4 }}
-      protocol: TCP
-      name: {{ .Values.service.name4 }}
-      {{- if and .Values.service.nodePortStatic (eq .Values.service.type "NodePort") }}
-      nodePort: {{ .Values.global.nodePortPrefix }}{{ .Values.service.nodePort4 }}
-      {{- end }}
-    {{- if .Values.debug.enabled }}
-    - port: {{ .Values.service.port5 }}
-      targetPort: {{ .Values.service.port5 }}
-      protocol: TCP
-      name: {{ .Values.service.name5 }}
-      {{- if and .Values.service.nodePortStatic (eq .Values.service.type "NodePort") }}
-      nodePort: {{ .Values.global.nodePortPrefix }}{{ .Values.service.nodePort5 }}
-      {{- end }}
-    {{- end }}
   selector:
     {{- include "common.selectorLabels" . | nindent 4 }}

tip-wlan/charts/opensync-gw-cloud/values.yaml

@@ -56,43 +56,12 @@ probes:
 # Enable/Disable Helm tests
 testsEnabled: false
 
-# Enable/Disable Remote debugging
-debug: 
-  enabled: false
-
 service:
-  type: NodePort
+  type: ClusterIP
   port1: 6640
-  nodePort1: 29
   name1: controller
   port2: 6643
   name2: redirector
-  nodePort2: 30
-  port3: 9096
-  name3: server
-  nodePort3: 27
-  port4: 9097
-  name4: internal
-  nodePort4: 28
-  port5: 5005
-  name5: debug
-  nodePort5: 26
-  annotations: {}
-  nodePortStatic: true ## if true, nodePort ports are statically defined effectively prohibiting multiple deployments on the same cluster; if false, nodePort ports are chosen dynamically by k8s
-
-persistence:
-  enabled: false
-  ## A manually managed Persistent Volume and Claim
-  ## Requires persistence.enabled: true
-
-# the filestore internal: location of the folder where UI files will be stored
-# on the PV
-# the filestore url: externally reachable URL i.e.; reachable from AP, where it 
-# can download the files from. Override this value (url) to the configured
-# HTTP server in your system 
-filestore:
-  internal: "/tmp/filestore"
-  url: DUMMY_FILESTORE_HTTPS_URL
 
 integratedcloudcomponent:
   url: wlan-integrated-cloud-component-service
@@ -106,37 +75,6 @@ ssc:
   url: wlan-ssc-service
   port: 9032
 
-mqtt:
-  url: opensync-mqtt-broker
-
-portal:
-  url: wlan-portal-service
-  sharedPvc:
-      name: file-store-data
-      ordinal: 0
-
-
-# These are the address and ports for the externalhost
-# This is important for ovsdb and mqtt since 
-# that's what AP sees. Please make sure to override
-# them in dev override file for your respective environments.
-# the default values below would be used if not overriden
-externalhost:
-  address:
-    ovsdb: opensync-gw-cloud
-    mqtt: opensync-mqtt-broker
-  ports:
-    ovsdb: 6640
-    mqtt: 1883
-
-
-
-ethernetType:
-  lanName: "lan"
-  lanType: "bridge"
-  wanType: "bridge"
-  wanName: "wan"
-
 ingress:
   enabled: false
   annotations: {}
@@ -167,14 +105,3 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
-
-env:
-  protocol: https
-  ssc_url: SSC_RELEASE_URL
-  prov_url: PROV_RELEASE_URL
-  ssc:
-    service: wlan-ssc-service
-    port: 9031
-  prov:
-    service: wlan-prov-service
-    port: 9091

tip-wlan/charts/opensync-gw-static/resources/config/logback.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- For assistance related to logback-translator or configuration  -->
-<!-- files in general, please contact the logback user mailing list -->
-<!-- at http://www.qos.ch/mailman/listinfo/logback-user             -->
-<!--                                                                -->
-<!-- For professional support please see                            -->
-<!--    http://www.qos.ch/shop/products/professionalSupport         -->
-<!--                                                                -->
-<configuration>
-  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-  
-  <!-- 
-  <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-    <file>myApp.log</file>
-
-    <encoder>
-      <pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
-    </encoder>
-  </appender>
-  -->
-  
-  <appender name="logfile" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>/app/logs/opensyncgw.log</file>
-    <append>true</append>
-    <encoder>
-      <pattern>%date %level [%thread] %logger{36} [%file:%line] %msg%n</pattern>
-    </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>/app/logs/opensyncgw.%i.log.gz</fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>3</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>20MB</maxFileSize>
-    </triggeringPolicy>
-  </appender>
-      
-  <!--
-  details: http://logback.qos.ch/manual/configuration.html#auto_configuration
-   
-  runtime configuration, if need to override the defaults: 
-  	-Dlogback.configurationFile=/path/to/logback.xml
-  
-  for log configuration debugging - use 
-  	-Dlogback.statusListenerClass=ch.qos.logback.core.status.OnConsoleStatusListener
-  
-  log levels:
-	OFF ERROR WARN INFO DEBUG TRACE  
-   -->
-  <logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
-  <logger name="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping" level="INFO"/>
-  <logger name="org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer" level="INFO"/>
-  
-  <logger name="com.telecominfraproject.wlan" level="DEBUG"/>
-  <logger name="com.netflix.servo.tag.aws.AwsInjectableTag" level="OFF"/>
-  <logger name="com.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/>
-  <logger name="com.vmware.ovsdb.netty.OvsdbConnectionHandler" level="ERROR"/>
-  
-  <logger name="MQTT_DATA" level="DEBUG"/>
-
-  <!--   
-  <logger name="org.springframework.security.web.authentication.preauth" level="DEBUG"/>
-   -->
-   
-  <root level="WARN">
-    <appender-ref ref="stdout"/>
-    <appender-ref ref="logfile"/>
-  </root>
-  
-</configuration>

tip-wlan/charts/opensync-gw-static/templates/configmap.yaml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-log-config
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/logback.xml").AsConfig . | indent 2 }}

tip-wlan/charts/opensync-gw-static/templates/deployment.yaml

@@ -24,11 +24,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          {{- if .Values.global.testingEnabled }}
-          image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}-{{.Values.global.testingTimestamp}}
-          {{- else }}
           image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
-          {{- end }}
           imagePullPolicy: {{ .Values.global.pullPolicy }}
           {{- if .Values.probes.enabled }}
           livenessProbe:
@@ -64,9 +60,6 @@ spec:
           - mountPath: /opt/tip-wlan/certs/ssl.properties
             name: certificates
             subPath: ssl.properties
-          - mountPath: /app/opensync/logback.xml
-            name: logback-config
-            subPath: logback.xml
           ports:
             - name: {{ .Values.service.name1 }}
               containerPort: {{ .Values.service.port1 }}
@@ -93,6 +86,3 @@ spec:
       - name: certificates
         secret:
           secretName: {{ include "common.fullname" . }}-certs
-      - name: logback-config
-        configMap:
-            name: {{ include "common.fullname" . }}-log-config

tip-wlan/charts/opensync-mqtt-broker/templates/service.yaml

@@ -5,10 +5,6 @@ metadata:
   namespace: {{ include "common.namespace" . }}
   labels:
     {{- include "common.labels" . | nindent 4 }}
-  {{- with .Values.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -16,15 +12,9 @@ spec:
       targetPort: {{ .Values.service.port1 }}
       protocol: TCP
       name: {{ .Values.service.name1 }}
-      {{- if and .Values.service.nodePortStatic (eq .Values.service.type "NodePort") }}
-      nodePort: {{ .Values.global.nodePortPrefix }}{{ .Values.service.nodePort1 }}
-      {{- end }}
     - port: {{ .Values.service.port2 }}
       targetPort: {{ .Values.service.port2 }}
       protocol: TCP
       name: {{ .Values.service.name2 }}
-      {{- if and .Values.service.nodePortStatic (eq .Values.service.type "NodePort") }}
-      nodePort: {{ .Values.global.nodePortPrefix }}{{ .Values.service.nodePort2 }}
-      {{- end }}
   selector:
     {{- include "common.selectorLabels" . | nindent 4 }}

tip-wlan/charts/opensync-mqtt-broker/templates/statefulset.yaml

@@ -43,21 +43,6 @@ spec:
       serviceAccountName: {{ include "common.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      initContainers:
-        - name: {{ include "common.name" . }}-init-dir-ownership-change
-          image: alpine:3.6
-          # Change ownership to `mosquitto` user for a mounted volume
-          command:
-          - sh
-          - -c
-          - |
-            chown -R 1883:1883 /mosquitto/data
-            chown -R 1883:1883 /mosquitto/db
-          volumeMounts:
-          - name: data
-            mountPath: /mosquitto/data
-          - name: db
-            mountPath: /mosquitto/db
       containers:
         - name: {{ .Chart.Name }}
           securityContext:

tip-wlan/charts/opensync-mqtt-broker/values.yaml

@@ -54,15 +54,11 @@ probes:
 testsEnabled: false
 
 service:
-  type: NodePort
+  type: ClusterIP
   port1: 1883
   name1: listener
-  nodePort1: 31
   port2: 9001
   name2: debug
-  nodePort2: 32
-  annotations: {}
-  nodePortStatic: true ## if true, nodePort ports are statically defined effectively prohibiting multiple deployments on the same cluster; if false, nodePort ports are chosen dynamically by k8s
 
 ingress:
   enabled: false

tip-wlan/charts/postgresql/files/docker-entrypoint-initdb.d/creation-replication-user-role.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# 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 \
-    "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 \
-    "CREATE ROLE $POSTGRES_REPLICATION_USER WITH REPLICATION LOGIN ENCRYPTED PASSWORD '$POSTGRES_REPLICATION_PASSWORD';"
-fi

tip-wlan/charts/postgresql/files/pg_hba.conf

@@ -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

tip-wlan/charts/postgresql/resources/config/certs/README.md

@@ -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

tip-wlan/charts/postgresql/templates/secret-certs.yaml

@@ -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 }}
-

tip-wlan/charts/postgresql/templates/statefulset-slaves.yaml

@@ -75,25 +75,6 @@ spec:
       {{- 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" . }}
@@ -206,22 +187,6 @@ spec:
                   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" . }}
@@ -278,8 +243,6 @@ spec:
             - 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 }}
@@ -297,11 +260,6 @@ spec:
           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:

tip-wlan/charts/postgresql/templates/statefulset.yaml

@@ -75,25 +75,6 @@ spec:
       {{- 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" . }}
@@ -228,23 +209,7 @@ spec:
                   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" .) }}
+            {{- if (include "postgresql.database" .) }}
             - name: POSTGRES_DB
               value: {{ (include "postgresql.database" .) | quote }}
             {{- end }}
@@ -355,8 +320,6 @@ spec:
             - 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 }}
@@ -433,11 +396,6 @@ spec:
           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:

tip-wlan/charts/postgresql/values.yaml

@@ -15,7 +15,7 @@ global:
 image:
   registry: docker.io
   repository: bitnami/postgresql
-  tag: 11.8.0-debian-10-r58
+  tag: 11.7.0-debian-10-r99
   # repository: postgres
   # tag: 10.6
   ## Specify a imagePullPolicy
@@ -48,7 +48,7 @@ image:
 ## volumePermissions: Change the owner of the persist volume mountpoint to RunAsUser:fsGroup
 ##
 volumePermissions:
-  enabled: true
+  enabled: false
   image:
     registry: docker.io
     repository: bitnami/minideb
@@ -258,14 +258,13 @@ ldap:
 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
+  # nodePort:
 
   ## Provide any additional annotations which may be required. Evaluated as a template.
   ##
@@ -428,9 +427,8 @@ slave:
   ## Override the service configuration for slave
   ##
   service: {}
-  # service:
   # type:
-  #  nodePort: 30011
+  # nodePort:
   # clusterIP:
 
 ## Configure resource requests and limits

tip-wlan/charts/wlan-cloud-graphql-gw/templates/deployment.yaml

@@ -24,11 +24,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          {{- if .Values.global.testingEnabled }}
-          image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}-{{.Values.global.testingTimestamp}}
-          {{- else }}
           image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
-          {{- end }}
           imagePullPolicy: {{ .Values.global.pullPolicy }}
           env:
           - name: API

tip-wlan/charts/wlan-cloud-graphql-gw/templates/ingress.yaml

@@ -32,12 +32,6 @@ spec:
     - host: {{ .host | quote }}
       http:
         paths:
-        {{- if $.Values.ingress.lb_https_redirect }}
-          - path: /*
-            backend:
-              serviceName: ssl-redirect
-              servicePort: use-annotation
-        {{- end }}
         {{- range .paths }}
           - path: {{ . }}
             backend:

tip-wlan/charts/wlan-cloud-graphql-gw/templates/service.yaml

@@ -12,8 +12,6 @@ spec:
       targetPort: {{ .Values.service.port }}
       protocol: TCP
       name: {{ .Values.service.name }}
-      {{- if and .Values.service.nodePortStatic (eq .Values.service.type "NodePort") }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-      {{- end }}
   selector:
     {{- include "common.selectorLabels" . | nindent 4 }}

tip-wlan/charts/wlan-cloud-graphql-gw/values.yaml

@@ -51,11 +51,9 @@ service:
   port: 4000
   name: graphui
   nodePort: 23
-  nodePortStatic: true ## if true, nodePort ports are statically defined effectively prohibiting multiple deployments on the same cluster; if false, nodePort ports are chosen dynamically by k8s
 
 ingress:
   enabled: true
-  lb_https_redirect: false ## if set to true, enables http->https redirect on cloud load balancer
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"

tip-wlan/charts/wlan-cloud-static-portal/templates/deployment.yaml

@@ -24,15 +24,11 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          {{- if .Values.global.testingEnabled }}
-          image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}-{{.Values.global.testingTimestamp}}
-          {{- else }}
           image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
-          {{- end }}
           imagePullPolicy: {{ .Values.global.pullPolicy }}
           env:
-          - name: API
-            value: {{ .Values.env.graphql }}
+          - name: GRAPHQL_URL
+            value: {{ .Release.Name }}-{{ .Values.env.graphql }}
           ports:
             - name: {{ .Values.service.name }}
               containerPort: {{ .Values.service.port }}

tip-wlan/charts/wlan-cloud-static-portal/templates/ingress.yaml

@@ -32,12 +32,6 @@ spec:
     - host: {{ .host | quote }}
       http:
         paths:
-        {{- if $.Values.ingress.lb_https_redirect }}
-          - path: /*
-            backend:
-              serviceName: ssl-redirect
-              servicePort: use-annotation
-        {{- end }}
         {{- range .paths }}
           - path: {{ . }}
             backend:

tip-wlan/charts/wlan-cloud-static-portal/templates/service.yaml

@@ -5,10 +5,6 @@ metadata:
   namespace: {{ include "common.namespace" . }}
   labels:
     {{- include "common.labels" . | nindent 4 }}
-  {{- with .Values.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:

tip-wlan/charts/wlan-cloud-static-portal/values.yaml

@@ -33,7 +33,7 @@ podSecurityContext: {}
 testsEnabled: false
 
 env:
-  graphql: tip-wlan-wlan-cloud-graphql-gw:4000
+  graphql: wlan-cloud-graphql-gw:4000
 
 securityContext: {}
   # capabilities:
@@ -50,7 +50,6 @@ service:
 
 ingress:
   enabled: true
-  lb_https_redirect: false ## if set to true, enables http->https redirect on cloud load balancer
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"

tip-wlan/charts/wlan-integrated-cloud-component-service/resources/config/logback.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- For assistance related to logback-translator or configuration  -->
-<!-- files in general, please contact the logback user mailing list -->
-<!-- at http://www.qos.ch/mailman/listinfo/logback-user             -->
-<!--                                                                -->
-<!-- For professional support please see                            -->
-<!--    http://www.qos.ch/shop/products/professionalSupport         -->
-<!--                                                                -->
-<configuration>
-  <conversionRule conversionWord="filteredStack"
-                  converterClass="com.telecominfraproject.wlan.server.exceptions.logback.ExceptionCompressingConverter" />
-
-  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{yyyy-MM-DD HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%filteredStack%nopex</pattern>
-      <!-- See http://logback.qos.ch/manual/layouts.html for details -->
-      <!-- %ex{5} - add at the end to display only 5 levels of the exception stack trace -->
-      <!-- %nopex - add at the end to not display any of the exception stack traces -->
-      <!-- %ex{full} - add at the end to display all the levels of the exception stack trace -->
-  </encoder>
-    <!--
-  <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-    <file>myApp.log</file>
-
-    <encoder>
-      <pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
-    </encoder>
-  </appender>
-  -->
-
-  </appender>
-  <appender name="logfile" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>/app/logs/intcloudcompservice.log</file>
-    <append>true</append>
-    <encoder>
-      <pattern>%date %level [%thread] %logger{36} [%file:%line] %msg%n</pattern>
-    </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>/app/logs/intcloudcompservice.%i.log.gz</fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>3</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>20MB</maxFileSize>
-    </triggeringPolicy>
-  </appender>
-
-
-  <!--
-  details: http://logback.qos.ch/manual/configuration.html#auto_configuration
-
-  runtime configuration, if need to override the defaults:
-    -Dlogging.config=file:///home/ec2-user/opensync/logback.xml
-
-  for log configuration debugging - use
-  	-Dlogback.statusListenerClass=ch.qos.logback.core.status.OnConsoleStatusListener
-
-  log levels:
-	OFF ERROR WARN INFO DEBUG TRACE
-   -->
-  <logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
-  <logger name="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping" level="INFO"/>
-  <logger name="org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer" level="INFO"/>
-
-  <logger name="com.telecominfraproject" level="INFO"/>
-  <logger name="com.telecominfraproject.wlan" level="DEBUG"/>
-  <logger name="com.telecominfraproject.wlan.core.server.webconfig.WebGenericConverter" level="OFF"/>
-
-  <root level="WARN">
-    <appender-ref ref="stdout"/>
-    <appender-ref ref="logfile"/>
-  </root>
-  
-</configuration>

tip-wlan/charts/wlan-integrated-cloud-component-service/templates/configmap.yaml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-log-config
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/logback.xml").AsConfig . | indent 2 }}

tip-wlan/charts/wlan-integrated-cloud-component-service/templates/deployment.yaml

@@ -23,7 +23,6 @@ spec:
       serviceAccountName: {{ include "common.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      {{- if .Values.integratedWithPersistence.enabled }}
       initContainers:
         - name: {{ include "common.name" . }}-readiness
           image: busybox:1.28
@@ -54,10 +53,15 @@ spec:
           - sh
           - -c
           - |
+            echo "151.101.112.249 dl-cdn.alpinelinux.org" >> /etc/hosts
+            echo "34.214.79.168 tip.jfrog.io" >> /etc/hosts
+            echo "151.101.128.204 security.debian.org" >> /etc/hosts
+            echo "151.101.126.133 deb.debian.org" >> /etc/hosts
+            echo "147.75.85.69 apt.postgresql.org" >> /etc/hosts
             apt update
             apt -y install curl
             echo "***** Fetching cloud-sdk-schema-postgresql.sql from JFrog *****"
-            curl -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/0.0.1-SNAPSHOT/sql/cloud-sdk-schema-postgresql.sql"
+            curl -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip.jfrog.io/artifactory/tip-wlan-cloud-schemas/0.0.1-SNAPSHOT/sql/cloud-sdk-schema-postgresql.sql"
             echo "***** Now executing cloud-sdk-schema-postgresql.sql and creating/updating schema on Postgres instance *****"
             PGPASSWORD=$POSTGRES_PASSWORD psql -h tip-wlan-postgresql-headless -U postgres -f cloud-sdk-schema-postgresql.sql
             exit
@@ -76,20 +80,12 @@ spec:
             name: dshm
           - mountPath: /bitnami/postgresql
             name: data
-      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          {{- if .Values.global.testingEnabled }}
-          image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}-{{.Values.global.testingTimestamp}}
-          {{- else }}
           image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
-          {{- end }}
           imagePullPolicy: {{ .Values.global.pullPolicy }}
-          env:
-            - name: BACKEND_SERVER
-              value: {{ .Release.Name }}-{{ .Chart.Name }}
           {{- if .Values.probes.enabled }}
           livenessProbe:
             httpGet:
@@ -122,9 +118,6 @@ spec:
           - mountPath: /opt/tip-wlan/certs/server.pkcs12
             name: certificates
             subPath: server.pkcs12
-          - mountPath: /app/intcloudcomp/logback.xml
-            name: logback-config
-            subPath: logback.xml
           ports:
             - name: {{ .Values.service.name1 }}
               containerPort: {{ .Values.service.port1 }}
@@ -151,9 +144,6 @@ spec:
       - name: certificates
         secret:
           secretName: {{ include "common.fullname" . }}-certs
-      - name: logback-config
-        configMap:
-            name: {{ include "common.fullname" . }}-log-config
       - name: data
         emptyDir: {}
       - name: dshm

tip-wlan/charts/wlan-integrated-cloud-component-service/values.yaml

@@ -78,9 +78,6 @@ service:
 postgresql: 
   url: postgresql-headless
 
-integratedWithPersistence:
-  enabled: false
-
 ingress:
   enabled: false
   annotations: {}

tip-wlan/charts/wlan-port-forwarding-gateway-service/.helmignore

@@ -1,23 +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
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

tip-wlan/charts/wlan-port-forwarding-gateway-service/Chart.yaml

@@ -1,21 +0,0 @@
-apiVersion: v2
-name: wlan-port-forwarding-gateway-service
-description: WLAN Port Forwarding Gateway Service Helm chart for Kubernetes for debugging APs remotely
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application.
-appVersion: 0.0.1

tip-wlan/charts/wlan-port-forwarding-gateway-service/resources/config/certs/README.md

@@ -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

tip-wlan/charts/wlan-port-forwarding-gateway-service/resources/config/logback.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- For assistance related to logback-translator or configuration  -->
-<!-- files in general, please contact the logback user mailing list -->
-<!-- at http://www.qos.ch/mailman/listinfo/logback-user             -->
-<!--                                                                -->
-<!-- For professional support please see                            -->
-<!--    http://www.qos.ch/shop/products/professionalSupport         -->
-<!--                                                                -->
-<configuration>
-  <conversionRule conversionWord="filteredStack"
-                  converterClass="com.telecominfraproject.wlan.server.exceptions.logback.ExceptionCompressingConverter" />
-
-  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%filteredStack%nopex</pattern>
-      <!-- See http://logback.qos.ch/manual/layouts.html for details -->
-      <!-- %ex{5} - add at the end to display only 5 levels of the exception stack trace -->
-      <!-- %nopex - add at the end to not display any of the exception stack traces -->
-      <!-- %ex{full} - add at the end to display all the levels of the exception stack trace -->
-  </encoder>
-    <!--
-  <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-    <file>myApp.log</file>
-
-    <encoder>
-      <pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
-    </encoder>
-  </appender>
-  -->
-
-  </appender>
-  <appender name="logfile" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>/app/logs/portForwardingGateway.log</file>
-    <append>true</append>
-    <encoder>
-      <pattern>%date %level [%thread] %logger{36} [%file:%line] %msg%n</pattern>
-    </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>/app/logs/portForwardingGateway.%i.log.gz</fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>3</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>20MB</maxFileSize>
-    </triggeringPolicy>
-  </appender>
-
-
-  <!--
-  details: http://logback.qos.ch/manual/configuration.html#auto_configuration
-
-  runtime configuration, if need to override the defaults:
-    -Dlogging.config=file:///home/ec2-user/opensync/logback.xml
-
-  for log configuration debugging - use
-  	-Dlogback.statusListenerClass=ch.qos.logback.core.status.OnConsoleStatusListener
-
-  log levels:
-	OFF ERROR WARN INFO DEBUG TRACE
-   -->
-  <logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
-  <logger name="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping" level="INFO"/>
-  <logger name="org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer" level="INFO"/>
-
-  <logger name="com.telecominfraproject" level="INFO"/>
-  <logger name="com.telecominfraproject.wlan" level="DEBUG"/>
-  <logger name="com.telecominfraproject.wlan.core.server.webconfig.WebGenericConverter" level="OFF"/>
-
-  <root level="WARN">
-    <appender-ref ref="stdout"/>
-    <appender-ref ref="logfile"/>
-  </root>
-  
-</configuration>

tip-wlan/charts/wlan-port-forwarding-gateway-service/resources/config/run.sh

@@ -1,56 +0,0 @@
-#!/bin/bash
-
-# local_port_range that Java process can use
-# These are then assigned to the container ports (in the deployment.yaml) which can either:
-# later be opened by the port-forwarding-gateway service as NodePorts (preferred)
-# or use kubectl port-forwarding to forward the container ports. Example:
-# kubectl port-forward pods/<port-forwarding-gw-pod> <local-machine-port>:<debugPort on the Pod>
-sysctl -w net.ipv4.ip_local_port_range="30410    30435"
-
-PROFILES=" -Dspring.profiles.include=use_ssl_with_client_cert_and_digest_auth,client_certificate_and_digest_auth,RestTemplateConfiguration_X509_client_cert_auth"
-
-LOGGING_PROPS=" -Dlogging.config=file:/app/port-forwarding-gateway/logback.xml"
-
-# SSC_URL: something like https://${SSC_SERVER_HOST}:9031
-SSC_URL=${SSC_RELEASE_URL}
-# PROV_URL: something like https://${PROV_SERVER_HOST}:9091
-PROV_URL=${PROV_RELEASE_URL}
-# PF_GATEWAY_URL: something like https://${PF_GATEWAY_SERVER_HOST}:7070
-PF_GATEWAY_URL=${PF_GATEWAY_RELEASE_URL}
-PF_GATEWAY_ENCRYPTION_KEY=${PF_GATEWAY_RELEASE_ENCRYPTION_KEY:='MyToKeN0MyToKeN1'}
-PF_GATEWAY_EXT_HOST=${PF_GATEWAY_RELEASE_EXT_HOST:=''}
-PF_GATEWAY_EXT_PORT=${PF_GATEWAY_RELEASE_EXT_PORT:='0'}
-
-
-# SSC URLs
-HOST_PROPS=" "
-HOST_PROPS+=" -Dtip.wlan.cloudEventDispatcherBaseUrl=$SSC_URL"
-HOST_PROPS+=" -Dtip.wlan.statusServiceBaseUrl=$SSC_URL"
-HOST_PROPS+=" -Dtip.wlan.routingServiceBaseUrl=$SSC_URL"
-HOST_PROPS+=" -Dtip.wlan.alarmServiceBaseUrl=$SSC_URL"
-HOST_PROPS+=" -Dtip.wlan.systemEventServiceBaseUrl=$SSC_URL"
-HOST_PROPS+=" -Dtip.wlan.clientServiceBaseUrl=$SSC_URL"
-HOST_PROPS+=" -Dtip.wlan.serviceMetricServiceBaseUrl=$SSC_URL"
-
-# PROV URLs
-HOST_PROPS+=" -Dtip.wlan.customerServiceBaseUrl=$PROV_URL"
-HOST_PROPS+=" -Dtip.wlan.portalUserServiceBaseUrl=$PROV_URL"
-HOST_PROPS+=" -Dtip.wlan.firmwareServiceBaseUrl=$PROV_URL"
-HOST_PROPS+=" -Dtip.wlan.locationServiceBaseUrl=$PROV_URL"
-HOST_PROPS+=" -Dtip.wlan.manufacturerServiceBaseUrl=$PROV_URL"
-HOST_PROPS+=" -Dtip.wlan.equipmentServiceBaseUrl=$PROV_URL"
-HOST_PROPS+=" -Dtip.wlan.profileServiceBaseUrl=$PROV_URL"
-
-# Port-Forwarder Gateway Specific
-HOST_PROPS+=" -Dtip.wlan.portForwarderGatewayBaseUrl=$PF_GATEWAY_URL"
-HOST_PROPS+=" -Dtip.wlan.websocketSessionTokenEncryptionKey=$PF_GATEWAY_ENCRYPTION_KEY"
-HOST_PROPS+=" -Dtip.wlan.externallyVisibleHostName=$PF_GATEWAY_EXT_HOST"
-HOST_PROPS+=" -Dtip.wlan.externallyVisiblePort=$PF_GATEWAY_EXT_PORT"
-
-
-REMOTE_DEBUG_PORT=5010
-REMOTE_DEBUG=" -agentlib:jdwp=transport=dt_socket,server=y,address=*:$REMOTE_DEBUG_PORT,suspend=n"
-
-export ALL_PROPS="$PROFILES $LOGGING_PROPS $HOST_PROPS $REMOTE_DEBUG"
-
-java $ALL_PROPS -jar app.jar

tip-wlan/charts/wlan-port-forwarding-gateway-service/templates/NOTES.txt

@@ -1,21 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "common.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$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.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "common.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "common.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "common.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
-{{- end }}

tip-wlan/charts/wlan-port-forwarding-gateway-service/templates/configmap.yaml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-config
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}

tip-wlan/charts/wlan-port-forwarding-gateway-service/templates/deployment.yaml

@@ -1,147 +0,0 @@
-{{- $opensyncgw := include "opensyncgw.service" . -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "common.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "common.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      labels:
-        {{- include "common.selectorLabels" . | nindent 8 }}
-    spec:
-      imagePullSecrets:
-        - name: "{{ include "common.namespace" . }}-docker-registry-key"
-      serviceAccountName: {{ include "common.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      initContainers:
-        - name: {{ include "common.name" . }}-readiness-opensync-gw
-          image: alpine
-          imagePullPolicy: {{ .Values.global.pullPolicy }}
-          command:
-          - sh
-          - -c
-          - |
-            apk add curl
-            url=https://{{ $opensyncgw }}/ping
-            counter=0
-            status=$(curl --insecure --head --location --connect-timeout 5 --write-out %{http_code} --silent --output /dev/null ${url});
-            while [ $counter -lt 30 ] && [ $status -ne 200 ]
-            do
-              echo ${url} service isnt ready. Tried $counter times
-              sleep 5
-              counter=`expr $counter + 1`
-              status=$(curl --insecure --head --location --connect-timeout 5 --write-out %{http_code} --silent --output /dev/null ${url});
-              echo Http Response code of ping request = $status
-            done
-            if [ $status -eq 200 ]
-            then
-              echo ${url} service is ready!
-            else
-              echo ${url} service failed to respond after 50 secs
-              exit 1
-            fi        
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          {{- if .Values.global.testingEnabled }}
-          image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}-{{.Values.global.testingTimestamp}}
-          {{- else }}
-          image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
-          {{- end }}
-          imagePullPolicy: {{ .Values.global.pullPolicy }}
-          env:
-            {{- include "common.env" . | nindent 12 }}
-            - name: PF_GATEWAY_RELEASE_URL
-              value: {{ .Values.env.protocol }}://{{ .Release.Name }}-{{ .Values.env.pfGateway.service }}:{{ .Values.env.pfGateway.port }}
-            - name: PF_GATEWAY_RELEASE_ENCRYPTION_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "common.fullname" . }}-creds
-                  key: websocketSessionTokenEncKey
-            - name: PF_GATEWAY_RELEASE_EXT_HOST
-              value: {{ .Values.externallyVisible.host }}
-            - name: PF_GATEWAY_RELEASE_EXT_PORT
-              value: "{{ .Values.externallyVisible.port }}"
-          {{- if .Values.probes.enabled }}
-          livenessProbe:
-            httpGet:
-              path: /ping
-              port: {{ .Values.service.port2 }}
-              scheme: {{ .Values.probes.livenessProbe.scheme }}
-            initialDelaySeconds: {{ .Values.probes.livenessProbe.initialDelaySeconds }}  
-            timeoutSeconds: {{ .Values.probes.livenessProbe.timeoutSeconds }}
-            failureThreshold: {{ .Values.probes.livenessProbe.failureThreshold }}
-            periodSeconds: {{ .Values.probes.livenessProbe.periodSeconds }}
-            successThreshold: {{ .Values.probes.livenessProbe.successThreshold }}
-          readinessProbe:
-            httpGet:
-              path: /ping
-              port: {{ .Values.service.port2 }}
-              scheme: {{ .Values.probes.readinessProbe.scheme }}
-            initialDelaySeconds: {{ .Values.probes.readinessProbe.initialDelaySeconds }}
-            timeoutSeconds: {{ .Values.probes.readinessProbe.timeoutSeconds }}
-            failureThreshold: {{ .Values.probes.readinessProbe.failureThreshold }}
-            periodSeconds: {{ .Values.probes.readinessProbe.periodSeconds }}
-            successThreshold: {{ .Values.probes.readinessProbe.successThreshold }}
-          {{- end }}
-          volumeMounts:
-          - mountPath: /opt/tip-wlan/certs/client_keystore.jks
-            name: certificates
-            subPath: client_keystore.jks
-          - mountPath: /opt/tip-wlan/certs/truststore.jks
-            name: certificates
-            subPath: truststore.jks
-          - mountPath: /opt/tip-wlan/certs/server.pkcs12
-            name: certificates
-            subPath: server.pkcs12
-          - mountPath: /app/port-forwarding-gateway/logback.xml
-            name: configuration
-            subPath: logback.xml
-          - mountPath: /app/run.sh
-            name: configuration
-            subPath: run.sh
-          ports:
-            - name: {{ .Values.service.name1 }}
-              containerPort: {{ .Values.service.port1 }}
-              protocol: TCP
-            - name: {{ .Values.service.name2 }}
-              containerPort: {{ .Values.service.port2 }}
-              protocol: TCP
-            {{- if .Values.debug.enabled }}
-            - name: {{ .Values.service.name3 }}
-              containerPort: {{ .Values.service.port3 }}
-              protocol: TCP
-            {{- end }}
-            {{- include "container.dev.debugport" . | nindent 10 }}
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-    {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-      volumes:
-      - name: certificates
-        secret:
-          secretName: {{ include "common.fullname" . }}-certs
-          defaultMode: 0400
-      - name: configuration
-        configMap:
-            name: {{ include "common.fullname" . }}-config
-            defaultMode: 0755

tip-wlan/charts/wlan-port-forwarding-gateway-service/templates/ingress.yaml

@@ -1,42 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "common.fullname" . -}}
-{{- $svcPort := .Values.service.port1 -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-{{- if .Values.ingress.tls }}
-  tls:
-  {{- range .Values.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-        {{- range .paths }}
-          - path: {{ . }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-        {{- end }}
-  {{- end }}
-{{- end }}

tip-wlan/charts/wlan-port-forwarding-gateway-service/templates/secret.yaml

@@ -1,24 +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 }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "common.fullname" . }}-creds
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ template "common.name" . }}
-    chart: {{ template "common.chart" . }}
-    release: {{ .Release.Name | quote }}
-    heritage: {{ .Release.Service | quote }}
-type: Opaque
-data:
-  {{- if .Values.creds.enabled }}
-  websocketSessionTokenEncKey: {{ .Values.creds.websocketSessionTokenEncKey | b64enc | quote }}
-  {{- end }}

tip-wlan/charts/wlan-port-forwarding-gateway-service/templates/service.yaml

@@ -1,36 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.service.port1 }}
-      targetPort: {{ .Values.service.port1 }}
-      protocol: TCP
-      name: {{ .Values.service.name1 }}
-      {{- if and .Values.service.nodePortStatic (eq .Values.service.type "NodePort") }}
-      nodePort: {{ .Values.global.nodePortPrefixExt | default .Values.nodePortPrefixExt }}{{ .Values.service.nodePort1 }}
-      {{- end }}
-    - port: {{ .Values.service.port2 }}
-      targetPort: {{ .Values.service.port2 }}
-      protocol: TCP
-      name: {{ .Values.service.name2 }}
-      {{- if and .Values.service.nodePortStatic (eq .Values.service.type "NodePort") }}
-      nodePort: {{ .Values.global.nodePortPrefixExt | default .Values.nodePortPrefixExt }}{{ .Values.service.nodePort2 }}
-      {{- end }}
-    {{- if .Values.debug.enabled }}
-    - port: {{ .Values.service.port3 }}
-      targetPort: {{ .Values.service.port3 }}
-      protocol: TCP
-      name: {{ .Values.service.name3 }}
-      {{- if and .Values.service.nodePortStatic (eq .Values.service.type "NodePort") }}
-      nodePort: {{ .Values.global.nodePortPrefixExt | default .Values.nodePortPrefixExt }}{{ .Values.service.nodePort3 }}
-      {{- end }}
-    {{- end }}      
-    {{- include "service.dev.debugport" . | nindent 2 }}
-  selector:
-    {{- include "common.selectorLabels" . | nindent 4 }}

tip-wlan/charts/wlan-port-forwarding-gateway-service/templates/serviceaccount.yaml

@@ -1,13 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "common.serviceAccountName" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end -}}

tip-wlan/charts/wlan-port-forwarding-gateway-service/templates/tests/test-connection.yaml

@@ -1,18 +0,0 @@
-{{- if .Values.testsEnabled -}}
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "common.fullname" . }}-test-connection"
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": test-success
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['{{ include "common.fullname" . }}:{{ .Values.service.port1 }}']
-  restartPolicy: Never
-{{- end }}

tip-wlan/charts/wlan-port-forwarding-gateway-service/values.yaml

@@ -1,179 +0,0 @@
-# Default values for opensync-gw.
-# This is a YAML-formatted file.
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  name: wlan-port-forwarding-gateway-service
-  tag: 0.0.1-SNAPSHOT
-
-nameOverride: ""
-fullnameOverride: ""
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name:
-
-podSecurityContext: {}
-  # fsGroup: 2000
-
-# Reserving hundred nodeports (30400 - 30499) for this service (using different NodePortPrefix)
-# Expectation is we allow multiple APs to be debugged at the same time
-nodePortPrefixExt: 304
-
-## Liveness and Readiness probe values.
-## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
-probes:
-  enabled: true
-  livenessProbe:
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 5
-    successThreshold: 1
-    failureThreshold: 3
-    scheme: HTTPS
-  readinessProbe:
-    initialDelaySeconds: 5
-    periodSeconds: 30
-    timeoutSeconds: 5
-    successThreshold: 1
-    failureThreshold: 3
-    scheme: HTTPS
-
-securityContext:
-  privileged: true
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-# Enable/Disable Helm tests
-testsEnabled: false
-
-# Enable/Disable Remote debugging
-debug: 
-  enabled: false
-
-service:
-  type: NodePort
-  port1: 7070
-  name1: server
-  nodePort1: '01'
-  port2: 7072
-  name2: secondary-port
-  nodePort2: '02'
-  port3: 5010
-  name3: debug-appl
-  nodePort3: '03'
-  nodePortStatic: true ## if true, nodePort ports are statically defined effectively prohibiting multiple deployments on the same cluster; if false, nodePort ports are chosen dynamically by k8s
-
-# The below ports are the ports that Java would choose as Local ports whenever it opens up
-# a developer session for debug.
-# These ports are therefore assigned as container ports (in the deployment.yaml), so we 
-# can reach them from inside the cluster.
-# Also, we open equivalent NodePorts on the Kubernetes cluster (see service.yaml), so a developer
-# can connect to it to debug an AP.
-# NOTE: Another way to reach these container ports without opening NodePorts was to use 
-# kubectl port forwarding. However, we dont want the developer to install kubectl.
-
-debugPorts:
-  - 30410
-  - 30411
-  - 30412
-  - 30413
-  - 30414
-  - 30415
-  - 30416
-  - 30417
-  - 30418
-  - 30419
-  - 30420
-  - 30421
-  - 30422
-  - 30423
-  - 30424
-  - 30425
-  - 30426
-  - 30427
-  - 30428
-  - 30429
-  - 30430
-  - 30431
-  - 30432
-  - 30433
-  - 30434
-  - 30435
-
-creds:
-  enabled: true
-  websocketSessionTokenEncKey: DUMMY_ENC_KEY
-
-opensyncgw:
-  url: opensync-gw-cloud
-  port: 9097
-
-ingress:
-  enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  hosts:
-    - host: example.com
-      paths: [
-         /portal 
-        ]
-  tls: 
-   - secretName: portal-secret
-     hosts:
-       - example.com
-
-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
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-externallyVisible:
-  host: pfg.example.org
-  port: 7070
-
-env:
-  protocol: https
-  ssc_url: SSC_RELEASE_URL
-  prov_url: PROV_RELEASE_URL
-  ssc:
-    service: wlan-ssc-service
-    port: 9031
-  prov:
-    service: wlan-prov-service
-    port: 9091
-  pfGateway:
-    service: wlan-port-forwarding-gateway-service
-    port: 7070
-
-

tip-wlan/charts/wlan-portal-service/resources/config/logback.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- For assistance related to logback-translator or configuration  -->
-<!-- files in general, please contact the logback user mailing list -->
-<!-- at http://www.qos.ch/mailman/listinfo/logback-user             -->
-<!--                                                                -->
-<!-- For professional support please see                            -->
-<!--    http://www.qos.ch/shop/products/professionalSupport         -->
-<!--                                                                -->
-<configuration>
-  <conversionRule conversionWord="filteredStack"
-                  converterClass="com.telecominfraproject.wlan.server.exceptions.logback.ExceptionCompressingConverter" />
-
-  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%filteredStack%nopex</pattern>
-      <!-- See http://logback.qos.ch/manual/layouts.html for details -->
-      <!-- %ex{5} - add at the end to display only 5 levels of the exception stack trace -->
-      <!-- %nopex - add at the end to not display any of the exception stack traces -->
-      <!-- %ex{full} - add at the end to display all the levels of the exception stack trace -->
-  </encoder>
-    <!--
-  <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-    <file>myApp.log</file>
-
-    <encoder>
-      <pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
-    </encoder>
-  </appender>
-  -->
-
-  </appender>
-  <appender name="logfile" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>/app/logs/portalservice.log</file>
-    <append>true</append>
-    <encoder>
-      <pattern>%date %level [%thread] %logger{36} [%file:%line] %msg%n</pattern>
-    </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>/app/logs/portalservice.%i.log.gz</fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>3</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>20MB</maxFileSize>
-    </triggeringPolicy>
-  </appender>
-
-
-  <!--
-  details: http://logback.qos.ch/manual/configuration.html#auto_configuration
-
-  runtime configuration, if need to override the defaults:
-    -Dlogging.config=file:///home/ec2-user/opensync/logback.xml
-
-  for log configuration debugging - use
-  	-Dlogback.statusListenerClass=ch.qos.logback.core.status.OnConsoleStatusListener
-
-  log levels:
-	OFF ERROR WARN INFO DEBUG TRACE
-   -->
-  <logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
-  <logger name="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping" level="INFO"/>
-  <logger name="org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer" level="INFO"/>
-
-  <logger name="com.telecominfraproject" level="INFO"/>
-  <logger name="com.telecominfraproject.wlan" level="DEBUG"/>
-  <logger name="com.telecominfraproject.wlan.core.server.webconfig.WebGenericConverter" level="OFF"/>
-
-  <root level="WARN">
-    <appender-ref ref="stdout"/>
-    <appender-ref ref="logfile"/>
-  </root>
-  
-</configuration>

tip-wlan/charts/wlan-portal-service/templates/configmap.yaml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-log-config
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/logback.xml").AsConfig . | indent 2 }}

tip-wlan/charts/wlan-portal-service/templates/deployment.yaml

@@ -1,44 +1,20 @@
-{{- $file_store_path := include "filestore.dir.name" . -}}
 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata:
   name: {{ include "common.fullname" . }}
   namespace: {{ include "common.namespace" . }}
   labels:
     {{- include "common.labels" . | nindent 4 }}
 spec:
-  serviceName: {{ include "common.fullname" . }}
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
       {{- include "common.selectorLabels" . | nindent 6 }}
-  updateStrategy:
-{{ toYaml .Values.updateStrategy | indent 4 }}      
   template:
     metadata:
       labels:
         {{- include "common.selectorLabels" . | nindent 8 }}
-      {{- 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 }}
-{{- if .Values.priorityClassName }}
-      priorityClassName: "{{ .Values.priorityClassName }}"
-{{- end }}    
       imagePullSecrets:
         - name: "{{ include "common.namespace" . }}-docker-registry-key"
       serviceAccountName: {{ include "common.serviceAccountName" . }}
@@ -48,16 +24,10 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          {{- if .Values.global.testingEnabled }}
-          image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}-{{.Values.global.testingTimestamp}}
-          {{- else }}
           image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
-          {{- end }}
           imagePullPolicy: {{ .Values.global.pullPolicy }}
           env:
-            {{- include "common.env" . | nindent 12 }}
-            - name: FILE_STORE_DIRECTORY_INTERNAL
-              value: {{ $file_store_path }}
+            {{- include "common.env" . | nindent 12 }}  
           {{- if .Values.probes.enabled }}
           livenessProbe:
             httpGet:
@@ -90,11 +60,6 @@ spec:
           - mountPath: /opt/tip-wlan/certs/server.pkcs12
             name: certificates
             subPath: server.pkcs12
-          - mountPath: /app/portal/logback.xml
-            name: logback-config
-            subPath: logback.xml
-          - mountPath: {{ $file_store_path }}
-            name: file-store-data
           ports:
             - name: {{ .Values.service.name1 }}
               containerPort: {{ .Values.service.port1 }}
@@ -102,11 +67,6 @@ spec:
             - name: {{ .Values.service.name2 }}
               containerPort: {{ .Values.service.port2 }}
               protocol: TCP
-            {{- if .Values.debug.enabled }}
-            - name: {{ .Values.service.name3 }}
-              containerPort: {{ .Values.service.port3 }}
-              protocol: TCP
-            {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
@@ -126,28 +86,3 @@ spec:
       - name: certificates
         secret:
           secretName: {{ include "common.fullname" . }}-certs
-      - name: logback-config
-        configMap:
-            name: {{ include "common.fullname" . }}-log-config
-      {{- if not .Values.persistence.enabled }}
-      - name: file-store-data
-        emptyDir: {}
-      {{- end }}
-  {{- if .Values.persistence.enabled }}
-  volumeClaimTemplates:
-    - metadata:
-        name: {{ .Values.persistence.sharedPvc.name }}
-      spec:
-        accessModes:
-          - {{ .Values.persistence.accessMode | quote }}
-        resources:
-          requests:
-            storage: {{ .Values.persistence.filestoreSize | quote }}
-      {{- if .Values.persistence.storageClass }}
-        {{- if (eq "-" .Values.persistence.storageClass) }}
-        storageClassName: ""
-        {{- else }}
-        storageClassName: "{{ .Values.persistence.storageClass }}"
-        {{- end }}
-      {{- end }}
-  {{- end }}

tip-wlan/charts/wlan-portal-service/templates/ingress.yaml

@@ -32,12 +32,6 @@ spec:
     - host: {{ .host | quote }}
       http:
         paths:
-        {{- if $.Values.ingress.lb_https_redirect }}
-          - path: /*
-            backend:
-              serviceName: ssl-redirect
-              servicePort: use-annotation
-        {{- end }}
         {{- range .paths }}
           - path: {{ . }}
             backend:

tip-wlan/charts/wlan-portal-service/templates/service.yaml

@@ -5,10 +5,6 @@ metadata:
   namespace: {{ include "common.namespace" . }}
   labels:
     {{- include "common.labels" . | nindent 4 }}
-  {{- with .Values.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -16,24 +12,15 @@ spec:
       targetPort: {{ .Values.service.port1 }}
       protocol: TCP
       name: {{ .Values.service.name1 }}
-      {{- if and .Values.service.nodePortStatic (eq .Values.service.type "NodePort") }}
+      {{- if eq .Values.service.type "NodePort" }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort1 }}
       {{- end }}
     - port: {{ .Values.service.port2 }}
       targetPort: {{ .Values.service.port2 }}
       protocol: TCP
       name: {{ .Values.service.name2 }}
-      {{- if and .Values.service.nodePortStatic (eq .Values.service.type "NodePort") }}
+      {{- if eq .Values.service.type "NodePort" }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
       {{- end }}
-    {{- if .Values.debug.enabled }}
-    - port: {{ .Values.service.port3 }}
-      targetPort: {{ .Values.service.port3 }}
-      protocol: TCP
-      name: {{ .Values.service.name3 }}
-      {{- if and .Values.service.nodePortStatic (eq .Values.service.type "NodePort") }}
-      nodePort: {{ .Values.global.nodePortPrefix }}{{ .Values.service.nodePort3 }}
-      {{- end }}
-    {{- end }}
   selector:
     {{- include "common.selectorLabels" . | nindent 4 }}

tip-wlan/charts/wlan-portal-service/values.yaml

@@ -9,8 +9,6 @@
 
 replicaCount: 1
 
-
-
 image:
   name: wlan-portal-service
   tag: 0.0.1-SNAPSHOT
@@ -60,10 +58,6 @@ securityContext: {}
 # Enable/Disable Helm tests
 testsEnabled: false
 
-# Enable/Disable Remote debugging
-debug: 
-  enabled: false
-
 service:
   type: NodePort
   port1: 9051
@@ -72,14 +66,9 @@ service:
   port2: 9052
   name2: secondary-port
   nodePort2: 52
-  port3: 5006
-  name3: debug
-  nodePort3: 15
-  nodePortStatic: true ## if true, nodePort ports are statically defined effectively prohibiting multiple deployments on the same cluster; if false, nodePort ports are chosen dynamically by k8s
 
 ingress:
   enabled: false
-  lb_https_redirect: false ## if set to true, enables http->https redirect on cloud load balancer
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
@@ -105,18 +94,6 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
-persistence:
-  enabled: false
-  # Storage class should be aws-efs if efs is used (see name of common/charts/efs-provisioner/templates/storage-class.yaml)
-  storageClass: "-"
-  accessMode: ReadWriteMany
-  annotations: {}
-  ## Size of Filestore PVC
-  filestoreSize: 1Gi
-
-  sharedPvc:
-    name: file-store-data
-
 nodeSelector: {}
 
 tolerations: []
@@ -129,16 +106,24 @@ tsp:
 
 env:
   protocol: https
-  ssc_url: SSC_RELEASE_URL
-  prov_url: PROV_RELEASE_URL
   ssc:
     service: wlan-ssc-service
     port: 9031
   prov:
     service: wlan-prov-service
     port: 9091
-
-# the filestore internal: location of the folder where UI files will be stored
-# on the PV
-filestore:
-  internal: "/tmp/filestore"
+  url:
+    alarm: tip.wlan.alarmServiceBaseUrl
+    client: tip.wlan.clientServiceBaseUrl
+    cloudEventDispatcher: tip.wlan.cloudEventDispatcherBaseUrl
+    customer: tip.wlan.customerServiceBaseUrl
+    firmware: tip.wlan.firmwareServiceBaseUrl
+    location: tip.wlan.locationServiceBaseUrl
+    profile: tip.wlan.profileServiceBaseUrl
+    serviceMetrics: tip.wlan.serviceMetricServiceBaseUrl
+    equipment: tip.wlan.equipmentServiceBaseUrl
+    manufacturer: tip.wlan.manufacturerServiceBaseUrl
+    portalUser: tip.wlan.portalUserServiceBaseUrl
+    routing: tip.wlan.routingServiceBaseUrl
+    status: tip.wlan.statusServiceBaseUrl
+    systemEvent: tip.wlan.systemEventServiceBaseUrl

tip-wlan/charts/wlan-prov-service/resources/config/logback.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- For assistance related to logback-translator or configuration  -->
-<!-- files in general, please contact the logback user mailing list -->
-<!-- at http://www.qos.ch/mailman/listinfo/logback-user             -->
-<!--                                                                -->
-<!-- For professional support please see                            -->
-<!--    http://www.qos.ch/shop/products/professionalSupport         -->
-<!--                                                                -->
-<configuration>
-  <conversionRule conversionWord="filteredStack"
-                  converterClass="com.telecominfraproject.wlan.server.exceptions.logback.ExceptionCompressingConverter" />
-
-  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n%filteredStack%nopex</pattern>
-      <!-- See http://logback.qos.ch/manual/layouts.html for details -->
-      <!-- %ex{5} - add at the end to display only 5 levels of the exception stack trace -->
-      <!-- %nopex - add at the end to not display any of the exception stack traces -->
-      <!-- %ex{full} - add at the end to display all the levels of the exception stack trace -->
-  </encoder>
-    <!--
-  <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-    <file>myApp.log</file>
-
-    <encoder>
-      <pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
-    </encoder>
-  </appender>
-  -->
-
-  </appender>
-  <appender name="logfile" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>/app/logs/provservice.log</file>
-    <append>true</append>
-    <encoder>
-      <pattern>%date %level [%thread] %logger{36} [%file:%line] %msg%n</pattern>
-    </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>/app/logs/provservice.%i.log.gz</fileNamePattern>
-      <minIndex>1</minIndex>
-      <maxIndex>3</maxIndex>
-    </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>20MB</maxFileSize>
-    </triggeringPolicy>
-  </appender>
-
-
-  <!--
-  details: http://logback.qos.ch/manual/configuration.html#auto_configuration
-
-  runtime configuration, if need to override the defaults:
-    -Dlogging.config=file:///home/ec2-user/opensync/logback.xml
-
-  for log configuration debugging - use
-  	-Dlogback.statusListenerClass=ch.qos.logback.core.status.OnConsoleStatusListener
-
-  log levels:
-	OFF ERROR WARN INFO DEBUG TRACE
-   -->
-  <logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
-  <logger name="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping" level="INFO"/>
-  <logger name="org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer" level="INFO"/>
-
-  <logger name="com.telecominfraproject" level="INFO"/>
-  <logger name="com.telecominfraproject.wlan" level="DEBUG"/>
-  <logger name="com.telecominfraproject.wlan.core.server.webconfig.WebGenericConverter" level="OFF"/>
-
-  <root level="WARN">
-    <appender-ref ref="stdout"/>
-    <appender-ref ref="logfile"/>
-  </root>
-  
-</configuration>

tip-wlan/charts/wlan-prov-service/templates/configmap.yaml

@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-log-config
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
-  datasource.properties: |-
-    singleDataSource.url=jdbc:postgresql://tip-wlan-postgresql:5432/prov_db
-    singleDataSource.username={{ .Values.creds.postgres.singleDataSourceUsername }}
-    singleDataSource.password={{ .Values.creds.postgres.singleDataSourcePassword }}
-    singleDataSource.driverClass=org.postgresql.Driver
-    singleDataSource.ssl=true
-    singleDataSource.sslmode=verify-ca
-    singleDataSource.sslcert=/opt/tip-wlan/certs/postgresclientcert.pem
-    singleDataSource.sslfactory=org.postgresql.ssl.LibPQFactory
-    singleDataSource.sslkey=/opt/tip-wlan/certs/postgresclient.p12
-    singleDataSource.sslrootcert=/opt/tip-wlan/certs/cacert.pem
-    singleDataSource.sslkeypassword={{ .Values.creds.postgres.singleDataSourceSslKeyPassword }}