postgres moved to a outside chart

removing some extra files
removing accidental files
2026-03-20 22:39:08 +00:00 · 2020-11-23 18:54:55 +03:00 · 2020-11-23 11:46:31 +03:00 · 2020-11-23 11:44:59 +03:00 · 2020-11-23 11:42:18 +03:00 · 2020-11-23 11:42:11 +03:00
183 changed files with 4883 additions and 3019 deletions
--- a/.github/workflows/enforce-jira-issue-key.yml
+++ b/.github/workflows/enforce-jira-issue-key.yml
@@ -1,37 +0,0 @@
-name: Ensure Jira issue is linked
-
-on:
-  pull_request:
-    types: [opened, edited, reopened, synchronize]
-
-jobs:
-  check_for_issue_key:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Log into Jira
-        uses: atlassian/gajira-login@v2.0.0
-        env: 
-          JIRA_BASE_URL: ${{ secrets.TIP_JIRA_URL }}
-          JIRA_USER_EMAIL: ${{ secrets.TIP_JIRA_USER_EMAIL }}
-          JIRA_API_TOKEN: ${{ secrets.TIP_JIRA_API_TOKEN }}
-      - name: Find issue key in PR title
-        id: issue_key_pr_title
-        continue-on-error: true
-        uses: atlassian/gajira-find-issue-key@v2.0.2
-        with:
-          string: ${{ github.event.pull_request.title }}
-          from: "" # required workaround for bug https://github.com/atlassian/gajira-find-issue-key/issues/24
-      - name: Find issue key in branch name
-        continue-on-error: true
-        id: issue_key_branch_name
-        uses: atlassian/gajira-find-issue-key@v2.0.2
-        with:
-          string: ${{ github.event.pull_request.head.ref }}
-          from: "" # required workaround for bug https://github.com/atlassian/gajira-find-issue-key/issues/24
-
-      - name: Check if issue key was found
-        run: |
-          if [[ -z "${{ steps.issue_key_pr_title.outputs.issue }}" && -z "${{ steps.issue_key_branch_name.outputs.issue }}" ]]; then
-             echo "Jira issue key could not be found!"
-             exit 1
-          fi
--- a/.github/workflows/helm-build.yml
+++ b/.github/workflows/helm-build.yml
@@ -3,60 +3,28 @@ name: Helm CI - TIP WLAN Cloud Master
 on: 
  push:
    branches: [ master ]
-    tags: [ "v*" ]

 jobs:
  build:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
+        with:
+          ssh-key: ${{ secrets.GH_AUTOMATION_KEY }}
+          submodules: true
+      - name: Login to TIP Docker registry 
+        uses: azure/docker-login@v1
+        with:
+          login-server: tip-tip-wlan-cloud-docker-repo.jfrog.io
+          username: build-pipeline
+          password: ${{ secrets.DOCKER_REPO_PASSWORD }}
      - name: Login to TIP Helm chart registry
        run: helm repo add tip-wlan-cloud-helm-virtual-repo https://tip.jfrog.io/artifactory/tip-wlan-cloud-helm-virtual-repo --username build-pipeline --password ${{ secrets.HELM_REPO_PASSWORD }}
      - name: Build tip-wlan chart file
-        run: |
-          if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
-            PACKAGE_OPTS="--version ${GITHUB_REF#refs/tags/v}"
-          else
-            PACKAGE_OPTS=""
-          fi
-          helm package $PACKAGE_OPTS -u tip-wlan
-      - name: Store chart as artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: helm-chart
-          path: tip-wlan-*.tgz
+        run: tar -czf tip-wlan.tgz tip-wlan
      - name: Upload tip-wlan chart to the TIP helm registry
+        run: curl -ubuild-pipeline:${{ secrets.HELM_REPO_PASSWORD }} -T tip-wlan.tgz "https://tip.jfrog.io/artifactory/tip-wlan-cloud-helm-repo/tip-wlan.tgz"
+      - name: Verify that chart was uploaded successfully
        run: |
-          if [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
-            curl -ubuild-pipeline:${{ secrets.HELM_REPO_PASSWORD }} -T tip-wlan-${GITHUB_REF#refs/tags/v}.tgz "https://tip.jfrog.io/artifactory/tip-wlan-cloud-helm-repo/tip-wlan-${GITHUB_REF#refs/tags/v}.tgz"
-          else
-            curl -ubuild-pipeline:${{ secrets.HELM_REPO_PASSWORD }} -T tip-wlan-*.tgz "https://tip.jfrog.io/artifactory/tip-wlan-cloud-helm-repo/tip-wlan-master.tgz"
-          fi
-
-  release:
-    runs-on: ubuntu-latest
-    needs: [ build ]
-    if: startsWith(github.ref, 'refs/tags/')
-    steps:
-      - uses: actions/checkout@v2
-      - name: setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: "3.8"
-      - name: install keepachangelog
-        run: pip install keepachangelog
-      - name: create release description
-        continue-on-error: true
-        run: python .github/workflows/prepare-release-description.py ${GITHUB_REF#refs/tags/v} > RELEASE.md
-      - name: download Helm chart artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: helm-chart
-      - name: create release
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          files: tip-wlan-*.tgz
-          body_path: RELEASE.md
-          prerelease: ${{ contains(github.ref, 'rc') }}
+          helm repo update
+          helm search repo tip
--- a/.github/workflows/helm-validation.yml
+++ b/.github/workflows/helm-validation.yml
@@ -45,8 +45,7 @@ jobs:
          helm template -f values-test.yaml . | /tmp/k8s-validators/kubeval --ignore-missing-schemas

          echo "Kube-score test"
-          # will be fixed and enabled again in https://telecominfraproject.atlassian.net/browse/WIFI-1258
-          helm template -f values-test.yaml . | /tmp/k8s-validators/kube-score score - || true
+          helm template -f values-test.yaml . | /tmp/k8s-validators/kube-score score -
      - name: Test glusterfs
        working-directory: glusterfs/kube-templates
        run: |
@@ -54,5 +53,4 @@ jobs:
          /tmp/k8s-validators/kubeval *.yaml

          echo "Kube-score test"
-          # will be fixed and enabled again in https://telecominfraproject.atlassian.net/browse/WIFI-1258
-          /tmp/k8s-validators/kube-score score *.yaml || true
+          /tmp/k8s-validators/kube-score score *.yaml
--- a/.github/workflows/nightly-scenario-test.yml
+++ b/.github/workflows/nightly-scenario-test.yml
@@ -1,98 +0,0 @@
-name: Nightly testing of all supported deployment scenarios
-
-on:
-  workflow_dispatch:
-  schedule:
-  - cron: '15 0 * * *'
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  microk8s:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout PKI scripts repo
-      uses: actions/checkout@v2
-      with:
-        path: wlan-pki-cert-scripts
-        repository: Telecominfraproject/wlan-pki-cert-scripts
-
-    - name: Checkout Cloud SDK repo
-      uses: actions/checkout@v2
-      with:
-        path: wlan-cloud-helm
-        repository: Telecominfraproject/wlan-cloud-helm
-
-    - name: Generate and copy certs
-      working-directory: wlan-pki-cert-scripts
-      run: |
-        ./generate_all.sh
-        ./copy-certs-to-helm.sh ../wlan-cloud-helm
-
-    - name: Determine public IP address
-      id: ip
-      uses: haythem/public-ip@v1.2
-
-    - uses: balchua/microk8s-actions@v0.2.1
-      with:
-        channel: 'latest/stable'
-        addons: '["dns", "helm3", "storage", "metallb:${{ steps.ip.outputs.ipv4 }}-${{ steps.ip.outputs.ipv4 }}"]'
-
-    - name: Deploy Cloud SDK
-      working-directory: wlan-cloud-helm
-      run: |
-        helm dependency update tip-wlan
-        # Github runners only have 2 CPU cores and 7GB of RAM. Thus we need to disable some of our resource requests
-        helm upgrade --install tip-wlan tip-wlan -f tip-wlan/example-values/microk8s-basic/values.yaml --create-namespace --namespace tip --set cassandra.resources=null --wait --timeout 10m
-
-    - name: Show pod state on deployment failure
-      if: failure()
-      run: |
-        kubectl get pods -n tip
-        kubectl describe pods -n tip
-
-    - name: Set custom DNS entries
-      run: |
-        sudo sh -c "echo -n \"\n${{ steps.ip.outputs.ipv4 }} wlan-ui.wlan.local wlan-ui-graphql.wlan.local\" >> /etc/hosts"
-
-    - name: Test HTTP endpoints
-      run: |
-        # this is needed to make until work
-        set +e
-
-        urls="https://wlan-ui.wlan.local https://wlan-ui-graphql.wlan.local/graphql"
-        for url in $urls; do
-          max_retry=300
-          counter=0
-          until curl --silent --insecure $url > /dev/null
-          do
-             sleep 1
-             [[ counter -eq $max_retry ]] && echo "$url not reachable after $counter tries...giving up" && exit 1
-             echo "#$counter: $url not reachable. trying again..."
-             ((counter++))
-          done
-          echo Successfully reached URL $url
-        done
-
-    - name: Test MQTT and OpenSync endpoints
-      working-directory: wlan-cloud-helm/tip-wlan/resources/certs
-      run: |
-        # this is needed to make until work
-        set +e
-
-        endpoints="${{ steps.ip.outputs.ipv4 }}:1883 ${{ steps.ip.outputs.ipv4 }}:6640 ${{ steps.ip.outputs.ipv4 }}:6643"
-        for endpoint in $endpoints; do
-          max_retry=300
-          counter=0
-          until echo Q | openssl s_client -connect $endpoint -CAfile cacert.pem -cert clientcert.pem -key clientkey.pem > /dev/null
-          do
-             sleep 1
-             [[ counter -eq $max_retry ]] && echo "$endpoint not reachable after $counter tries...giving up" && exit 1
-             echo "#$counter: $endpoint not reachable. trying again..."
-             ((counter++))
-          done
-          echo Successfully reached endpoint $endpoint
-        done
- 
--- a/.github/workflows/prepare-release-description.py
+++ b/.github/workflows/prepare-release-description.py
@@ -1,24 +0,0 @@
-import sys
-
-import keepachangelog
-
-CATEGORIES = ['added', 'changed', 'deprecated', 'removed', 'fixed', 'security']
-
-version = sys.argv[1]
-
-try:
-    changes = keepachangelog.to_dict("CHANGELOG.md")[version]
-except KeyError:
-    print(f'No changelog entry for version {version}', file=sys.stderr)
-    exit(1)
-
-
-print('## Changelog')
-for category in CATEGORIES:
-    entries = changes.get(category, [])
-
-    if entries:
-        print(f'### {category.capitalize()}') 
-
-    for entry in entries:
-        print(f'- {entry}') 
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -1,103 +0,0 @@
-name: CloudSDK deployment and testing
-
-env:
-  PR_NUMBER: ${{ github.event.number }}
-  HELM_RELEASE_PREFIX: tip-wlan
-  AWS_EKS_NAME: tip-wlan-main
-  AWS_DEFAULT_OUTPUT: json
-  AWS_DEFAULT_REGION: us-east-2
-  AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }}
-  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-
-on:
-  pull_request:
-     branches: [ master ]
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout required repos
-      uses: actions/checkout@v2
-      with:
-        path: wlan-pki-cert-scripts
-        repository: Telecominfraproject/wlan-pki-cert-scripts
-    - name: Checkout Cloud SDK repo
-      uses: actions/checkout@v2
-      with:
-        path: wlan-cloud-helm
-        repository: Telecominfraproject/wlan-cloud-helm
-    - name: Checkout helm values repo
-      uses: actions/checkout@v2
-      with:
-        path: Toolsmith
-        repository: Telecominfraproject/Toolsmith
-        token: ${{ secrets.PAT_TOKEN }}
-
-    - name: Generate Helm values file
-      run: |
-        ./Toolsmith/helm-values/aws-cicd-testing-pr-deployment.yaml.sh ${{ env.PR_NUMBER }} > pr-deployment.yaml
-
-    - name: Generate certs
-      working-directory: wlan-pki-cert-scripts
-      run: |
-        ./generate_all.sh
-        ./copy-certs-to-helm.sh ../wlan-cloud-helm
-
-    - name: Get kubeconfig for EKS ${{ env.AWS_EKS_NAME }}
-      run: |
-        aws eks update-kubeconfig --name ${{ env.AWS_EKS_NAME }}
-
-    - name: Deploy Cloud SDK
-      run: |
-        helm dependency update wlan-cloud-helm/${{ env.HELM_RELEASE_PREFIX }}
-        # using a timeout of 20 minutes as the EKS nodes may need to be scaled which takes some time
-        helm upgrade --install ${{ env.HELM_RELEASE_PREFIX }}-pr-${{ env.PR_NUMBER }} wlan-cloud-helm/tip-wlan -f pr-deployment.yaml --create-namespace --namespace ${{ env.HELM_RELEASE_PREFIX }}-pr-${{ env.PR_NUMBER }} --wait --timeout 20m
-
-  test:
-    runs-on: ubuntu-latest
-    needs: [ deploy ]
-    steps:
-    - name: Execute tests
-      run: |
-        echo Running tests...
-        # this is needed to make until work
-        set +e
-
-        urls="https://wlan-ui-pr-$PR_NUMBER.cicd.lab.wlan.tip.build https://wlan-graphql-pr-$PR_NUMBER.cicd.lab.wlan.tip.build/graphql"
-        for url in $urls; do
-          max_retry=300
-          counter=0
-          until curl --silent $url > /dev/null
-          do
-             sleep 1
-             [[ counter -eq $max_retry ]] && echo "$url not reachable after $counter tries...giving up" && exit 1
-             echo "#$counter: $url not reachable. trying again..."
-             ((counter++))
-          done
-          echo Successfully reached URL $url
-        done
-
-        echo Tests were successful
-
-  cleanup:
-    runs-on: ubuntu-latest
-    needs: [ deploy, test ]
-    if: ${{ always() }}
-    steps:
-    - name: Get kubeconfig for EKS ${{ env.AWS_EKS_NAME }}
-      run: |
-        aws eks update-kubeconfig --name ${{ env.AWS_EKS_NAME }}
-
-    - name: Delete Cloud SDK Helm release
-      run: |
-        helm delete ${{ env.HELM_RELEASE_PREFIX }}-pr-${{ env.PR_NUMBER }} --namespace ${{ env.HELM_RELEASE_PREFIX }}-pr-${{ env.PR_NUMBER }} || true
-
-    - name: Delete namespace
-      run: |
-        kubectl delete namespace ${{ env.HELM_RELEASE_PREFIX }}-pr-${{ env.PR_NUMBER }} --wait=true --ignore-not-found true
--- a/.gitignore
+++ b/.gitignore
@@ -4,14 +4,14 @@
 *.p12
 *.csr
 *.cnf
-*.key
 *.DS_Store
+*.lock

 # local development
-*.lock
 *.local_dev
+tip-wlan/resources/certs
+tip-wlan/resources/scripts
+tip-wlan/templates

-*.zip
-*.tgz
 stern*
-helmfile
+*.tgz
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,63 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [Unreleased] - YYYY-MM-DD
-
-### Added
-
- export servo MBeans with JMX Prometheus exporter [#65](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/65)
- render post-deployment message [#73](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/73)
-
-### Changed
-
- migrate to networking.k8s.io/v1 API version for Ingress resources [#74](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/74)
-
-## [1.0.1] - 2021-04-12
-
-### Changed
-
- bump cloud controller version to 1.0.1
-
-### Fixed
-
- correct SQL and CQL schema URLs
-
-### Changed
-
- make images for all init containers configurable [#67](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/67)
-
-## [1.0.0] - 2021-04-01
-
-### Added
-
- replaced cassandra, postgres and kafka with upstream charts [#49](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/49)
- centralized secrets to the parent chart [#54](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/54)
-
-### Changed
-
- improved kafka setup templating [#53](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/53)
- improved values.yaml [#53](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/53)
- improved default values and added yaml anchors [#54](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/54)
- make SSC service able to reconnect to Cassandra [#70](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/70)
-
-### Removed
-
- removed hardcoded docker secret in favor of variables [#53](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/53)
- various outdated sections in values.yaml and environment files
- various secrets in subcharts as they are now part of the parent chart
- references to vendor specific values [#40](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/40)
-
-### Fixed
-
- make SSC service able to reconnect to Cassandra [#70](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/70)
-
-## [0.4.0] - 2021-01-28
-
-### Added
-
- initial changelog entry. This is the first versioned release. Next releases will include a detailed overview of all the major changes introduced since the last version.
- [changes since first commit](https://github.com/Telecominfraproject/wlan-cloud-helm/compare/f7c67645736e3dac498e2caec8c267f04d08b7bc...v0.4)
--- a/README.md
+++ b/README.md
@@ -1,68 +1,16 @@
 # wlan-cloud-helm
 This repository contains helm charts for various deployment types of the tip wlan cloud services.

-# IMPORTANT - Cloud Controller Helm charts v0.4 to v1.x migration procedure
-
-We've introduced breaking changes to how Cloud Controller database charts are managed.
-If you want to preserve your data when moving from v0.4 to v1.x of the Cloud Controller Helm charts, follow the steps outlined below.
-If you can re-install your Cloud Controller and don't care to loose your data, you can skip the steps and just install the upstream charts version with no changes to the default installation procedure.
-
-## Prerequisites
-
-1. Checkout latest wlan-cloud-helm repository
-2. Have your certificates for existing installation
-3. Helm 3.2+
-
-## Procedure
-
-All of the commands should be run under tip-wlan-helm directory.
-
-1. Delete your current Helm release. The following commands will remove the pods, however, the PVC (your databases data) **won't be deleted**:
-```
-helm list -n default (to look up the name of the release)
-helm uninstall -n default tip-wlan (tip-wlan is usually the name of the release)
-```
-2. Replace `REPLACEME` with your storage class name in the `tip-wlan/resources/environments/migration.yaml` file. You can check the available storageclasses with the `kubectl get storageclass` command.
-3. Update your values file that you used for deploying the original release with the values from `migration.yaml` to preserve existing cassandra\postgres data (or skip that step and use the second upgrade command mentioned in #7)
-4. If you want to preserve the PKI certificates from the original Helm installation, copy them to a new location using the command below (or checkout the latest wlan-pki-cert-script repo and use `copy-certs-to-helm.sh %path_to_new_helm_code%` to generate new self-signed keys):
-```
-find . -regextype posix-extended -regex '.+(jks|pem|key|pkcs12|p12)$' -exec cp "{}" tip-wlan/resources/certs/ \;
-```
-5. Remove the old charts from the helm directory, so that the upgrade command can successfully pull new chart depedencies:
-```
-rm -rf tip-wlan/charts/cassandra tip-wlan/charts/kafka tip-wlan/charts/postgresql
-```
-6. Pull 3rd party subcharts:
-```
-helm dependency update tip-wlan
-```
-7. Perform Helm upgrade:
-```
-helm upgrade --install tip-wlan tip-wlan/ --namespace tip --create-namespace -f tip-wlan/resources/environments/your_values_with_fixes.yaml
-```
-
-Alternatively, you can run the upgrade command as follows (the order of the -f arguments is important!):
-
-```
-helm upgrade --install tip-wlan tip-wlan/ --namespace tip --create-namespace -f tip-wlan/resources/environments/original_values.yaml -f tip-wlan/resources/environments/migration.yaml
-```
-
-As a precaution you can also run `helm template` with the same arguments as the upgrade command and examine the output before actually installing the chart
-
 # Deploying the wlan-cloud deployment
-Run the following command under tip-wlan-helm directory:
-```
-helm dependency update tip-wlan
-helm upgrade --install <RELEASE_NAME> tip-wlan/ --namespace tip  --create-namespace -f tip-wlan/resources/environments/dev.yaml
-```
-
-More details can be found here: https://telecominfraproject.atlassian.net/wiki/spaces/WIFI/pages/262176803/Pre-requisites+before+deploying+Tip-Wlan+solution
+ - Run the following command under tip-wlan-helm directory:
+ 	- helm install <RELEASE_NAME> tip-wlan/ -n default -f tip-wlan/resources/environments/dev.yaml
+	
+	More details can be found here: https://telecominfraproject.atlassian.net/wiki/spaces/WIFI/pages/262176803/Pre-requisites+before+deploying+Tip-Wlan+solution

 # Deleting the wlan-cloud deployment:
-Run the following command:
-```
-helm del tip-wlan -n tip (replace the namespace with your namespace)
-```
+- Run the following command:
+	- helm del tip-wlan -n default
+	
 	(Note: this would not delete the tip namespace and any PVC/PV/Endpoints under this namespace. These are needed so we can reuse the same PVC mount when the pods are restarted.)
 	
 	To get rid of them (PVC/PV/Endpoints), you can use the following script (expects that you are in the `tip` namespace or add `-n tip` to the below set of commands):
@@ -98,6 +46,7 @@ helm del tip-wlan -n tip (replace the namespace with your namespace)
 	- 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:
@@ -108,6 +57,7 @@ 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
@@ -142,17 +92,13 @@ done

 Run minikube:

-```
-minikube start --memory=10g --cpus=4 --driver=virtualbox --extra-config=kubelet.serialize-image-pulls=false --extra-config=kubelet.image-pull-progress-deadline=3m0s --docker-opt=max-concurrent-downloads=10
-```
+```minikube start --memory=10g --cpus=4 --driver=virtualbox --extra-config=kubelet.serialize-image-pulls=false --extra-config=kubelet.image-pull-progress-deadline=3m0s --docker-opt=max-concurrent-downloads=10```

 Please note that you may choose another driver (parallels, vmwarefusion, hyperkit, vmware, docker, podman) which might be more suitable for your setup. Omitting this option enables auto discovery of available drivers.

-Deploy Cloud Controller chart:
+Deploy CloudSDK chart:

-```
-helm upgrade --install tip-wlan tip-wlan -f tip-wlan/resources/environments/dev-local.yaml -n default
-```
+```helm upgrade --install tip-wlan tip-wlan -f tip-wlan/resources/environments/dev-local.yaml -n default```

 Wait a few minutes, when all pods are in `Running` state, obtain web ui link with `minikube service tip-wlan-wlan-cloud-static-portal -n tip --url`, open in the browser. Importing or trusting certificate might be needed.

@@ -187,6 +133,7 @@ Firefox:
 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):
@@ -226,4 +173,4 @@ xDG3eKlu+dllUtKx/PN6yflbT5xcGgcdmrwzRaWS

 ```

-2. Double click on it, enter the system admin password, if prompted.
+2. Double click on it, enter the system admin password, if prompted.
--- a/glusterfs/README.md
+++ b/glusterfs/README.md
@@ -28,6 +28,7 @@ For other issues faced during deployment, see here:
    - If namespace is passed, we will create (if it does not exist) and use that namespace for glusterFS resources.
    - If namespace is NOT passed, we will create (if it does not exist) namespace='gluster-ns' and use it for glusterFS resources.

+
 - Deletion:
  ./gk-deploy --admin-key <ADMIN_KEY> --user-key <USER_KEY> --abort -v -n <GLUSTER_NAMESPACE>
    - Note: 
--- a/glusterfs/gk-deploy
+++ b/glusterfs/gk-deploy
@@ -990,6 +990,7 @@ parameters:
  output ""
 fi

+
 if [[ ${DEPLOY_OBJECT} -eq 1 ]] && [[ "${OBJ_ACCOUNT}" != "" ]] && [[ "${OBJ_USER}" != "" ]] && [[ "${OBJ_PASSWORD}" != "" ]] && [[ ${EXISTS_OBJECT} -eq 0 ]]; then
  if [[ "${OBJ_STORAGE_CLASS}" == "glusterfs-for-s3" ]]; then
    eval_output "${CLI} create secret generic heketi-${NAMESPACE}-admin-secret --from-literal=key=${ADMIN_KEY} --type=kubernetes.io/glusterfs"
--- a/tip-wlan/Chart.yaml
+++ b/tip-wlan/Chart.yaml
@@ -14,11 +14,11 @@ 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: 1.0.0
+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: 1.0.0
+appVersion: 1.16.0

 home: https://telecominfraproject.com/wifi/
 sources:
@@ -65,16 +65,16 @@ dependencies:
  condition: nginx-ingress-controller.enabled
 - name: common
  version: 0.1.0
-
+- name: zookeeper
+  version: 0.1.0
+  condition: zookeeper.enabled
 - name: kafka
-  version: 12.2.0
-  repository: https://charts.bitnami.com/bitnami
+  version: 0.1.0
  condition: kafka.enabled
 - name: postgresql
  version: 10.1.0
  repository: https://charts.bitnami.com/bitnami
  condition: postgresql.enabled
 - name: cassandra
-  version: 7.0.1
-  repository: https://charts.bitnami.com/bitnami
+  version: 5.5.3
  condition: cassandra.enabled
--- a/tip-wlan/charts/cassandra/.helmignore
+++ b/tip-wlan/charts/cassandra/.helmignore
@@ -0,0 +1,21 @@
+# 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
--- a/tip-wlan/charts/cassandra/Chart.yaml
+++ b/tip-wlan/charts/cassandra/Chart.yaml
@@ -0,0 +1,21 @@
+name: cassandra
+apiVersion: v2
+version: 5.5.3
+appVersion: 3.11.6
+description: Apache Cassandra is a free and open-source distributed database management system 
+  designed to handle large amounts of data across many commodity servers, providing high 
+  availability with no single point of failure. 
+  Cassandra offers robust support for clusters spanning multiple datacenters, with asynchronous
+  masterless replication allowing low latency operations for all clients.
+keywords:
+  - cassandra
+  - database
+  - nosql
+icon: https://upload.wikimedia.org/wikipedia/commons/thumb/5/5e/Cassandra_logo.svg/330px-Cassandra_logo.svg.png
+sources:
+  - https://github.com/bitnami/bitnami-docker-cassandra
+home: http://cassandra.apache.org
+maintainers:
+  - name: Bitnami
+    email: containers@bitnami.com
+engine: gotpl
--- a/tip-wlan/charts/cassandra/resources/config/certs/README.md
+++ b/tip-wlan/charts/cassandra/resources/config/certs/README.md
@@ -0,0 +1 @@
+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
--- a/tip-wlan/charts/cassandra/resources/config/cqlshrc.default
+++ b/tip-wlan/charts/cassandra/resources/config/cqlshrc.default
@@ -24,6 +24,7 @@ password = cassandra
 ; keyspace = ks1


+
 [ui]
 ;; Whether or not to display query results with colors
 color = on
@@ -66,10 +67,12 @@ color = on
 ;; A version of CQL to use (this should almost never be set)
 ; version = 3.2.1

+
+
 [connection]

 ;; The host to connect to
-hostname = {{ include "cassandra.service" . }}
+hostname = tip-wlan-cassandra-headless

 ;; The port to connect to (9042 is the native protocol default)
 port = 9042
@@ -84,16 +87,19 @@ ssl = true
 ; 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

@@ -107,12 +113,14 @@ userkey = /opt/tip-wlan/certs/cassandraserverkey_dec.pem
 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]

@@ -151,6 +159,7 @@ usercert = /opt/tip-wlan/certs/cassandraservercert.pem
 ; ratefile =


+
 ;; Options specific to COPY TO
 ; [copy-to]

@@ -177,6 +186,7 @@ usercert = /opt/tip-wlan/certs/cassandraservercert.pem
 ; encoding = utf8


+
 ;; Options specific to COPY FROM
 ; [copy-from]

@@ -211,6 +221,7 @@ usercert = /opt/tip-wlan/certs/cassandraservercert.pem
 ; chunksize =  1000


+
 ;; The options for COPY can also be specified per-table.  The following
 ;; three sections demonstrate this.

--- a/tip-wlan/charts/cassandra/resources/config/cqlshrc.tip-wlan
+++ b/tip-wlan/charts/cassandra/resources/config/cqlshrc.tip-wlan
@@ -0,0 +1,238 @@
+; 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
--- a/tip-wlan/charts/cassandra/templates/NOTES.txt
+++ b/tip-wlan/charts/cassandra/templates/NOTES.txt
@@ -0,0 +1,65 @@
+** Please be patient while the chart is being deployed **
+
+Cassandra can be accessed through the following URLs from within the cluster:
+
+  - CQL: {{ template "common.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.cluster.domain }}:{{ .Values.service.port }}
+  - Thrift: {{ template "common.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.cluster.domain }}:{{ .Values.service.thriftPort }}
+
+To get your password run:
+
+   export CASSANDRA_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "common.fullname" . }} -o jsonpath="{.data.cassandra-password}" | base64 --decode)
+
+Check the cluster status by running:
+
+   kubectl exec -it --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ template "common.name" . }},release={{ .Release.Name }} -o jsonpath='{.items[0].metadata.name}') nodetool status
+
+To connect to your Cassandra cluster using CQL:
+
+1. Run a Cassandra pod that you can use as a client:
+
+   kubectl run --namespace {{ .Release.Namespace }} {{ template "common.fullname" . }}-client --rm --tty -i --restart='Never' \
+   --env CASSANDRA_PASSWORD=$CASSANDRA_PASSWORD \
+   {{ if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}--labels="{{ template "common.name" . }}-client=true"{{ end }} \
+   --image {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }} -- bash
+
+2. Connect using the cqlsh client:
+
+   cqlsh -u {{ .Values.dbUser.user }} -p $CASSANDRA_PASSWORD {{ template "common.fullname" . }}
+
+{{ if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}
+Note: Since NetworkPolicy is enabled, only pods with label
+"{{ template "common.fullname" . }}-client=true"
+will be able to connect to Cassandra.
+{{- else -}}
+
+To connect to your database from outside the cluster execute the following commands:
+
+{{- if contains "NodePort" .Values.service.type }}
+
+   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "common.fullname" . }})
+
+   cqlsh -u {{ .Values.dbUser.user }} -p $CASSANDRA_PASSWORD $NODE_IP $NODE_PORT
+
+{{- else if contains "LoadBalancer" .Values.service.type }}
+
+   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+         Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "common.fullname" . }}'
+
+   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "common.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+   cqlsh -u {{ .Values.dbUser.user }} -p $CASSANDRA_PASSWORD $SERVICE_IP
+
+{{- else if contains "ClusterIP" .Values.service.type }}
+
+   kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "common.fullname" . }} {{ .Values.service.port }}:{{ .Values.service.port }} &
+   cqlsh -u {{ .Values.dbUser.user }} -p $CASSANDRA_PASSWORD 127.0.0.1 {{ .Values.service.port }}
+
+{{- end }}
+{{- end }}
+
+{{- if and (contains "bitnami/" .Values.image.repository) (not (.Values.image.tag | toString | regexFind "-r\\d+$|sha256:")) }}
+
+WARNING: Rolling tag detected ({{ .Values.image.repository }}:{{ .Values.image.tag }}), please note that it is strongly recommended to avoid using rolling tags in a production environment.
+info https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/
+
+{{- end }}
--- a/tip-wlan/charts/cassandra/templates/_helpers.tpl
+++ b/tip-wlan/charts/cassandra/templates/_helpers.tpl
@@ -0,0 +1,71 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Return the appropriate apiVersion for networkpolicy.
+*/}}
+{{- define "networkPolicy.apiVersion" -}}
+{{- if semverCompare ">=1.4-0, <1.7-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "extensions/v1beta1" -}}
+{{- else -}}
+{{- print "networking.k8s.io/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper metrics image name
+*/}}
+{{- define "cassandra.metrics.image" -}}
+{{- $registryName := .Values.metrics.image.registry -}}
+{{- $repositoryName := .Values.metrics.image.repository -}}
+{{- $tag := .Values.metrics.image.tag | toString -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
+Also, we can't use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+    {{- if .Values.global.imageRegistry }}
+        {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
+    {{- else -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper image name (for the init container volume-permissions image)
+*/}}
+{{- define "cassandra.volumePermissions.image" -}}
+{{- $registryName := .Values.volumePermissions.image.registry -}}
+{{- $repositoryName := .Values.volumePermissions.image.repository -}}
+{{- $tag := .Values.volumePermissions.image.tag | toString -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
+Also, we can't use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+    {{- if .Values.global.imageRegistry }}
+        {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
+    {{- else -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Renders a value that contains template.
+Usage:
+{{ include "cassandra.tplValue" ( dict "value" .Values.path.to.the.Value "context" $) }}
+*/}}
+{{- define "cassandra.tplValue" -}}
+    {{- if typeIs "string" .value }}
+        {{- tpl .value .context }}
+    {{- else }}
+        {{- tpl (.value | toYaml) .context }}
+    {{- end }}
+{{- end -}}
--- a/tip-wlan/charts/cassandra/templates/configmap.yaml
+++ b/tip-wlan/charts/cassandra/templates/configmap.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cassandra-configurations-override
+  namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
--- a/tip-wlan/charts/cassandra/templates/headless-svc.yaml
+++ b/tip-wlan/charts/cassandra/templates/headless-svc.yaml
@@ -0,0 +1,29 @@
+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 }}
--- a/tip-wlan/charts/cassandra/templates/networkpolicy.yaml
+++ b/tip-wlan/charts/cassandra/templates/networkpolicy.yaml
@@ -0,0 +1,38 @@
+{{- 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 }}
--- a/tip-wlan/charts/cassandra/templates/secret.yaml
+++ b/tip-wlan/charts/cassandra/templates/secret.yaml
@@ -0,0 +1,40 @@
+{{- 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 }}
--- a/tip-wlan/charts/cassandra/templates/service.yaml
+++ b/tip-wlan/charts/cassandra/templates/service.yaml
@@ -0,0 +1,32 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.fullname" . }}
+  namespace: {{ include "common.namespace" . }}
+  labels: {{- include "common.labels" . | nindent 4 }}
+  annotations: {{ include "cassandra.tplValue" ( dict "value" .Values.service.annotations "context" $) | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  {{- if and (eq .Values.service.type "LoadBalancer") (not (empty .Values.service.loadBalancerIP)) }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
+  ports:
+    - name: cql
+      port: {{ .Values.service.port }}
+      targetPort: cql
+      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.cql)) }}
+      nodePort: {{ .Values.service.nodePorts.cql }}
+      {{- else if eq .Values.service.type "ClusterIP" }}
+      nodePort: null
+      {{- end }}
+    {{- if .Values.cluster.enableRPC }}
+    - name: thrift
+      port: {{ .Values.service.thriftPort }}
+      targetPort: thrift
+      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.thrift)) }}
+      nodePort: {{ .Values.service.nodePorts.thrift }}
+      {{- else if eq .Values.service.type "ClusterIP" }}
+      nodePort: null
+      {{- end }}
+    {{- end }}
+  selector: {{- include "common.selectorLabels" . | nindent 4 }}
--- a/tip-wlan/charts/cassandra/templates/statefulset.yaml
+++ b/tip-wlan/charts/cassandra/templates/statefulset.yaml
@@ -0,0 +1,306 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: {{ include "common.fullname" . }}
+  namespace: {{ include "common.namespace" . }}
+  labels: {{- include "common.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels: {{- include "common.selectorLabels" . | nindent 6 }}
+  serviceName: {{ include "common.fullname" . }}-headless
+  replicas: {{ .Values.cluster.replicaCount }}
+  updateStrategy:
+    type: {{ .Values.statefulset.updateStrategy }}
+    {{- if (eq "Recreate" .Values.statefulset.updateStrategy) }}
+    rollingUpdate: null
+    {{- else if .Values.statefulset.rollingUpdatePartition }}
+    rollingUpdate:
+      partition: {{ .Values.statefulset.rollingUpdatePartition }}
+    {{- end }}
+  template:
+    metadata:
+      labels: {{- include "common.labels" . | nindent 8 }}
+      {{- if .Values.podLabels }}
+      {{- toYaml .Values.podLabels | nindent 8 }}
+      {{- end }}
+      {{- if or .Values.podAnnotations (and .Values.metrics.enabled .Values.metrics.podAnnotations) }}
+      annotations:
+        {{- if .Values.podAnnotations }}
+        {{- toYaml .Values.podAnnotations | nindent 8 }}
+        {{- end }}
+        {{- if .Values.metrics.podAnnotations }}
+        {{- toYaml .Values.metrics.podAnnotations | nindent 8 }}
+        {{- end }}
+      {{- end }}
+    spec:
+      {{- if .Values.affinity }}
+      affinity: {{- include "cassandra.tplValue" (dict "value" .Values.affinity "context" $) | nindent 8 }}
+      {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector: {{- include "cassandra.tplValue" (dict "value" .Values.nodeSelector "context" $) | nindent 8 }}
+      {{- end }}
+      {{- if .Values.tolerations }}
+      tolerations: {{- include "cassandra.tplValue" (dict "value" .Values.tolerations "context" $) | nindent 8 }}
+      {{- end }}
+      {{- if .Values.securityContext.enabled }}
+      securityContext:
+        fsGroup: {{ .Values.securityContext.fsGroup }}
+        runAsUser: {{ .Values.securityContext.runAsUser }}
+      {{- end }}
+      {{- if and .Values.volumePermissions.enabled .Values.persistence.enabled }}
+      initContainers:
+        - name: volume-permissions
+          image: {{ include "cassandra.volumePermissions.image" . }}
+          imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }}
+          command:
+            - /bin/bash
+            - -ec
+            - |
+              chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }} /bitnami/cassandra
+          securityContext:
+            runAsUser: 0
+          {{- if .Values.volumePermissions.resources }}
+          resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            - name: data
+              mountPath: /bitnami/cassandra
+      {{- end }}
+      containers:
+        - name: cassandra
+          command:
+            - bash
+            - -ec
+            # Node 0 is the password seeder
+            - |
+              if [[ $HOSTNAME =~ (.*)-0$ ]]; then
+                echo "Setting node as password seeder"
+                export CASSANDRA_PASSWORD_SEEDER=yes
+              else
+                # Only node 0 will execute the startup initdb scripts
+                export CASSANDRA_IGNORE_INITDB_SCRIPTS=1
+              fi
+              {{ .Values.entrypoint }} {{ .Values.cmd }}
+          image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
+          imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
+          env:
+            - name: BITNAMI_DEBUG
+              value: {{ ternary "true" "false" .Values.image.debug | quote }}
+            - name: CASSANDRA_CLUSTER_NAME
+              value: {{ .Values.cluster.name }}
+            - name: CASSANDRA_SEEDS
+              {{- $global := . }}
+              {{- $replicas := .Values.cluster.seedCount | int }}
+              {{- $domain := .Values.cluster.domain }}
+              value: "{{- range $i, $e := until $replicas }}{{ include "common.fullname" $global }}-{{ $i }}.{{ include "common.fullname" $global }}-headless.{{ $global.Values.global.nsPrefix }}.svc.{{ $domain }}{{- if (lt ( add1 $i ) $replicas ) }},{{- end }}{{- end }}"
+            - name: CASSANDRA_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ if .Values.dbUser.existingSecret }}{{ .Values.dbUser.existingSecret }}{{- else }}{{ include "common.fullname" . }}{{- end }}
+                  key: cassandra-password
+            - name: POD_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: CASSANDRA_USER
+              value: {{ .Values.dbUser.user | quote }}
+            - name: CASSANDRA_NUM_TOKENS
+              value: {{ .Values.cluster.numTokens | quote }}
+            - name: CASSANDRA_DATACENTER
+              value: {{ .Values.cluster.datacenter }}
+            - name: CASSANDRA_ENDPOINT_SNITCH
+              value: {{ .Values.cluster.endpointSnitch }}
+            {{- if   .Values.tlsEncryptionSecretName }}
+            - name: CASSANDRA_INTERNODE_ENCRYPTION
+              value: {{ .Values.cluster.internodeEncryption | quote }}
+            - name: CASSANDRA_CLIENT_ENCRYPTION
+              value: {{ .Values.cluster.clientEncryption | quote }}
+            - name: CASSANDRA_TRUSTSTORE_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.tlsEncryptionSecretName }}
+                  key: truststore-password
+            - name: CASSANDRA_KEYSTORE_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.tlsEncryptionSecretName }}
+                  key: keystore-password
+            {{- end }}
+            - name: CASSANDRA_RACK
+              value: {{ .Values.cluster.rack }}
+            {{- if .Values.jvm.maxHeapSize }}
+            - name: MAX_HEAP_SIZE
+              value: {{ .Values.jvm.maxHeapSize | quote }}
+            {{- end }}
+            {{- if .Values.jvm.newHeapSize }}
+            - name: HEAP_NEWSIZE
+              value: {{ .Values.jvm.newHeapSize | quote }}
+            {{- end }}
+            {{- if .Values.jvm.extraOpts }}
+            - name: JVM_EXTRA_OPTS
+              value: {{ .Values.jvm.extraOpts | quote }}
+            {{- end }}
+            - name: CASSANDRA_ENABLE_RPC
+              value: {{ .Values.cluster.enableRPC | quote }}
+            {{- if .Values.cluster.enableUDF }}
+            - name: CASSANDRA_ENABLE_USER_DEFINED_FUNCTIONS
+              value: {{ .Values.cluster.enableUDF | quote }}
+            {{- end }}
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            exec:
+              command: ["/bin/sh", "-c", "nodetool status"]
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            exec:
+              command: ["/bin/sh", "-c", "nodetool status | grep -E \"^UN\\s+${POD_IP}\""]
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+          {{- end }}
+          {{- if not .Values.persistence.enabled }}
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - bash
+                  - -ec
+                  - nodetool decommission
+          {{- end }}
+          ports:
+            - name: intra
+              containerPort: 7000
+            - name: tls
+              containerPort: 7001
+            - name: jmx
+              containerPort: 7199
+            - name: cql
+              containerPort: 9042
+            {{- if .Values.cluster.enableRPC }}
+            - name: thrift
+              containerPort: 9160
+            {{- end }}
+          {{- if .Values.resources }}
+          resources: {{ toYaml .Values.resources | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            - name: data
+              mountPath: /bitnami/cassandra
+            {{- if .Values.tlsEncryptionSecretName }}
+            - name: encryption-secrets
+              mountPath: /bitnami/cassandra/secrets
+            {{- end }}
+            {{- if .Values.initDBConfigMap }}
+            - name: init-db-cm
+              mountPath: /docker-entrypoint-initdb.d/configmap
+            {{- end }}
+            {{- if .Values.initDBSecret }}
+            - name: init-db-secret
+              mountPath: /docker-entrypoint-initdb.d/secret
+            {{- end }}
+            {{ if .Values.existingConfiguration }}
+            - name: configurations
+              mountPath: /bitnami/cassandra/conf
+            {{- end }}
+            - mountPath: /opt/tip-wlan/certs/cacert.pem
+              name: cassandra-client-certificates
+              subPath: cacert.pem
+            - mountPath: /opt/tip-wlan/certs/cassandraservercert.pem
+              name: cassandra-client-certificates
+              subPath: cassandraservercert.pem
+            - mountPath: /opt/tip-wlan/certs/cassandraserverkey_dec.pem
+              name: cassandra-client-certificates
+              subPath: cassandraserverkey_dec.pem              
+        {{- if .Values.metrics.enabled }}
+        - name: metrics
+          image: {{ include "cassandra.metrics.image" . }}
+          imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }}
+          ports:
+            - name: metrics
+              containerPort: 8080
+              protocol: TCP
+            - name: jmx
+              containerPort: 5555
+          {{- if .Values.metrics.resources }}
+          resources: {{- toYaml .Values.metrics.resources | nindent 12 }}
+          {{- end }}
+          livenessProbe:
+            tcpSocket:
+              port: metrics
+          readinessProbe:
+            httpGet:
+              path: /metrics
+              port: metrics
+            initialDelaySeconds: 20
+            timeoutSeconds: 45
+        {{- end }}
+      {{- if .Values.image.pullSecrets }}
+      imagePullSecrets:
+        - name: {{ .Values.image.pullSecrets }}
+      {{- end }}
+      volumes:
+        - name: cassandra-client-certificates
+          secret:
+            secretName: {{ include "common.fullname" . }}-client-certs
+        {{- if .Values.tlsEncryptionSecretName }}
+        - name: encryption-secrets
+          secret:
+            secretName: {{ .Values.tlsEncryptionSecretName }}
+            items:
+              - key: keystore
+                path: keystore
+              - key: truststore
+                path: truststore
+        {{- end }}
+        {{- if .Values.existingConfiguration }}
+        - name: configurations
+          configMap:
+            name: {{ tpl .Values.existingConfiguration $ }}
+        {{- end }}
+        {{- if .Values.initDBConfigMap }}
+        - name: init-db-cm
+          configMap:
+            name: {{ tpl .Values.initDBConfigMap $ }}
+        {{- end }}
+        {{- if .Values.initDBSecret }}
+        - name: init-db-secret
+          configMap:
+            name: {{ tpl .Values.initDBSecret $ }}
+        {{- end }}
+{{- if not .Values.persistence.enabled }}
+        - name: data
+          emptyDir: {}
+{{- else }}
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+        labels:
+          app: {{ include "common.name" . }}
+          release: {{ .Release.Name }}
+        {{- if .Values.persistence.annotations }}
+        annotations: {{- toYaml .Values.persistence.annotations | nindent 10 }}
+        {{- end }}
+      spec:
+        accessModes:
+          {{- range .Values.persistence.accessModes }}
+          - {{ . | quote }}
+          {{- end }}
+        resources:
+          requests:
+            storage: {{ .Values.persistence.size | quote }}
+      {{- if .Values.persistence.storageClass }}
+      {{- if (eq "-" .Values.persistence.storageClass) }}
+        storageClassName: ""
+      {{- else }}
+        storageClassName: "{{ .Values.persistence.storageClass }}"
+      {{- end }}
+      {{- end }}
+{{- end }}
--- a/tip-wlan/charts/cassandra/templates/tests/test-cassandra-record-insert-del.yaml
+++ b/tip-wlan/charts/cassandra/templates/tests/test-cassandra-record-insert-del.yaml
@@ -0,0 +1,53 @@
+{{- if .Values.testsEnabled -}}
+# NOTE: For the test to work, make sure that the cluster-size remains the same
+# if you are doing helm-del and then helm-install with existing pvc.
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{ include "common.fullname" . }}-test-insertion-deletion
+  namespace: {{ include "common.namespace" . }}
+  annotations:
+    "helm.sh/hook": test-success
+spec:
+  containers:
+  - name: {{ include "common.name" . }}-test-cassandra-basic
+    image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
+    command:
+    - sh
+    - -c
+    - |
+      cqlsh --cqlshrc /bitnami/cassandra/conf/cqlshrc.tip-wlan -e \
+      "CREATE KEYSPACE MYDB WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 }; \
+      use MYDB; \
+      CREATE TABLE BOOKS (id int PRIMARY KEY, title text, year text); \
+      INSERT INTO BOOKS (id, title, year) VALUES (1, 'Power Of Now', '1994'); \
+      SELECT * FROM BOOKS; \
+      DELETE FROM BOOKS WHERE id=1; \
+      SELECT * FROM BOOKS; \
+      DROP TABLE BOOKS; \
+      DROP KEYSPACE MYDB;"
+    volumeMounts:
+      {{ if .Values.existingConfiguration }}
+      - name: configurations
+        mountPath: /bitnami/cassandra/conf
+      {{- end }}
+      - mountPath: /opt/tip-wlan/certs/cacert.pem
+        name: cassandra-client-certificates
+        subPath: cacert.pem
+      - mountPath: /opt/tip-wlan/certs/cassandraservercert.pem
+        name: cassandra-client-certificates
+        subPath: cassandraservercert.pem
+      - mountPath: /opt/tip-wlan/certs/cassandraserverkey_dec.pem
+        name: cassandra-client-certificates
+        subPath: cassandraserverkey_dec.pem   
+  restartPolicy: Never
+  volumes:
+  {{- if .Values.existingConfiguration }}
+  - name: configurations
+    configMap:
+      name: {{ tpl .Values.existingConfiguration $ }}
+  {{- end }}
+  - name: cassandra-client-certificates
+    secret:
+      secretName: {{ include "common.fullname" . }}-client-certs
+{{- end }}
--- a/tip-wlan/charts/cassandra/values.yaml
+++ b/tip-wlan/charts/cassandra/values.yaml
@@ -0,0 +1,331 @@
+## Global Docker image parameters
+## Please, note that this will override the image parameters, including dependencies, configured to use the global value
+## Current available global Docker image parameters: imageRegistry and imagePullSecrets
+##
+# global:
+#   imageRegistry: myRegistryName
+#   imagePullSecrets:
+#     - myRegistryKeySecretName
+#   storageClass: myStorageClass
+
+## Bitnami Cassandra image version
+## ref: https://hub.docker.com/r/bitnami/cassandra/tags/
+##
+image:
+  registry: docker.io
+  repository: bitnami/cassandra
+  ## Bitnami Cassandra image tag
+  ## ref: https://github.com/bitnami/bitnami-docker-cassandra#supported-tags-and-respective-dockerfile-links
+  ##
+  tag: 3.11.6-debian-10-r138
+  ## Specify a imagePullPolicy
+  ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
+  ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+  ##
+  pullPolicy: 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
+
+## String to partially override cassandra.fullname template (will maintain the release name)
+##
+# nameOverride:
+
+## String to fully override cassandra.fullname template
+##
+# fullnameOverride:
+
+## Init containers parameters:
+## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section.
+##
+volumePermissions:
+  enabled: true
+  image:
+    registry: docker.io
+    repository: bitnami/minideb
+    tag: buster
+    pullPolicy: Always
+    ## Optionally specify an array of imagePullSecrets.
+    ## Secrets must be manually created in the namespace.
+    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    ##
+    # pullSecrets:
+    #   - myRegistryKeySecretName
+  ## Init container' resource requests and limits
+  ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
+  ##
+  resources:
+    # We usually recommend not to specify default resources and to leave this as a conscious
+    # choice for the user. This also increases chances charts run on environments with little
+    # resources, such as Minikube. If you do want to specify resources, uncomment the following
+    # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+    limits: {}
+    #   cpu: 100m
+    #   memory: 128Mi
+    requests: {}
+    #   cpu: 100m
+    #   memory: 128Mi
+
+## Service parameters
+##
+service:
+  ## Service type
+  ##
+  type: ClusterIP
+  ## CQL port
+  ##
+  port: 9042
+  ## Thrift Client API port
+  ##
+  thriftPort: 9160
+  ## Specify the nodePort(s) value(s) for the LoadBalancer and NodePort service types.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
+  ##
+  nodePorts:
+    cql: ""
+    thriftPort: ""
+  ## Set the LoadBalancer service type to internal only.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
+  ##
+  # loadBalancerIP:
+  ## Provide any additional annotations which may be required. This can be used to
+  ## set the LoadBalancer service type to internal only.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
+  ##
+  annotations: {}
+
+## Enable persistence using Persistent Volume Claims
+## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
+##
+persistence:
+  ## If true, use a Persistent Volume Claim, If false, use emptyDir
+  ##
+  enabled: false
+  ## Persistent Volume Storage Class
+  ## If defined, storageClassName: <storageClass>
+  ## If set to "-", storageClassName: "", which disables dynamic provisioning
+  ## If undefined (the default) or set to null, no storageClassName spec is
+  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+  ##   GKE, AWS & OpenStack)
+  ##
+  storageClass: "-"
+  ## Persistent Volume Claim annotations
+  ##
+  annotations:
+  ## Persistent Volume Access Mode
+  ##
+  accessModes:
+    - ReadWriteOnce
+  ## Persistent Volume size
+  ##
+  size: 1Gi
+
+## Cassandra pods' resource requests and limits
+## ref: http://kubernetes.io/docs/user-guide/compute-resources/
+## Minimum memory for development is 4GB and 2 CPU cores
+## Minimum memory for production is 8GB and 4 CPU cores
+## ref: http://docs.datastax.com/en/archived/cassandra/2.0/cassandra/architecture/architecturePlanningHardware_c.html
+##
+resources:
+  # 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
+  #   memory: 4Gi
+  requests: {}
+  #   cpu: 2
+  #   memory: 4Gi
+
+## Secret with keystore, keystore password, truststore, truststore password
+##
+tlsEncryptionSecretName: cassandra-ssl-certs
+## ConfigMap with custom cassandra configuration files. This overrides any other Cassandra configuration set in the chart
+##
+existingConfiguration: cassandra-configurations-override
+## Cluster parameters
+##
+cluster:
+  name: TipWlanCluster
+  replicaCount: 3
+  seedCount: 2
+  numTokens: 256
+  datacenter: DC1
+  rack: RAC1
+  enableRPC: true
+  endpointSnitch: SimpleSnitch
+  ## Enable the creation of the Pod Disruption Budget
+  ##
+  pdbEnabled: true
+  ## Minimum number of cluster nodes that will be running. Needs pdbEnabled=true
+  ##
+  minAvailable: 1
+  ## Maximum number of cluster nodes that may not be running. Needs pdbEnabled=true.
+  ##
+  # maxUnavailable: 1
+  ## Encryption values. NOTE: They require tlsEncryptionSecretName
+  ##
+  internodeEncryption: all
+  clientEncryption: true
+  domain: cluster.local
+
+## JVM Settings
+##
+jvm:
+  ## Extra JVM options
+  ##
+  extraOpts:
+
+  ## Memory settings: These are calculated automatically
+  ## unless specified otherwise
+  ##
+  # maxHeapSize: 4G
+  # newHeapSize: 800M
+
+## Database credentials
+##
+dbUser:
+  user: cassandra
+  forcePassword: false
+  password: cassandra
+  # existingSecret:
+
+## ConfigMap with cql scripts. Useful for creating a keyspace
+## and pre-populating data
+##
+# initDBConfigMap:
+
+## Secret with cql script (with sensitive data). Useful for creating a keyspace
+## and pre-populating data
+##
+# initDBSecret:
+
+## Cassandra container's liveness and readiness probes
+## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
+##
+livenessProbe:
+  enabled: true
+  initialDelaySeconds: 60
+  periodSeconds: 30
+  timeoutSeconds: 5
+  successThreshold: 1
+  failureThreshold: 5
+readinessProbe:
+  enabled: true
+  initialDelaySeconds: 60
+  periodSeconds: 10
+  timeoutSeconds: 5
+  successThreshold: 1
+  failureThreshold: 5
+
+## Additional pod annotations
+## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+##
+podAnnotations: {}
+
+## Additional pod labels
+## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+##
+podLabels: {}
+
+## Affinity for pod assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+##
+affinity: {}
+
+## Node labels for pod assignment. Evaluated as a template.
+## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+##
+nodeSelector: {}
+
+## Tolerations for pod assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+##
+tolerations: []
+
+## StatefulSet settings
+##
+statefulset:
+  updateStrategy: OnDelete
+  # rollingUpdatePartition:
+
+## Pod Security Context
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+##
+securityContext:
+  enabled: true
+  fsGroup: 1001
+  runAsUser: 1001
+
+## Container entrypoint and cmd (useful for using different images)
+##
+entrypoint: "/entrypoint.sh"
+cmd: "/run.sh"
+
+## Network policies
+## Ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
+##
+networkPolicy:
+  ## Specifies whether a NetworkPolicy should be created
+  ##
+  enabled: false
+
+  ## The Policy model to apply. When set to false, only pods with the correct
+  ## client label will have network access to the port Redis is listening
+  ## on. When true, Redis will accept connections from any source
+  ## (with the correct destination port).
+  ##
+  # allowExternal: true
+
+## Enable/disable the chart's tests.  Useful if using this chart as a dependency of
+## another chart and you don't want these tests running when trying to develop and
+## test your own chart.
+testsEnabled: true
+
+## Cassandra Prometheus exporter configuration
+## ref: https://hub.docker.com/r/bitnami/cassandra-exporter/tags/
+##
+metrics:
+  enabled: false
+  image:
+    registry: docker.io
+    pullPolicy: 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/
+  ##
+  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
--- a/tip-wlan/charts/common/charts/efs-provisioner/templates/deployment.yaml
+++ b/tip-wlan/charts/common/charts/efs-provisioner/templates/deployment.yaml
@@ -7,7 +7,7 @@ metadata:
    {{- include "common.labels" . | nindent 4 }}
 spec:
  replicas: {{ .Values.provisioner.replicaCount }}
-  strategy:
+  strategy: 
    type: {{ .Values.provisioner.strategyType }}
  selector:
    matchLabels:
--- a/tip-wlan/charts/common/templates/_env.tpl
+++ b/tip-wlan/charts/common/templates/_env.tpl
@@ -1,5 +1,12 @@
+{{/*
+  Resolve the environment variables to apply to a chart. The default namespace suffix
+  is the name of the chart. This can be overridden if necessary (eg. for subcharts)
+  using the following value:
+
+  - .Values.nsPrefix  : override namespace prefix
+*/}}
 {{- define "common.namespace" -}}
-  {{- .Release.Namespace -}}
+  {{- default .Values.global.nsPrefix -}}
 {{- end -}}

 {{- define "common.env" -}}
--- a/tip-wlan/charts/common/templates/_namespace.tpl
+++ b/tip-wlan/charts/common/templates/_namespace.tpl
@@ -0,0 +1,10 @@
+{{/*
+  Resolve the namespace to apply to a chart. The default namespace suffix
+  is the name of the chart. This can be overridden if necessary (eg. for subcharts)
+  using the following value:
+
+  - .Values.nsPrefix  : override namespace prefix
+*/}}
+{{- define "common.namespace" -}}
+  {{- default .Values.global.nsPrefix -}}
+{{- end -}}
--- a/tip-wlan/charts/common/templates/_ports.tpl
+++ b/tip-wlan/charts/common/templates/_ports.tpl
@@ -1,41 +1,24 @@
 {{/*
-    This template will be used to iterate through the access point debug ports and generate
-    access point debug ports mapping
+    This template will be used to iterate through the debug-ports and generate
+    debug-ports mapping
  */}}

-{{- define "apDebugPortsStart" -}}
-{{- $portPrefix := $.Values.global.nodePortPrefixExt | default $.Values.nodePortPrefixExt | int -}}
-{{- $start := $.Values.accessPointDebugPortRange.start | int -}}
-{{- $end := (add $.Values.accessPointDebugPortRange.start $.Values.accessPointDebugPortRange.length) | int -}}
-{{- printf "%d%d" $portPrefix $start -}}
-{{- end -}}
-
-{{- define "apDebugPortsEnd" -}}
-{{- $portPrefix := $.Values.global.nodePortPrefixExt | default $.Values.nodePortPrefixExt | int -}}
-{{- $start := $.Values.accessPointDebugPortRange.start | int -}}
-{{- $end := (add $.Values.accessPointDebugPortRange.start $.Values.accessPointDebugPortRange.length) | int -}}
-{{- printf "%d%d" $portPrefix $end -}}
-{{- end -}}
-
-
-{{- define "container.dev.apDebugPorts" -}}
-{{- $accessPointDebugPorts := untilStep (include "apDebugPortsStart" . | atoi) (include "apDebugPortsEnd" . | atoi) 1 -}}
-  {{- range $index, $port := $accessPointDebugPorts }}
-  - name: apdebugport-{{ $index }}
-    containerPort: {{ $port }}
+{{- define "container.dev.debugport" -}}
+  {{- range $index, $portid := .Values.debugPorts }}
+  - name: debugport-{{ $index }}
+    containerPort: {{ $portid }}
    protocol: TCP
  {{- end }}
 {{- end -}}

-{{- define "service.dev.apDebugPorts" -}}
-{{- $accessPointDebugPorts := untilStep (include "apDebugPortsStart" . | atoi) (include "apDebugPortsEnd" . | atoi) 1 -}}
-  {{- range $index, $port := $accessPointDebugPorts }}
-  - port: {{ $port }}
-    targetPort: {{ $port }}
+{{- define "service.dev.debugport" -}}
+  {{- range $index, $portid := .Values.debugPorts }}
+  - port: {{ $portid }}
+    targetPort: {{ $portid }}
    protocol: TCP
-    name: apdebugport-{{ $index }}
+    name: debugport-{{ $index }}
    {{- if eq $.Values.service.type "NodePort" }}
-    nodePort: {{ $port }}
-    {{- end }}
+    nodePort: {{ $portid }}
+    {{- end }}   
  {{- end }}
 {{- end -}}
--- a/tip-wlan/charts/common/templates/_svc.tpl
+++ b/tip-wlan/charts/common/templates/_svc.tpl
@@ -1,5 +1,5 @@
 {{/*
-    Resolve the Postgres service-name to apply to a chart.
+    Resolve the Postgres service-name to apply to a chart. 
 */}}
 {{- define "postgresql.service" -}}
  {{- printf "%s-%s" .Release.Name .Values.postgresql.url | trunc 63 -}}
@@ -16,67 +16,68 @@ else use user-provided URL
 {{- $zookeeperService := printf "%s-%s" .Release.Name .Values.zookeeper.url }}
 {{- default $zookeeperService }}
 {{- end -}}
-{{- end -}}
+{{- end -}}  

 {{/*
-  Resolve the Kafka service-name to apply to a chart.
+  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.
+  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.
+  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.
+  Resolve the integratedcloudcomponent service-name to apply to a chart. 
 */}}
 {{- define "integratedcloudcomponent.service" -}}
  {{- printf "%s-%s:%.f" .Release.Name .Values.integratedcloudcomponent.url .Values.integratedcloudcomponent.port | trunc 63 -}}
 {{- end -}}

 {{/*
-  Resolve the provisioning service-name to apply to a chart.
+  Resolve the provisioning service-name to apply to a chart. 
 */}}
 {{- define "prov.service" -}}
  {{- printf "%s-%s:%.f" .Release.Name .Values.prov.url .Values.prov.port | trunc 63 -}}
 {{- end -}}

 {{/*
-  Resolve the ssc service-name to apply to a chart.
+  Resolve the ssc service-name to apply to a chart. 
 */}}
 {{- 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.
+  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
+  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
+  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 -}}
+{{- end -}}
--- a/tip-wlan/charts/kafka/Chart.yaml
+++ b/tip-wlan/charts/kafka/Chart.yaml
@@ -0,0 +1,8 @@
+apiVersion: v2
+description: Apache Kafka is publish-subscribe messaging
+name: kafka
+version: 0.1.0
+appVersion: 1.0.0
+dependencies:
+  - name: zookeeper
+    version: 0.1.0
--- a/tip-wlan/charts/kafka/resources/config/certs/README.md
+++ b/tip-wlan/charts/kafka/resources/config/certs/README.md
@@ -1,2 +1,2 @@
-Contains certs needed for cloud controller to work
+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
--- a/tip-wlan/charts/kafka/templates/NOTES.txt
+++ b/tip-wlan/charts/kafka/templates/NOTES.txt
@@ -0,0 +1,67 @@
+### Connecting to Kafka from inside Kubernetes
+
+You can connect to Kafka by running a simple pod in the K8s cluster like this with a configuration like this:
+
+  apiVersion: v1
+  kind: Pod
+  metadata:
+    name: testclient
+    namespace: {{ .Release.Namespace }}
+  spec:
+    containers:
+    - name: kafka
+      image: {{ .Values.image }}:{{ .Values.imageTag }}
+      command:
+        - sh
+        - -c
+        - "exec tail -f /dev/null"
+
+Once you have the testclient pod above running, you can list all kafka
+topics with:
+
+  kubectl -n {{ .Release.Namespace }} exec testclient -- kafka-topics --zookeeper {{ .Release.Name }}-zookeeper:2181 --list
+
+To create a new topic:
+
+  kubectl -n {{ .Release.Namespace }} exec testclient -- kafka-topics --zookeeper {{ .Release.Name }}-zookeeper:2181 --topic test1 --create --partitions 1 --replication-factor 1
+
+To listen for messages on a topic:
+
+  kubectl -n {{ .Release.Namespace }} exec -ti testclient -- kafka-console-consumer --bootstrap-server {{ include "common.fullname" . }}:9092 --topic test1 --from-beginning
+
+To stop the listener session above press: Ctrl+C
+
+To start an interactive message producer session:
+  kubectl -n {{ .Release.Namespace }} exec -ti testclient -- kafka-console-producer --broker-list {{ include "common.fullname" . }}-headless:9092 --topic test1
+
+To create a message in the above session, simply type the message and press "enter"
+To end the producer session try: Ctrl+C
+
+If you specify "zookeeper.connect" in configurationOverrides, please replace "{{ .Release.Name }}-zookeeper:2181" with the value of "zookeeper.connect", or you will get error.
+
+{{ if .Values.external.enabled }}
+### Connecting to Kafka from outside Kubernetes
+
+You have enabled the external access feature of this chart.
+
+**WARNING:** By default this feature allows Kafka clients outside Kubernetes to
+connect to Kafka via NodePort(s) in `PLAINTEXT`.
+
+Please see this chart's README.md for more details and guidance.
+
+If you wish to connect to Kafka from outside please configure your external Kafka
+clients to point at the following brokers. Please allow a few minutes for all
+associated resources to become healthy.
+  {{  $fullName := include "common.fullname" . }}
+  {{- $replicas := .Values.replicas | int }}
+  {{- $servicePort := .Values.external.servicePort | int}}
+  {{- $root := . }}
+  {{- range $i, $e := until $replicas }}
+    {{- $externalListenerPort := add $root.Values.external.firstListenerPort $i }}
+    {{- if $root.Values.external.distinct }}
+{{ printf "%s-%d.%s:%d" $root.Release.Name $i $root.Values.external.domain $servicePort | indent 2 }}
+    {{- else }}
+{{ printf "%s.%s:%d" $root.Release.Name $root.Values.external.domain $externalListenerPort | indent 2 }}
+    {{- end }}
+  {{- end }}
+{{- end }}
--- a/tip-wlan/charts/kafka/templates/_helpers.tpl
+++ b/tip-wlan/charts/kafka/templates/_helpers.tpl
@@ -0,0 +1,89 @@
+{{/*
+Form the Zookeeper URL. If zookeeper is installed as part of this chart, use k8s service discovery,
+else use user-provided URL
+*/}}
+{{- define "zookeeper.url" }}
+{{- $port := .Values.zookeeper.port | toString }}
+{{- if .Values.zookeeper.enabled -}}
+{{- printf "%s:%s" (include "kafka.zookeeper.fullname" .) $port }}
+{{- else -}}
+{{- $zookeeperConnect := printf "%s-%s:%s" .Release.Name .Values.zookeeper.url $port }}
+{{- $zookeeperConnectOverride := index .Values "configurationOverrides" "zookeeper.connect" }}
+{{- default $zookeeperConnect $zookeeperConnectOverride }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Derive offsets.topic.replication.factor in following priority order: configurationOverrides, replicas
+*/}}
+{{- define "kafka.replication.factor" }}
+{{- $replicationFactorOverride := index .Values "configurationOverrides" "offsets.topic.replication.factor" }}
+{{- default .Values.replicas $replicationFactorOverride }}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "kafka.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create unified labels for kafka components
+*/}}
+
+{{- define "kafka.common.matchLabels" -}}
+app.kubernetes.io/name: {{ include "common.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
+
+{{- define "kafka.common.metaLabels" -}}
+helm.sh/chart: {{ include "kafka.chart" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{- define "kafka.broker.matchLabels" -}}
+app.kubernetes.io/component: kafka-broker
+{{ include "kafka.common.matchLabels" . }}
+{{- end -}}
+
+{{- define "kafka.broker.labels" -}}
+{{ include "kafka.common.metaLabels" . }}
+{{ include "kafka.broker.matchLabels" . }}
+{{- end -}}
+
+{{- define "kafka.config.matchLabels" -}}
+app.kubernetes.io/component: kafka-config
+{{ include "kafka.common.matchLabels" . }}
+{{- end -}}
+
+{{- define "kafka.config.labels" -}}
+{{ include "kafka.common.metaLabels" . }}
+{{ include "kafka.config.matchLabels" . }}
+{{- end -}}
+
+{{- define "kafka.monitor.matchLabels" -}}
+app.kubernetes.io/component: kafka-monitor
+{{ include "kafka.common.matchLabels" . }}
+{{- end -}}
+
+{{- define "kafka.monitor.labels" -}}
+{{ include "kafka.common.metaLabels" . }}
+{{ include "kafka.monitor.matchLabels" . }}
+{{- end -}}
+
+{{- define "serviceMonitor.namespace" -}}
+{{- if .Values.prometheus.operator.serviceMonitor.releaseNamespace -}}
+{{ .Release.Namespace }}
+{{- else -}}
+{{ .Values.prometheus.operator.serviceMonitor.namespace }}
+{{- end -}}
+{{- end -}}
+
+{{- define "prometheusRule.namespace" -}}
+{{- if .Values.prometheus.operator.prometheusRule.releaseNamespace -}}
+{{ .Release.Namespace }}
+{{- else -}}
+{{ .Values.prometheus.operator.prometheusRule.namespace }}
+{{- end -}}
+{{- end -}}
--- a/tip-wlan/charts/kafka/templates/configmap-config.yaml
+++ b/tip-wlan/charts/kafka/templates/configmap-config.yaml
@@ -0,0 +1,59 @@
+{{- if .Values.topics -}}
+{{- $zk := include "zookeeper.url" . -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+  {{- include "kafka.config.labels" . | nindent 4 }}
+  name: {{ include "common.fullname" . }}-config
+  namespace: {{ include "common.namespace" . }}
+data:
+  runtimeConfig.sh: |
+    #!/bin/bash
+    set -e
+    cd /usr/bin
+    until kafka-configs --zookeeper {{ $zk }} --entity-type topics --describe || (( count++ >= 6 ))
+    do
+      echo "Waiting for Zookeeper..."
+      sleep 20
+    done
+    until nc -z {{ template "common.fullname" . }} 9092 || (( retries++ >= 6 ))
+    do
+      echo "Waiting for Kafka..."
+      sleep 20
+    done
+    echo "Applying runtime configuration using {{ .Values.image }}:{{ .Values.imageTag }}"
+  {{- range $n, $topic := .Values.topics }}
+    {{- if and $topic.partitions $topic.replicationFactor $topic.reassignPartitions }}
+    cat << EOF > {{ $topic.name }}-increase-replication-factor.json
+      {"version":1, "partitions":[
+        {{- $partitions := (int $topic.partitions) }}
+        {{- $replicas := (int $topic.replicationFactor) }}
+        {{- range $i := until $partitions }}
+          {"topic":"{{ $topic.name }}","partition":{{ $i }},"replicas":[{{- range $j := until $replicas }}{{ $j }}{{- if ne $j (sub $replicas 1) }},{{- end }}{{- end }}]}{{- if ne $i (sub $partitions 1) }},{{- end }}
+        {{- end }}
+      ]}
+    EOF
+    kafka-reassign-partitions --zookeeper {{ $zk }} --reassignment-json-file {{ $topic.name }}-increase-replication-factor.json --execute
+    kafka-reassign-partitions --zookeeper {{ $zk }} --reassignment-json-file {{ $topic.name }}-increase-replication-factor.json --verify
+    {{- else if and $topic.partitions $topic.replicationFactor }}
+    kafka-topics --zookeeper {{ $zk }} --create --if-not-exists --force --topic {{ $topic.name }} --partitions {{ $topic.partitions }} --replication-factor {{ $topic.replicationFactor }}
+    {{- else if $topic.partitions }}
+    kafka-topics --zookeeper {{ $zk }} --alter --force --topic {{ $topic.name }} --partitions {{ $topic.partitions }} || true
+    {{- end }}
+    {{- if $topic.defaultConfig }}
+    kafka-configs --zookeeper {{ $zk }} --entity-type topics --entity-name {{ $topic.name }} --alter --force --delete-config {{ nospace $topic.defaultConfig }} || true
+    {{- end }}
+    {{- if $topic.config }}
+    kafka-configs --zookeeper {{ $zk }} --entity-type topics --entity-name {{ $topic.name }} --alter --force --add-config {{ nospace $topic.config }}
+    {{- end }}
+    kafka-configs --zookeeper {{ $zk }} --entity-type topics --entity-name {{ $topic.name }} --describe
+    {{- if $topic.acls }}
+      {{- range $a, $acl := $topic.acls }}
+        {{ if and $acl.user $acl.operations }}
+    kafka-acls --authorizer-properties zookeeper.connect={{ $zk }} --force --add --allow-principal User:{{ $acl.user }}{{- range $operation := $acl.operations }} --operation {{ $operation }} {{- end }} --topic {{ $topic.name }} {{ $topic.extraParams }}
+        {{- end }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
+{{- end -}}
--- a/tip-wlan/charts/kafka/templates/configmap.yaml
+++ b/tip-wlan/charts/kafka/templates/configmap.yaml
@@ -0,0 +1,17 @@
+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
--- a/tip-wlan/charts/kafka/templates/job-config.yaml
+++ b/tip-wlan/charts/kafka/templates/job-config.yaml
@@ -0,0 +1,30 @@
+{{- if .Values.topics -}}
+{{- $scriptHash := include (print $.Template.BasePath "/configmap-config.yaml") . | sha256sum | trunc 8 -}}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: "{{ include "common.fullname" . }}-config-{{ $scriptHash }}"
+  namespace: {{ include "common.namespace" . }}
+  labels:
+  {{- include "kafka.config.labels" . | nindent 4 }}
+spec:
+  backoffLimit: {{ .Values.configJob.backoffLimit }}
+  template:
+    metadata:
+      labels:
+      {{- include "kafka.config.matchLabels" . | nindent 8 }}
+    spec:
+      restartPolicy: OnFailure
+      volumes:
+        - name: config-volume
+          configMap:
+            name: {{ include "common.fullname" . }}-config
+            defaultMode: 0744
+      containers:
+        - name: {{ include "common.fullname" . }}-config
+          image: "{{ .Values.image }}:{{ .Values.imageTag }}"
+          command: ["/usr/local/script/runtimeConfig.sh"]
+          volumeMounts:
+            - name: config-volume
+              mountPath: "/usr/local/script"
+{{- end -}}
--- a/tip-wlan/charts/kafka/templates/secret.yaml
+++ b/tip-wlan/charts/kafka/templates/secret.yaml
@@ -0,0 +1,18 @@
+---
+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 }}
--- a/tip-wlan/charts/kafka/templates/service-brokers.yaml
+++ b/tip-wlan/charts/kafka/templates/service-brokers.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.fullname" . }}
+  namespace: {{ include "common.namespace" . }}
+  labels:
+  {{- include "kafka.broker.labels" . | nindent 4 }}
+spec:
+  ports:
+  - name: broker
+    port: {{ .Values.headless.sslPort }}
+    targetPort: kafka
+  selector:
+  {{- include "kafka.broker.matchLabels" . | nindent 4 }}
--- a/tip-wlan/charts/kafka/templates/service-headless.yaml
+++ b/tip-wlan/charts/kafka/templates/service-headless.yaml
@@ -0,0 +1,27 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.fullname" . }}-headless
+  namespace: {{ include "common.namespace" . }}
+  labels:
+  {{- include "kafka.broker.labels" . | nindent 4 }}
+  annotations:
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+{{- if .Values.headless.annotations }}
+{{ .Values.headless.annotations | toYaml | trimSuffix "\n" | indent 4 }}
+{{- end }}
+spec:
+  ports:
+#   - name: broker
+#     port: {{ .Values.headless.port }}
+# {{- if .Values.headless.targetPort }}
+#     targetPort: {{ .Values.headless.targetPort }}
+# {{- end }}
+  - name: broker
+    port: {{ .Values.headless.sslPort }}
+{{- if .Values.headless.targetSslPort }}
+    targetPort: {{ .Values.headless.targetSslPort }}
+{{- end }}
+  clusterIP: None
+  selector:
+  {{- include "kafka.broker.matchLabels" . | nindent 4 }}
--- a/tip-wlan/charts/kafka/templates/statefulset.yaml
+++ b/tip-wlan/charts/kafka/templates/statefulset.yaml
@@ -0,0 +1,249 @@
+{{- $advertisedListenersOverride := first (pluck "advertised.listeners" .Values.configurationOverrides) }}
+{{- $zk := include "zookeeper.service" . -}}
+{{- $ns := include "common.namespace" . -}}
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: {{ include "common.fullname" . }}
+  namespace: {{ $ns }}
+  labels:
+  {{- include "kafka.broker.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+    {{- include "kafka.broker.matchLabels" . | nindent 6 }}
+  serviceName: {{ include "common.fullname" . }}-headless
+  podManagementPolicy: {{ .Values.podManagementPolicy }}
+  updateStrategy:
+{{ toYaml .Values.updateStrategy | indent 4 }}
+  replicas: {{ default 3 .Values.replicas }}
+  template:
+    metadata:
+      annotations:
+{{- if .Values.podAnnotations }}
+{{ toYaml .Values.podAnnotations | indent 8 }}
+{{- end }}
+      labels:
+      {{- include "kafka.broker.labels" . | nindent 8 }}
+        {{- if .Values.podLabels }}
+        ## Custom pod labels
+{{ toYaml .Values.podLabels | indent 8 }}
+        {{- end }}
+    spec:
+{{- if .Values.schedulerName }}
+      schedulerName: "{{ .Values.schedulerName }}"
+{{- end }}
+{{- if .Values.serviceAccountName }}
+      serviceAccountName: {{ .Values.serviceAccountName }}
+{{- end }}
+{{- if .Values.priorityClassName }}
+      priorityClassName: "{{ .Values.priorityClassName }}"
+{{- end }}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+      initContainers:
+      - name: {{ include "common.name" . }}-readiness
+        image: busybox:1.28
+        imagePullPolicy: "{{ .Values.imagePullPolicy }}"
+        command: ['sh', '-c', "until nslookup {{ $zk }}.{{ $ns }}.svc.cluster.local; do echo waiting for myservice; sleep 2; done"]
+      containers:
+      - name: {{ include "common.name" . }}-broker
+        image: "{{ .Values.image }}:{{ .Values.imageTag }}"
+        imagePullPolicy: "{{ .Values.imagePullPolicy }}"
+        livenessProbe:
+          exec:
+            command:
+              - sh
+              - -ec
+              - /usr/bin/jps | /bin/grep -q SupportedKafka
+          {{- if not .Values.livenessProbe }}
+          initialDelaySeconds: 30
+          timeoutSeconds: 5
+          {{- else }}
+          initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 30}}
+          {{- if .Values.livenessProbe.periodSeconds }}
+          periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+          {{- end }}
+          timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds | default 5}}
+          {{- if .Values.livenessProbe.successThreshold }}
+          successThreshold: {{ .Values.livenessProbe.successThreshold }}
+          {{- end }}
+          {{- if .Values.livenessProbe.failureThreshold }}
+          failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- end }}
+        readinessProbe:
+          tcpSocket:
+            port: kafka
+          initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+          successThreshold: {{ .Values.readinessProbe.successThreshold }}
+          failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+        ports:
+        - containerPort: {{ .Values.headless.sslPort }}
+          name: kafka
+        {{- if .Values.external.enabled }}
+          {{- $replicas := .Values.replicas | int }}
+          {{- $root := . }}
+          {{- range $i, $e := until $replicas }}
+        - containerPort: {{ add $root.Values.external.firstListenerPort $i }}
+          name: external-{{ $i }}
+          {{- end }}
+        {{- end }}
+        {{- if .Values.additionalPorts }}
+{{ toYaml .Values.additionalPorts | indent 8 }}
+        {{- end }}
+        resources:
+{{ toYaml .Values.resources | indent 10 }}
+        env:
+        - name: POD_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: KAFKA_HEAP_OPTS
+          value: {{ .Values.kafkaHeapOptions }}
+        - name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR
+          value: {{ include "kafka.replication.factor" . | quote }}
+        {{- if not (hasKey .Values.configurationOverrides "zookeeper.connect") }}
+        - name: KAFKA_ZOOKEEPER_CONNECT
+          value: {{ include "zookeeper.url" . | quote }}
+        {{- end }}
+        {{- if not (hasKey .Values.configurationOverrides "log.dirs") }}
+        - name: KAFKA_LOG_DIRS
+          value: {{ printf "%s/%s" .Values.persistence.mountPath .Values.logSubPath | quote }}
+        {{- end }}
+        {{- range $key, $value := .Values.configurationOverrides }}
+        - name: {{ printf "KAFKA_%s" $key | replace "." "_" | upper | quote }}
+          value: {{ $value | quote }}
+        {{- end }}
+        {{- range $secret := .Values.secrets }}
+          {{- if not $secret.mountPath }}
+            {{- range $key := $secret.keys }}
+        - name: {{ (print ($secret.name | replace "-" "_") "_" $key) | upper }}
+          valueFrom:
+            secretKeyRef:
+              name: {{ $secret.name }}
+              key: {{ $key }}
+            {{- end }}
+          {{- end }}
+        {{- end }}
+        {{- range $key, $value := .Values.envOverrides }}
+        - name: {{ printf "%s" $key | replace "." "_" | upper | quote }}
+          value: {{ $value | quote }}
+        {{- end }}
+        # This is required because the Downward API does not yet support identification of
+        # pod numbering in statefulsets. Thus, we are required to specify a command which
+        # allows us to extract the pod ID for usage as the Kafka Broker ID.
+        # See: https://github.com/kubernetes/kubernetes/issues/31218
+        command:
+        - sh
+        - -exc
+        - |
+          unset KAFKA_PORT && \
+          export KAFKA_BROKER_ID=${POD_NAME##*-} && \
+          {{- if eq .Values.external.type "LoadBalancer" }}
+          export LOAD_BALANCER_IP=$(echo '{{ .Values.external.loadBalancerIP }}' | tr -d '[]' | cut -d ' ' -f "$(($KAFKA_BROKER_ID + 1))") && \
+          {{- end }}
+          {{- if eq .Values.external.type "NodePort" }}
+          export KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://${POD_IP}:9092{{ if kindIs "string" $advertisedListenersOverride }}{{ printf ",%s" $advertisedListenersOverride }}{{ end }} && \
+          {{- else }}
+          export KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://${POD_NAME}.{{ include "common.fullname" . }}-headless.${POD_NAMESPACE}.svc.cluster.local:9092{{ if kindIs "string" $advertisedListenersOverride }}{{ printf ",%s" $advertisedListenersOverride }}{{ end }} && \
+          {{- end }}
+          exec /etc/confluent/docker/run
+        volumeMounts:
+        - mountPath: /etc/kafka/secrets/truststore.jks
+          name: kafka-certificates
+          subPath: truststore.jks
+        - mountPath: /etc/kafka/secrets/kafka-server.pkcs12
+          name: kafka-certificates
+          subPath: kafka-server.pkcs12
+        - mountPath: /etc/kafka/secrets/key_creds
+          name: kafka-certificates
+          subPath: key_creds
+        - mountPath: /etc/kafka/secrets/keystore_creds
+          name: kafka-certificates
+          subPath: keystore_creds
+        - mountPath: /etc/kafka/secrets/truststore_creds
+          name: kafka-certificates
+          subPath: truststore_creds
+        - mountPath: /etc/kafka/admin-client.properties
+          name: kafka-client-config
+          subPath: admin-client.properties
+        - name: datadir
+          mountPath: {{ .Values.persistence.mountPath | quote }}
+        {{- range $secret := .Values.secrets }}
+          {{- if $secret.mountPath }}
+            {{- if $secret.keys }}
+              {{- range $key := $secret.keys }}
+        - name: {{ include "common.fullname" $ }}-{{ $secret.name }}
+          mountPath: {{ $secret.mountPath }}/{{ $key }}
+          subPath: {{ $key }}
+          readOnly: true
+              {{- end }}
+            {{- else }}
+        - name: {{ include "common.fullname" $ }}-{{ $secret.name }}
+          mountPath: {{ $secret.mountPath }}
+          readOnly: true
+            {{- end }}
+          {{- end }}
+        {{- end }}
+      volumes:
+      - name: kafka-certificates
+        secret:
+          secretName: {{ include "common.fullname" . }}-certs
+      - name: kafka-client-config
+        configMap:
+            name: {{ include "common.fullname" . }}-clientconfig
+      {{- if not .Values.persistence.enabled }}
+      - name: datadir
+        emptyDir: {}
+      {{- end }}
+      {{- if .Values.securityContext }}
+      securityContext:
+{{ toYaml .Values.securityContext | indent 8 }}
+      {{- end }}
+      {{- range .Values.secrets }}
+      {{- if .mountPath }}
+      - name: {{ include "common.fullname" $ }}-{{ .name }}
+        secret:
+          secretName: {{ .name }}
+      {{- end }}
+      {{- end }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+  {{- if .Values.persistence.enabled }}
+  volumeClaimTemplates:
+  - metadata:
+      name: datadir
+    spec:
+      accessModes: 
+        - {{ .Values.persistence.accessMode | quote }}
+      resources:
+        requests:
+          storage: {{ .Values.persistence.size }}
+      {{- if .Values.persistence.storageClass }}
+      {{- if (eq "-" .Values.persistence.storageClass) }}
+      storageClassName: ""
+      {{- else }}
+      storageClassName: "{{ .Values.persistence.storageClass }}"
+      {{- end }}
+      {{- end }}
+  {{- end }}
--- a/tip-wlan/charts/kafka/templates/tests/test-topic-create-produce-consume.yaml
+++ b/tip-wlan/charts/kafka/templates/tests/test-topic-create-produce-consume.yaml
@@ -0,0 +1,60 @@
+{{- if .Values.testsEnabled -}}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{ include "common.fullname" . }}-test-topic-create-produce-consume
+  namespace: {{ include "common.namespace" . }}
+  annotations:
+    "helm.sh/hook": test-success
+spec:
+  containers:
+  - name: {{ include "common.name" . }}-test-consume
+    image: {{ .Values.image }}:{{ .Values.imageTag }}
+    command:
+    - sh
+    - -c
+    - |
+      # List topics:
+      echo "##### Listing existing topics #####"
+      kafka-topics --zookeeper {{ include "zookeeper.url" . }} --list
+      # Create the topic
+      echo "##### Create topic helm-test-topic-create-consume-produce #####"
+      kafka-topics --zookeeper {{ include "zookeeper.url" . }} --topic helm-test-topic-create-consume-produce --create --partitions 1 --replication-factor 1 --if-not-exists
+      echo "##### Produce the test message #####"
+      # Create a message
+      MESSAGE="`date -u`"
+      # Produce a test message to the topic
+      echo "$MESSAGE" | kafka-console-producer --broker-list {{ include "common.fullname" . }}-headless:9093 --producer.config /etc/kafka/admin-client.properties --topic helm-test-topic-create-consume-produce
+      echo "##### Consume the test message from the topic #####"
+      # Consume a test message from the topic
+      kafka-console-consumer --bootstrap-server {{ include "common.fullname" . }}-headless:9093 --consumer.config /etc/kafka/admin-client.properties --topic helm-test-topic-create-consume-produce --from-beginning --timeout-ms 2000 --max-messages 1 | grep "$MESSAGE"
+      echo "##### Listing current topics including our new topic #####"
+      kafka-topics --zookeeper {{ include "zookeeper.url" . }} --list
+      # Delete the messages from topic
+      echo "##### Delete messages from our topic #####"
+      kafka-configs --zookeeper {{ include "zookeeper.url" . }} --alter --entity-type topics --entity-name helm-test-topic-create-consume-produce --add-config retention.ms=1000
+      # Mark topic for deletion
+      echo "##### Mark our topic for Deletion #####"
+      kafka-topics --zookeeper {{ include "zookeeper.url" . }} --delete --topic helm-test-topic-create-consume-produce
+      # List topics:
+      echo "##### Listing topics after deleting our newly created topic #####"
+      kafka-topics --zookeeper {{ include "zookeeper.url" . }} --list
+    volumeMounts:
+    - mountPath: /etc/kafka/admin-client.properties
+      name: kafka-client-config
+      subPath: admin-client.properties
+    - mountPath: /etc/kafka/secrets/truststore.jks
+      name: kafka-certificates
+      subPath: truststore.jks
+    - mountPath: /etc/kafka/secrets/kafka-server.pkcs12
+      name: kafka-certificates
+      subPath: kafka-server.pkcs12
+  restartPolicy: Never
+  volumes:
+  - name: kafka-client-config
+    configMap:
+      name: {{ include "common.fullname" . }}-clientconfig
+  - name: kafka-certificates
+    secret:
+      secretName: {{ include "common.fullname" . }}-certs
+{{- end }}
--- a/tip-wlan/charts/kafka/values.yaml
+++ b/tip-wlan/charts/kafka/values.yaml
@@ -0,0 +1,360 @@
+# ------------------------------------------------------------------------------
+# Kafka:
+# ------------------------------------------------------------------------------
+
+## The StatefulSet installs 1 pod by default
+replicas: 1
+
+## The kafka image repository
+image: "confluentinc/cp-kafka"
+# image: "wurstmeister/kafka"
+
+## The kafka image tag
+imageTag: "5.0.1"  # Confluent image for Kafka 2.0.0
+# imageTag: "latest"
+
+## Specify a imagePullPolicy
+## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+imagePullPolicy: "IfNotPresent"
+
+## Configure resource requests and limits
+## ref: http://kubernetes.io/docs/user-guide/compute-resources/
+resources: {}
+  # limits:
+  #   cpu: 200m
+  #   memory: 1536Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 1024Mi
+kafkaHeapOptions: "-Xmx1G -Xms1G"
+
+## Optional Container Security context
+securityContext: {}
+
+## The StatefulSet Update Strategy which Kafka will use when changes are applied.
+## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
+updateStrategy:
+  type: "OnDelete"
+
+## Start and stop pods in Parallel or OrderedReady (one-by-one.)  Note - Can not change after first release.
+## ref: https://kubernetes.io/docs/tutorials/stateful-application/basic-stateful-set/#pod-management-policy
+podManagementPolicy: OrderedReady
+
+## Useful if using any custom authorizer
+## Pass in some secrets to use (if required)
+# secrets:
+# - name: myKafkaSecret
+#   keys:
+#     - username
+#     - password
+#   # mountPath: /opt/kafka/secret
+# - name: myZkSecret
+#   keys:
+#     - user
+#     - pass
+#   mountPath: /opt/zookeeper/secret
+
+
+## The subpath within the Kafka container's PV where logs will be stored.
+## This is combined with `persistence.mountPath`, to create, by default: /opt/kafka/data/logs
+logSubPath: "logs"
+
+## Use an alternate scheduler, e.g. "stork".
+## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+##
+# schedulerName:
+
+## Use an alternate serviceAccount
+## Useful when using images in custom repositories
+# serviceAccountName:
+
+## Set a pod priorityClassName
+# priorityClassName: high-priority
+
+## Pod scheduling preferences (by default keep pods within a release on separate nodes).
+## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+## By default we don't set affinity
+affinity: {}
+## Alternatively, this typical example defines:
+## antiAffinity (to keep Kafka pods on separate pods)
+## and affinity (to encourage Kafka pods to be collocated with Zookeeper pods)
+# affinity:
+#   podAntiAffinity:
+#     requiredDuringSchedulingIgnoredDuringExecution:
+#     - labelSelector:
+#         matchExpressions:
+#         - key: app
+#           operator: In
+#           values:
+#           - kafka
+#       topologyKey: "kubernetes.io/hostname"
+#   podAffinity:
+#     preferredDuringSchedulingIgnoredDuringExecution:
+#      - weight: 50
+#        podAffinityTerm:
+#          labelSelector:
+#            matchExpressions:
+#            - key: app
+#              operator: In
+#              values:
+#                - zookeeper
+#          topologyKey: "kubernetes.io/hostname"
+
+## Node labels for pod assignment
+## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
+nodeSelector: {}
+
+## Readiness probe config.
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/
+##
+readinessProbe:
+  initialDelaySeconds: 30
+  periodSeconds: 10
+  timeoutSeconds: 5
+  successThreshold: 1
+  failureThreshold: 3
+
+## Period to wait for broker graceful shutdown (sigterm) before pod is killed (sigkill)
+## ref: https://kubernetes-v1-4.github.io/docs/user-guide/production-pods/#lifecycle-hooks-and-termination-notice
+## ref: https://kafka.apache.org/10/documentation.html#brokerconfigs controlled.shutdown.*
+terminationGracePeriodSeconds: 60
+
+# Tolerations for nodes that have taints on them.
+# Useful if you want to dedicate nodes to just run kafka
+# https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+tolerations: []
+# tolerations:
+# - key: "key"
+#   operator: "Equal"
+#   value: "value"
+#   effect: "NoSchedule"
+
+## Headless service.
+##
+headless:
+  # annotations:
+  # targetPort:
+  port: 9092
+  sslPort: 9093
+
+## External access.
+##
+external:
+  enabled: false
+  # type can be either NodePort or LoadBalancer
+  type: NodePort
+  # annotations:
+  #  service.beta.kubernetes.io/openstack-internal-load-balancer: "true"
+  dns:
+    useInternal: false
+    useExternal: true
+  # If using external service type LoadBalancer and external dns, set distinct to true below.
+  # This creates an A record for each statefulset pod/broker. You should then map the
+  # A record of the broker to the EXTERNAL IP given by the LoadBalancer in your DNS server.
+  distinct: false
+  servicePort: 19092
+  firstListenerPort: 31090
+  domain: cluster.local
+  loadBalancerIP: []
+  loadBalancerSourceRanges: []
+  init:
+    image: "lwolf/kubectl_deployer"
+    imageTag: "0.4"
+    imagePullPolicy: "IfNotPresent"
+
+# Annotation to be added to Kafka pods
+podAnnotations: {}
+
+# Labels to be added to Kafka pods
+podLabels: {}
+  # service: broker
+  # team: developers
+
+podDisruptionBudget: {}
+  # maxUnavailable: 1  # Limits how many Kafka pods may be unavailable due to voluntary disruptions.
+
+## Configuration Overrides. Specify any Kafka settings you would like set on the StatefulSet
+## here in map format, as defined in the official docs.
+## ref: https://kafka.apache.org/documentation/#brokerconfigs
+##
+configurationOverrides:
+  "confluent.support.metrics.enable": false  # Disables confluent metric submission
+  # "auto.leader.rebalance.enable": true
+  # "auto.create.topics.enable": true
+  # "controlled.shutdown.enable": true
+  # "controlled.shutdown.max.retries": 100
+  # "ssl.secret.dir": "/opt/tip-wlan/certs"
+  # "ssl.keystore.filename": "kafka-server.pkcs12"
+  # "ssl.key.credentials": "mypassword"
+  # "ssl.truststore.filename": "kafka_server_keystore.jks"
+  # "ssl.truststore.credentials": "mypassword"
+  advertised.listeners: SSL://tip-wlan-kafka-headless:9093
+  ssl.client.auth: required
+  ssl.endpoint.identification.algorithm: ""
+  security.inter.broker.protocol: SSL
+  ssl.key.credentials: "key_creds"
+  ssl.keystore.filename: "kafka-server.pkcs12"
+  ssl.keystore.credentials: "keystore_creds"
+  ssl.keystore.type: "PKCS12"
+  ssl.truststore.filename: "truststore.jks"
+  ssl.truststore.credentials: "truststore_creds"
+  ssl.truststore.type: "JKS"
+
+  ## Options required for external access via NodePort
+  ## ref:
+  ## - http://kafka.apache.org/documentation/#security_configbroker
+  ## - https://cwiki.apache.org/confluence/display/KAFKA/KIP-103%3A+Separation+of+Internal+and+External+traffic
+  ##
+  ## Setting "advertised.listeners" here appends to "PLAINTEXT://${POD_IP}:9092,", ensure you update the domain
+  ## If external service type is Nodeport:
+  # "advertised.listeners": |-
+  #   EXTERNAL://kafka.cluster.local:$((31090 + ${KAFKA_BROKER_ID}))
+  ## If external service type is LoadBalancer and distinct is true:
+  # "advertised.listeners": |-
+  #   EXTERNAL://kafka-$((${KAFKA_BROKER_ID})).cluster.local:19092
+  ## If external service type is LoadBalancer and distinct is false:
+  # "advertised.listeners": |-
+  #   EXTERNAL://${LOAD_BALANCER_IP}:31090
+  ## Uncomment to define the EXTERNAL Listener protocol
+  # "listener.security.protocol.map": |-
+  #   PLAINTEXT:PLAINTEXT,EXTERNAL:PLAINTEXT
+
+## set extra ENVs
+#   key: "value"
+envOverrides: {}
+
+
+## A collection of additional ports to expose on brokers (formatted as normal containerPort yaml)
+# Useful when the image exposes metrics (like prometheus, etc.) through a javaagent instead of a sidecar
+additionalPorts: {}
+
+## Persistence configuration. Specify if and how to persist data to a persistent volume.
+##
+persistence:
+  enabled: false
+
+  ## The size of the PersistentVolume to allocate to each Kafka Pod in the StatefulSet. For
+  ## production servers this number should likely be much larger.
+  ##
+  size: 1Gi
+  accessMode: ReadWriteOnce
+  ## The location within the Kafka container where the PV will mount its storage and Kafka will
+  ## store its logs.
+  ##
+  mountPath: "/opt/kafka/data"
+
+  ## Kafka data Persistent Volume Storage Class
+  ## If defined, storageClassName: <storageClass>
+  ## If set to "-", storageClassName: "", which disables dynamic provisioning
+  ## If undefined (the default) or set to null, no storageClassName spec is
+  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+  ##   GKE, AWS & OpenStack)
+  ##
+  storageClass: "-"
+
+## Kafka Config job configuration
+##
+configJob:
+  ## Specify the number of retries before considering kafka-config job as failed.
+  ## https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/#pod-backoff-failure-policy
+  backoffLimit: 6
+
+## Topic creation and configuration.
+## The job will be run on a deployment only when the config has been changed.
+## - If 'partitions' and 'replicationFactor' are specified we create the topic (with --if-not-exists.)
+## - If 'partitions', 'replicationFactor' and 'reassignPartitions' are specified we reassign the partitions to
+## increase the replication factor of an existing topic.
+## - If 'partitions' is specified we 'alter' the number of partitions. This will
+## silently and safely fail if the new setting isn’t strictly larger than the old (i.e. a NOOP.) Do be aware of the
+## implications for keyed topics (ref: https://docs.confluent.io/current/kafka/post-deployment.html#admin-operations)
+## - If 'defaultConfig' is specified it's deleted from the topic configuration. If it isn't present,
+## it will silently and safely fail.
+## - If 'config' is specified it's added to the topic configuration.
+##
+## Note: To increase the 'replicationFactor' of a topic, 'reassignPartitions' must be set to true (see above).
+##
+topics:
+  # - name: myExistingTopicConfig
+  #   config: "cleanup.policy=compact,delete.retention.ms=604800000"
+  # - name: myExistingTopicReassignPartitions
+  #   partitions: 8
+  #   replicationFactor: 5
+  #   reassignPartitions: true
+  - name: wlan_service_metrics
+    partitions: 1
+    replicationFactor: 1
+  - name: system_events
+    partitions: 1
+    replicationFactor: 1
+  - name: customer_events
+    partitions: 1
+    replicationFactor: 1
+  # - name: myNewTopicWithConfig
+  #   partitions: 8
+  #   replicationFactor: 3
+  #   defaultConfig: "segment.bytes,segment.ms"
+  #   config: "cleanup.policy=compact,delete.retention.ms=604800000"
+  # - name: myAclTopicPartitions
+  #   partitions: 8
+  #   acls:
+  #     - user: read
+  #       operations: [ Read ]
+  #     - user: read_and_write
+  #       operations:
+  #         - Read
+  #         - Write
+  #     - user: all
+  #       operations: [ All ]
+
+  ## Enable/disable the chart's tests.  Useful if using this chart as a dependency of
+  ## another chart and you don't want these tests running when trying to develop and
+  ## test your own chart.
+testsEnabled: true
+
+# ------------------------------------------------------------------------------
+# Zookeeper:
+# ------------------------------------------------------------------------------
+
+zookeeper:
+  ## If true, install the Zookeeper chart alongside Kafka
+  ## ref: https://github.com/kubernetes/charts/tree/master/incubator/zookeeper
+  enabled: false
+
+  ## Configure Zookeeper resource requests and limits
+  ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
+  resources: ~
+
+  ## Environmental variables to set in Zookeeper
+  env:
+    ## The JVM heap size to allocate to Zookeeper
+    ZK_HEAP_SIZE: "1G"
+
+  persistence:
+    enabled: false
+    ## The amount of PV storage allocated to each Zookeeper pod in the statefulset
+    # size: "2Gi"
+
+  ## Specify a Zookeeper imagePullPolicy
+  ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+  image:
+    PullPolicy: "IfNotPresent"
+
+  ## If the Zookeeper Chart is disabled a URL and port are required to connect
+  url: "zookeeper-headless"
+  port: 2181
+
+  ## Pod scheduling preferences (by default keep pods within a release on separate nodes).
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  ## By default we don't set affinity:
+  affinity: {}  # Criteria by which pod label-values influence scheduling for zookeeper pods.
+  # podAntiAffinity:
+  #   requiredDuringSchedulingIgnoredDuringExecution:
+  #     - topologyKey: "kubernetes.io/hostname"
+  #       labelSelector:
+  #         matchLabels:
+  #           release: zookeeper
+
+creds:
+  sslTruststorePassword: DUMMY_PASSWORD
+  sslKeystorePassword: DUMMY_PASSWORD
+  sslKeyPassword: DUMMY_PASSWORD
--- a/tip-wlan/charts/nginx-ingress-controller/templates/controller-configmap.yaml
+++ b/tip-wlan/charts/nginx-ingress-controller/templates/controller-configmap.yaml
@@ -4,8 +4,7 @@ metadata:
  name: {{ include "nginx-ingress.configName" . }}
  namespace: {{ include "common.namespace" . }}
  labels:
-    {{- include "common.labels" . | nindent 4 }}
+    {{- include "common.labels" . | nindent 4 }}  
 data:
    external-status-address: {{ .Values.controller.config.externalStatusAddress }}
-    client-max-body-size: {{ .Values.controller.config.clientMaxBodySize }}
-    error-log-level: {{ .Values.controller.config.errorLogLevel }}
+    client-max-body-size: {{ .Values.controller.config.clientMaxBodySize }}
--- a/tip-wlan/charts/nginx-ingress-controller/templates/controller-global-configuration.yaml
+++ b/tip-wlan/charts/nginx-ingress-controller/templates/controller-global-configuration.yaml
@@ -1,6 +1,6 @@
 {{- if not .Values.byPassNginxForTcpConnections.enabled -}}
 apiVersion: k8s.nginx.org/v1alpha1
-kind: GlobalConfiguration
+kind: GlobalConfiguration 
 metadata:
  name: {{ include "common.name" . }}-global-configuration
  namespace: {{ include "common.namespace" . }}
--- a/tip-wlan/charts/nginx-ingress-controller/values.yaml
+++ b/tip-wlan/charts/nginx-ingress-controller/values.yaml
@@ -40,7 +40,7 @@ controller:
    tag: "1.7.0"

    ## The pull policy for the Ingress controller image.
-    pullPolicy: Always
+    pullPolicy: IfNotPresent

  config:
    ## The name of the ConfigMap used by the Ingress controller.
@@ -56,8 +56,6 @@ controller:
    ## Max message size coming from the Client
    clientMaxBodySize: "20m"

-    ## Error 
-    errorLogLevel: "error"
  ## 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.
@@ -94,13 +92,13 @@ controller:
  terminationGracePeriodSeconds: 30

  ## The resources of the Ingress controller pods.
-  resources:
-    limits:
-      cpu: 500m
-      memory: 200Mi
-    requests:
-      cpu: 50m
-      memory: 140Mi
+  resources: {}
+    # limits:
+    #   cpu: 100m
+    #   memory: 64Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 64Mi

  ## The tolerations of the Ingress controller pods.
  tolerations: []
@@ -139,7 +137,7 @@ controller:

  ## Enable the custom resources.
  enableTLSPassthrough: true
-
+  
  ## Add a location based on the value of health-status-uri to the default server. The location responds with the 200 status code for any request.
  ## Useful for external health-checking of the Ingress controller.
  healthStatus: false
@@ -276,7 +274,7 @@ rbac:

  ## 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
+  ## We were seeing issues with AP <-- --> MQTT connecitivity when using NGINX 
  ## as passthrough for TCP Connections
 byPassNginxForTcpConnections:
  enabled: true
--- a/tip-wlan/charts/opensync-gw-cloud/resources/config/certs/README.md
+++ b/tip-wlan/charts/opensync-gw-cloud/resources/config/certs/README.md
@@ -0,0 +1,2 @@
+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
--- a/tip-wlan/charts/opensync-gw-cloud/resources/config/certs/httpClientConfig.json
+++ b/tip-wlan/charts/opensync-gw-cloud/resources/config/certs/httpClientConfig.json
@@ -4,11 +4,11 @@
    "truststoreType": "JKS",
    "truststoreProvider": "SUN",
    "truststoreFile": "file:/opt/tip-wlan/certs/truststore.jks",
-    "truststorePass": "{{ .Values.global.certificatePasswords.sslTruststore }}",
+    "truststorePass": "mypassword",
    "keystoreType": "JKS",
    "keystoreProvider": "SUN",
    "keystoreFile": "file:/opt/tip-wlan/certs/client_keystore.jks",
-    "keystorePass": "{{ .Values.global.certificatePasswords.sslKeystore }}",
+    "keystorePass": "mypassword",
    "keyAlias": "clientkeyalias",
    "credentialsList": [
        {
--- a/tip-wlan/charts/opensync-gw-cloud/resources/config/certs/ssl.properties
+++ b/tip-wlan/charts/opensync-gw-cloud/resources/config/certs/ssl.properties
@@ -1,12 +1,13 @@
-truststorePass={{ .Values.global.certificatePasswords.sslTruststore }}
+truststorePass=mypassword
 truststoreFile=file:///opt/tip-wlan/certs/truststore.jks
 truststoreType=JKS
 truststoreProvider=SUN

 keyAlias=1
-keystorePass={{ .Values.global.certificatePasswords.sslKeystore }}
+keystorePass=mypassword
 keystoreFile=file:///opt/tip-wlan/certs/server.pkcs12
 keystoreType=pkcs12
 keystoreProvider=SunJSSE

 sslProtocol=TLS
+
--- a/tip-wlan/charts/opensync-gw-cloud/resources/config/logback.xml
+++ b/tip-wlan/charts/opensync-gw-cloud/resources/config/logback.xml
@@ -29,7 +29,7 @@
      <maxFileSize>20MB</maxFileSize>
    </triggeringPolicy>
  </appender>
-
+  
  <appender name="logfile" class="ch.qos.logback.core.rolling.RollingFileAppender">
    <file>/app/logs/opensyncgw.log</file>
    <append>true</append>
@@ -45,23 +45,23 @@
      <maxFileSize>20MB</maxFileSize>
    </triggeringPolicy>
  </appender>
-
+      
  <!--
  details: http://logback.qos.ch/manual/configuration.html#auto_configuration
-
-  runtime configuration, if need to override the defaults:
+   
+  runtime configuration, if need to override the defaults: 
  	-Dlogback.configurationFile=/path/to/logback.xml
-
-  for log configuration debugging - use
+  
+  for log configuration debugging - use 
  	-Dlogback.statusListenerClass=ch.qos.logback.core.status.OnConsoleStatusListener
-
+  
  log levels:
-	OFF ERROR WARN INFO DEBUG TRACE
+	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"/>
--- a/tip-wlan/charts/opensync-gw-cloud/templates/configmap.yaml
+++ b/tip-wlan/charts/opensync-gw-cloud/templates/configmap.yaml
@@ -4,4 +4,4 @@ metadata:
  name: {{ include "common.fullname" . }}-log-config
  namespace: {{ include "common.namespace" . }}
 data:
-{{ (.Files.Glob "resources/config/logback.xml").AsConfig | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/logback.xml").AsConfig . | indent 2 }}
--- a/tip-wlan/charts/opensync-gw-cloud/templates/deployment.yaml
+++ b/tip-wlan/charts/opensync-gw-cloud/templates/deployment.yaml
@@ -27,18 +27,47 @@ spec:
      securityContext:
        {{- toYaml .Values.podSecurityContext | nindent 8 }}
      initContainers:
-        {{- include "jmxPrometheus.initContainer" . | nindent 8 }}
-        - name: wait-for-services
-          image: {{ .Values.waitForServicesImage.registry }}/{{ .Values.waitForServicesImage.repository }}:{{ .Values.waitForServicesImage.tag }}
-          args:
-          - "-service={{ .Release.Name }}-opensync-mqtt-broker"
-          - "-service={{ .Release.Name }}-wlan-prov-service"
-          - "-service={{ .Release.Name }}-wlan-ssc-service"
-          - -check_interval=5
+        - name: {{ include "common.name" . }}-mqtt-readiness
+          image: eclipse-mosquitto:latest
+          imagePullPolicy: {{ .Values.global.pullPolicy }}
+          command:
+          - sh
+          - -c
+          - |
+            mosquitto_pub -h {{ $mqtt }} -p 1883 --cafile /certs/cacert.pem --cert /certs/clientcert.pem --key /certs/clientkey.pem --insecure -t "/ap/test" -q 0 -m "CheckingMQTTAliveness"
+            status=$(echo $?)
+            echo mosquitto_pub response of the request = $status
+            counter=0
+            while [ $counter -lt 10 ] && [ $status -ne 0 ]
+            do
+              echo {{ $mqtt }} service isnt ready. Tried $counter times
+              sleep 2
+              counter=`expr $counter + 1`
+              mosquitto_pub -h {{ $mqtt }} -p 1883 --cafile /certs/cacert.pem --cert /certs/clientcert.pem --key /certs/clientkey.pem --insecure -t "/ap/test" -q 0 -m "CheckingMQTTAliveness"
+              status=$(echo $?)
+              echo mosquitto_pub response of the request = $status
+            done
+            if [ $status -eq 0 ]
+            then
+              echo {{ $mqtt }} service is ready!
+            else
+              echo {{ $mqtt }} service failed to respond after 20 secs
+              exit 1
+            fi
+          volumeMounts:
+          - mountPath: /certs/cacert.pem
+            name: certificates
+            subPath: cacert.pem
+          - mountPath: /certs/clientcert.pem
+            name: certificates
+            subPath: clientcert.pem
+          - mountPath: /certs/clientkey.pem
+            name: certificates
+            subPath: clientkey.pem
      {{- if .Values.global.integratedDeployment }}
        - name: {{ include "common.name" . }}-readiness-int-cloud
-          image: {{ .Values.intCloudReadiness.registry }}/{{ .Values.intCloudReadiness.repository }}:{{ .Values.intCloudReadiness.tag }}
-          imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
+          image: alpine
+          imagePullPolicy: {{ .Values.global.pullPolicy }}
          command:
          - sh
          - -c
@@ -47,7 +76,34 @@ spec:
            url=https://{{ $icc }}/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 ]
+            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 
+      {{- else }}
+        - name: {{ include "common.name" . }}-readiness-prov
+          image: alpine
+          imagePullPolicy: {{ .Values.global.pullPolicy }}
+          command:
+          - sh
+          - -c
+          - |
+            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
@@ -62,22 +118,48 @@ spec:
              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
+          - |
+            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.registry  }}/{{ .Values.image.name }}:{{ .Values.image.tag }}-{{.Values.global.testingTimestamp}}
+          image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}-{{.Values.global.testingTimestamp}}
          {{- else }}
-          image: {{ .Values.global.repository.registry  }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
+          image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
          {{- end }}
-          imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
+          imagePullPolicy: {{ .Values.global.pullPolicy }}
          {{- if .Values.probes.enabled }}
          livenessProbe:
            tcpSocket:
              port: {{ .Values.service.port2 }}
-            initialDelaySeconds: {{ .Values.probes.livenessProbe.initialDelaySeconds }}
+            initialDelaySeconds: {{ .Values.probes.livenessProbe.initialDelaySeconds }}  
            timeoutSeconds: {{ .Values.probes.livenessProbe.timeoutSeconds }}
            failureThreshold: {{ .Values.probes.livenessProbe.failureThreshold }}
            periodSeconds: {{ .Values.probes.livenessProbe.periodSeconds }}
@@ -90,11 +172,6 @@ spec:
            failureThreshold: {{ .Values.probes.readinessProbe.failureThreshold }}
            periodSeconds: {{ .Values.probes.readinessProbe.periodSeconds }}
            successThreshold: {{ .Values.probes.readinessProbe.successThreshold }}
-          startupProbe:
-            tcpSocket:
-              port: {{ .Values.service.port1 }}
-            failureThreshold: {{ .Values.probes.startupProbe.failureThreshold }}
-            periodSeconds: {{ .Values.probes.startupProbe.periodSeconds}}
          {{- end }}
          env:
            {{- include "common.env" . | nindent 12 }}
@@ -133,22 +210,6 @@ spec:
              value: {{ .Values.ethernetType.wanType }}
            - name: DEFAULT_WAN_NAME
              value: {{ .Values.ethernetType.wanName }}
-            - name: tip_wlan_ovsdb_listener_threadPoolSize
-              value: "{{ .Values.scalability.tip_wlan_ovsdb_listener_threadPoolSize }}"
-            - name: tip_wlan_AsyncExecutor_CorePoolSize
-              value: "{{ .Values.scalability.tip_wlan_AsyncExecutor_CorePoolSize }}"
-            - name: tip_wlan_AsyncExecutor_MaxPoolSize
-              value: "{{ .Values.scalability.tip_wlan_AsyncExecutor_MaxPoolSize }}"
-            - name: tip_wlan_AsyncExecutor_QueueCapacity
-              value: "{{ .Values.scalability.tip_wlan_AsyncExecutor_QueueCapacity }}"
-            - name: tip_wlan_httpClientConfig_maxConnectionsTotal
-              value: "{{ .Values.scalability.tip_wlan_httpClientConfig_maxConnectionsTotal }}"
-            - name: tip_wlan_httpClientConfig_maxConnectionsPerRoute
-              value: "{{ .Values.scalability.tip_wlan_httpClientConfig_maxConnectionsPerRoute }}"
-            - name: tip_wlan_maxHttpThreads
-              value: "{{ .Values.scalability.tip_wlan_maxHttpThreads }}"
-            - name: JVM_MEM_OPTIONS
-              value: "{{ .Values.scalability.JVM_MEM_OPTIONS }} {{ include "jmxPrometheus.jvmOpts" . }}"
          volumeMounts:
          - mountPath: /opt/tip-wlan/certs/client_keystore.jks
            name: certificates
@@ -170,8 +231,6 @@ spec:
            subPath: logback.xml
          - mountPath: {{ $file_store_path }}
            name: file-store-data
-          {{- include "jmxPrometheus.configVolumeMount" . | nindent 10 }}
-          {{- include "jmxPrometheus.tmpVolumeMount" . | nindent 10 }}
          ports:
            - name: {{ .Values.service.name1 }}
              containerPort: {{ .Values.service.port1 }}
@@ -190,7 +249,6 @@ spec:
              containerPort: {{ .Values.service.port5 }}
              protocol: TCP
            {{- end }}
-            {{- include "jmxPrometheus.port" . | nindent 12 }}
          resources:
            {{- toYaml .Values.resources | nindent 12 }}
      {{- with .Values.nodeSelector }}
@@ -209,7 +267,7 @@ spec:
      volumes:
      - name: certificates
        secret:
-          secretName: tip-common-opensync-gw-certs
+          secretName: {{ include "common.fullname" . }}-certs
      - name: logback-config
        configMap:
            name: {{ include "common.fullname" . }}-log-config
@@ -220,5 +278,3 @@ spec:
      {{- else }}
        emptyDir: {}
      {{- end }}
-      {{- include "jmxPrometheus.configVolume" . | nindent 6 }}
-      {{- include "jmxPrometheus.tmpVolume" . | nindent 6 }}
--- a/tip-wlan/charts/opensync-gw-cloud/templates/pod-monitor.yaml
+++ b/tip-wlan/charts/opensync-gw-cloud/templates/pod-monitor.yaml
@@ -1 +0,0 @@
-{{ include "jmxPrometheus.podMonitor" . }}
--- a/tip-wlan/charts/opensync-gw-cloud/templates/rbac.yaml
+++ b/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
--- a/tip-wlan/charts/opensync-gw-cloud/templates/secret.yaml
+++ b/tip-wlan/charts/opensync-gw-cloud/templates/secret.yaml
@@ -0,0 +1,8 @@
+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 }}
--- a/tip-wlan/charts/opensync-gw-cloud/templates/service.yaml
+++ b/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,28 @@ 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 }}
--- a/tip-wlan/charts/opensync-gw-cloud/templates/tests/test-connection.yaml
+++ b/tip-wlan/charts/opensync-gw-cloud/templates/tests/test-connection.yaml
@@ -11,7 +11,7 @@ metadata:
 spec:
  containers:
    - name: wget
-      image: {{ .Values.testConnectionImage.registry }}/{{ .Values.testConnectionImage.repository }}:{{ .Values.testConnectionImage.tag }}
+      image: busybox
      command: ['wget']
      args: ['{{ include "common.fullname" . }}:{{ .Values.service.port1 }}']
  restartPolicy: Never
--- a/tip-wlan/charts/opensync-gw-cloud/values.yaml
+++ b/tip-wlan/charts/opensync-gw-cloud/values.yaml
@@ -11,22 +11,7 @@ replicaCount: 1

 image:
  name: opensync-gateway-cloud
-  tag: 1.2.0-SNAPSHOT
-
-waitForServicesImage:
-  registry: tip-docker-cache-repo.jfrog.io
-  repository: opsfleet/depends-on
-  tag: v1.0.0
-
-intCloudReadinessImage:
-  registry: tip-docker-cache-repo.jfrog.io
-  repository: library/alpine
-  tag: 3.13
-
-testConnectionImage:
-  registry: tip-docker-cache-repo.jfrog.io
-  repository: library/alpine
-  tag: 3.13
+  tag: 0.0.1-SNAPSHOT

 nameOverride: ""
 fullnameOverride: ""
@@ -67,15 +52,12 @@ probes:
    timeoutSeconds: 5
    successThreshold: 1
    failureThreshold: 3
-  startupProbe:
-    periodSeconds: 30
-    failureThreshold: 500

 # Enable/Disable Helm tests
 testsEnabled: false

 # Enable/Disable Remote debugging
-debug:
+debug: 
  enabled: false

 service:
@@ -95,8 +77,6 @@ service:
  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
@@ -105,9 +85,9 @@ persistence:

 # 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
+# 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
+# HTTP server in your system 
 filestore:
  internal: "/tmp/filestore"
  url: DUMMY_FILESTORE_HTTPS_URL
@@ -133,8 +113,9 @@ portal:
      name: file-store-data
      ordinal: 0

+
 # These are the address and ports for the externalhost
-# This is important for ovsdb and mqtt since
+# 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
@@ -146,28 +127,14 @@ externalhost:
    ovsdb: 6640
    mqtt: 1883

+
+
 ethernetType:
  lanName: "lan"
  lanType: "bridge"
  wanType: "bridge"
  wanName: "wan"

-scalability:
-  #how many concurrent connections single instance of OpenSyncGateway can accept
-  tip_wlan_ovsdb_listener_threadPoolSize: 50
-  #asynchronous task executor - monitor metrics and adjust if tasks start being rejected
-  tip_wlan_AsyncExecutor_CorePoolSize: 10
-  tip_wlan_AsyncExecutor_MaxPoolSize: 50
-  tip_wlan_AsyncExecutor_QueueCapacity: 50
-  #max total number of persistent connections in the http client pool
-  tip_wlan_httpClientConfig_maxConnectionsTotal: 100
-  #max number of persistent connections in the http client pool per destination
-  tip_wlan_httpClientConfig_maxConnectionsPerRoute: 10
-  #max number of concurrent REST API calls a single instance of this service can process
-  tip_wlan_maxHttpThreads:  100
-  #memory tuning parameters for the JVM - max size, initialsize, garbage collection tuning options, etc.
-  JVM_MEM_OPTIONS: " "
-
 ingress:
  enabled: false
  annotations: {}
@@ -181,13 +148,17 @@ ingress:
  #    hosts:
  #      - chart-example.local

-resources:
-  limits:
-    cpu: 500m
-    memory: 750Mi
-  requests:
-    cpu: 10m
-    memory: 500Mi
+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: {}

--- a/tip-wlan/charts/opensync-gw-static/resources/config/certs/README.md
+++ b/tip-wlan/charts/opensync-gw-static/resources/config/certs/README.md
@@ -0,0 +1,2 @@
+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
--- a/tip-wlan/charts/opensync-gw-static/resources/config/certs/httpClientConfig.json
+++ b/tip-wlan/charts/opensync-gw-static/resources/config/certs/httpClientConfig.json
@@ -0,0 +1,21 @@
+{
+    "maxConnectionsTotal": 100,
+    "maxConnectionsPerRoute": 10,
+    "truststoreType": "JKS",
+    "truststoreProvider": "SUN",
+    "truststoreFile": "file:/opt/tip-wlan/certs/truststore.jks",
+    "truststorePass": "mypassword",
+    "keystoreType": "JKS",
+    "keystoreProvider": "SUN",
+    "keystoreFile": "file:/opt/tip-wlan/certs/client_keystore.jks",
+    "keystorePass": "mypassword",
+    "keyAlias": "clientkeyalias",
+    "credentialsList": [
+        {
+            "host": "localhost",
+            "port": -1,
+            "user": "user",
+            "password": "password"
+        }
+    ]
+}
--- a/tip-wlan/charts/opensync-gw-static/resources/config/certs/ssl.properties
+++ b/tip-wlan/charts/opensync-gw-static/resources/config/certs/ssl.properties
@@ -0,0 +1,13 @@
+truststorePass=mypassword
+truststoreFile=file:///opt/tip-wlan/certs/truststore.jks
+truststoreType=JKS
+truststoreProvider=SUN
+
+keyAlias=1
+keystorePass=mypassword
+keystoreFile=file:///opt/tip-wlan/certs/server.pkcs12
+keystoreType=pkcs12
+keystoreProvider=SunJSSE
+
+sslProtocol=TLS
+
--- a/tip-wlan/charts/opensync-gw-static/resources/config/logback.xml
+++ b/tip-wlan/charts/opensync-gw-static/resources/config/logback.xml
@@ -13,8 +13,8 @@
      <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>

@@ -23,7 +23,7 @@
    </encoder>
  </appender>
  -->
-
+  
  <appender name="logfile" class="ch.qos.logback.core.rolling.RollingFileAppender">
    <file>/app/logs/opensyncgw.log</file>
    <append>true</append>
@@ -39,37 +39,37 @@
      <maxFileSize>20MB</maxFileSize>
    </triggeringPolicy>
  </appender>
-
+      
  <!--
  details: http://logback.qos.ch/manual/configuration.html#auto_configuration
-
-  runtime configuration, if need to override the defaults:
+   
+  runtime configuration, if need to override the defaults: 
  	-Dlogback.configurationFile=/path/to/logback.xml
-
-  for log configuration debugging - use
+  
+  for log configuration debugging - use 
  	-Dlogback.statusListenerClass=ch.qos.logback.core.status.OnConsoleStatusListener
-
+  
  log levels:
-	OFF ERROR WARN INFO DEBUG TRACE
+	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>
--- a/tip-wlan/charts/opensync-gw-static/templates/configmap.yaml
+++ b/tip-wlan/charts/opensync-gw-static/templates/configmap.yaml
@@ -4,4 +4,4 @@ metadata:
  name: {{ include "common.fullname" . }}-log-config
  namespace: {{ include "common.namespace" . }}
 data:
-{{ (.Files.Glob "resources/config/logback.xml").AsConfig | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/logback.xml").AsConfig . | indent 2 }}
--- a/tip-wlan/charts/opensync-gw-static/templates/deployment.yaml
+++ b/tip-wlan/charts/opensync-gw-static/templates/deployment.yaml
@@ -25,16 +25,16 @@ spec:
          securityContext:
            {{- toYaml .Values.securityContext | nindent 12 }}
          {{- if .Values.global.testingEnabled }}
-          image: {{ .Values.global.repository.registry  }}/{{ .Values.image.name }}:{{ .Values.image.tag }}-{{.Values.global.testingTimestamp}}
+          image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}-{{.Values.global.testingTimestamp}}
          {{- else }}
-          image: {{ .Values.global.repository.registry  }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
+          image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
          {{- end }}
-          imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
+          imagePullPolicy: {{ .Values.global.pullPolicy }}
          {{- if .Values.probes.enabled }}
          livenessProbe:
            tcpSocket:
              port: {{ .Values.service.port2 }}
-            initialDelaySeconds: {{ .Values.probes.livenessProbe.initialDelaySeconds }}
+            initialDelaySeconds: {{ .Values.probes.livenessProbe.initialDelaySeconds }}  
            timeoutSeconds: {{ .Values.probes.livenessProbe.timeoutSeconds }}
            failureThreshold: {{ .Values.probes.livenessProbe.failureThreshold }}
            periodSeconds: {{ .Values.probes.livenessProbe.periodSeconds }}
@@ -47,12 +47,7 @@ spec:
            failureThreshold: {{ .Values.probes.readinessProbe.failureThreshold }}
            periodSeconds: {{ .Values.probes.readinessProbe.periodSeconds }}
            successThreshold: {{ .Values.probes.readinessProbe.successThreshold }}
-          startupProbe:
-            tcpSocket:
-              port: {{ .Values.service.port2 }}
-            failureThreshold: {{ .Values.probes.startupProbe.failureThreshold }}
-            periodSeconds: {{ .Values.probes.startupProbe.periodSeconds}}
-          {{- end }}
+          {{- end }}       
          volumeMounts:
          - mountPath: /opt/tip-wlan/certs/client_keystore.jks
            name: certificates
@@ -97,7 +92,7 @@ spec:
      volumes:
      - name: certificates
        secret:
-          secretName: tip-common-opensync-gw-certs
+          secretName: {{ include "common.fullname" . }}-certs
      - name: logback-config
        configMap:
            name: {{ include "common.fullname" . }}-log-config
--- a/tip-wlan/charts/opensync-gw-static/templates/secret.yaml
+++ b/tip-wlan/charts/opensync-gw-static/templates/secret.yaml
@@ -0,0 +1,8 @@
+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 }}
--- a/tip-wlan/charts/opensync-gw-static/templates/tests/test-connection.yaml
+++ b/tip-wlan/charts/opensync-gw-static/templates/tests/test-connection.yaml
@@ -11,7 +11,7 @@ metadata:
 spec:
  containers:
    - name: wget
-      image: {{ .Values.testConnectionImage.registry }}/{{ .Values.testConnectionImage.repository }}:{{ .Values.testConnectionImage.tag }}
+      image: busybox
      command: ['wget']
      args: ['{{ include "common.fullname" . }}:{{ .Values.service.port1 }}']
  restartPolicy: Never
--- a/tip-wlan/charts/opensync-gw-static/values.yaml
+++ b/tip-wlan/charts/opensync-gw-static/values.yaml
@@ -11,12 +11,7 @@ replicaCount: 1

 image:
  name: opensync-gateway-static
-  tag: 1.2.0-SNAPSHOT
-
-testConnectionImage:
-  registry: tip-docker-cache-repo.jfrog.io
-  repository: library/alpine
-  tag: 3.13
+  tag: 0.0.1-SNAPSHOT

 nameOverride: ""
 fullnameOverride: ""
@@ -57,9 +52,6 @@ probes:
    timeoutSeconds: 5
    successThreshold: 1
    failureThreshold: 3
-  startupProbe:
-    periodSeconds: 30
-    failureThreshold: 500

 # Enable/Disable Helm tests
 testsEnabled: false
--- a/tip-wlan/charts/opensync-mqtt-broker/resources/config/certs/README.md
+++ b/tip-wlan/charts/opensync-mqtt-broker/resources/config/certs/README.md
@@ -0,0 +1,2 @@
+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
--- a/tip-wlan/charts/opensync-mqtt-broker/resources/config/mosquitto.conf
+++ b/tip-wlan/charts/opensync-mqtt-broker/resources/config/mosquitto.conf
@@ -6,18 +6,7 @@ use_identity_as_username true
 allow_anonymous false
 allow_duplicate_messages true
 autosave_interval 900
-log_dest file /mosquitto/log/mosquitto.log
-log_timestamp true
-log_timestamp_format %Y-%m-%dT%H:%M:%S
-log_type error
-log_type warning
-log_type notice
-log_type information
-# log_type debug
-# log_type websockets
-# log_type subscribe
-# log_type all
-connection_messages true
+log_dest stdout
 max_queued_bytes 0
 max_queued_messages 0
 message_size_limit 0
--- a/tip-wlan/charts/opensync-mqtt-broker/templates/configmap.yaml
+++ b/tip-wlan/charts/opensync-mqtt-broker/templates/configmap.yaml
@@ -4,4 +4,4 @@ metadata:
  name: mosquitto-config
  namespace: {{ include "common.namespace" . }}
 data:
-{{ (.Files.Glob "resources/config/mosquitto.conf").AsConfig | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/mosquitto.conf").AsConfig . | indent 2 }}
--- a/tip-wlan/charts/opensync-mqtt-broker/templates/secret.yaml
+++ b/tip-wlan/charts/opensync-mqtt-broker/templates/secret.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: opensync-mqtt-broker-certs
+  namespace: {{ include "common.namespace" . }}
+type: Opaque
+data:
+{{ tpl (.Files.Glob "resources/config/certs/*").AsSecrets . | indent 2 }}
--- a/tip-wlan/charts/opensync-mqtt-broker/templates/service.yaml
+++ b/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,11 @@ 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 }}
--- a/tip-wlan/charts/opensync-mqtt-broker/templates/statefulset.yaml
+++ b/tip-wlan/charts/opensync-mqtt-broker/templates/statefulset.yaml
@@ -45,8 +45,7 @@ spec:
        {{- toYaml .Values.podSecurityContext | nindent 8 }}
      initContainers:
        - name: {{ include "common.name" . }}-init-dir-ownership-change
-          image: {{ .Values.alpine.registry }}/{{ .Values.alpine.repository }}:{{ .Values.alpine.tag }}
-          imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
+          image: alpine:3.6
          # Change ownership to `mosquitto` user for a mounted volume
          command:
          - sh
@@ -63,13 +62,13 @@ spec:
        - name: {{ .Chart.Name }}
          securityContext:
            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
-          imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
+          image: {{ .Values.image.name }}:{{ .Values.image.tag }}
+          imagePullPolicy: {{ .Values.global.pullPolicy }}
          {{- if .Values.probes.enabled }}
          livenessProbe:
            tcpSocket:
              port: {{ .Values.service.port1 }}
-            initialDelaySeconds: {{ .Values.probes.livenessProbe.initialDelaySeconds }}
+            initialDelaySeconds: {{ .Values.probes.livenessProbe.initialDelaySeconds }}  
            timeoutSeconds: {{ .Values.probes.livenessProbe.timeoutSeconds }}
            failureThreshold: {{ .Values.probes.livenessProbe.failureThreshold }}
            periodSeconds: {{ .Values.probes.livenessProbe.periodSeconds }}
@@ -82,11 +81,6 @@ spec:
            failureThreshold: {{ .Values.probes.readinessProbe.failureThreshold }}
            periodSeconds: {{ .Values.probes.readinessProbe.periodSeconds }}
            successThreshold: {{ .Values.probes.readinessProbe.successThreshold }}
-          startupProbe:
-            tcpSocket:
-              port: {{ .Values.service.port1 }}
-            failureThreshold: {{ .Values.probes.startupProbe.failureThreshold }}
-            periodSeconds: {{ .Values.probes.startupProbe.periodSeconds}}
          {{- end }}
          volumeMounts:
          - mountPath: /certs/cacert.pem
@@ -129,7 +123,7 @@ spec:
      volumes:
      - name: opensync-mqtt-broker-truststore
        secret:
-          secretName: tip-common-opensync-mqtt-broker-certs
+          secretName: opensync-mqtt-broker-certs
      - name: opensync-mqtt-broker-conf
        configMap:
            name: mosquitto-config
--- a/tip-wlan/charts/opensync-mqtt-broker/templates/tests/test-connection.yaml
+++ b/tip-wlan/charts/opensync-mqtt-broker/templates/tests/test-connection.yaml
@@ -11,7 +11,7 @@ metadata:
 spec:
  containers:
    - name: wget
-      image: {{ .Values.testConnectionImage.registry }}/{{ .Values.testConnectionImage.repository }}:{{ .Values.testConnectionImage.tag }}
+      image: busybox
      command: ['wget']
      args: ['{{ include "common.fullname" . }}:{{ .Values.service.port1 }}']
  restartPolicy: Never
--- a/tip-wlan/charts/opensync-mqtt-broker/values.yaml
+++ b/tip-wlan/charts/opensync-mqtt-broker/values.yaml
@@ -5,19 +5,8 @@
 replicaCount: 1

 image:
-  registry: tip-docker-cache-repo.jfrog.io
-  repository: library/eclipse-mosquitto
-  tag: 2.0.3
-
-alpine:
-  registry: tip-docker-cache-repo.jfrog.io
-  repository: library/alpine
-  tag: 3.6
-
-testConnectionImage:
-  registry: tip-docker-cache-repo.jfrog.io
-  repository: library/alpine
-  tag: 3.13
+  name: eclipse-mosquitto
+  tag: latest

 nameOverride: ""
 fullnameOverride: ""
@@ -60,9 +49,6 @@ probes:
    timeoutSeconds: 5
    successThreshold: 1
    failureThreshold: 3
-  startupProbe:
-    periodSeconds: 30
-    failureThreshold: 500

 # Enable/Disable Helm tests
 testsEnabled: false
@@ -75,8 +61,6 @@ service:
  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
@@ -91,13 +75,17 @@ ingress:
  #    hosts:
  #      - chart-example.local

-resources:
-  limits:
-    cpu: 500m
-    memory: 128Mi
-  requests:
-    cpu: 10m
-    memory: 5Mi
+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

 priorityClassName: ""

@@ -116,7 +104,7 @@ persistence:
  ## existingClaimData: opensync-wifi-controller-opensync-mqtt-broker-data
  ## existingClaimDb: opensync-wifi-controller-opensync-mqtt-broker-db
  ## volumeReclaimPolicy: Retain
-  ## If you want to bind to an existing PV, uncomment below with the pv name
+  ## If you want to bind to an existing PV, uncomment below with the pv name 
  ## and comment storageClass and belowannotation
  ## volumeNameDb: pvc-dc52b290-ae86-4cb3-aad0-f2c806a23114
  ## volumeNameData: pvc-735baedf-323b-47bc-9383-952e6bc5ce3e
--- a/tip-wlan/charts/wlan-cloud-graphql-gw/templates/deployment.yaml
+++ b/tip-wlan/charts/wlan-cloud-graphql-gw/templates/deployment.yaml
@@ -25,9 +25,9 @@ spec:
          securityContext:
            {{- toYaml .Values.securityContext | nindent 12 }}
          {{- if .Values.global.testingEnabled }}
-          image: {{ .Values.global.repository.registry  }}/{{ .Values.image.name }}:{{ .Values.image.tag }}-{{.Values.global.testingTimestamp}}
+          image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}-{{.Values.global.testingTimestamp}}
          {{- else }}
-          image: {{ .Values.global.repository.registry  }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
+          image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
          {{- end }}
          imagePullPolicy: {{ .Values.global.pullPolicy }}
          env:
--- a/tip-wlan/charts/wlan-cloud-graphql-gw/templates/ingress.yaml
+++ b/tip-wlan/charts/wlan-cloud-graphql-gw/templates/ingress.yaml
@@ -1,9 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "common.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-apiVersion: networking.k8s.io/v1
-{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}
 apiVersion: extensions/v1beta1
@@ -26,9 +24,7 @@ spec:
      {{- range .hosts }}
        - {{ . | quote }}
      {{- end }}
-      {{- if .secretName }}
      secretName: {{ .secretName }}
-      {{- end }}
  {{- end }}
 {{- end }}
  rules:
@@ -36,37 +32,11 @@ spec:
    - host: {{ .host | quote }}
      http:
        paths:
-        {{- if $.Values.ingress.lb_https_redirect }}
-          - path: /*
-            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-            pathType: ImplementationSpecific
-            {{- end }}
-            backend:
-              {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-              service:
-                name: ssl-redirect
-                port:
-                  name: use-annotation
-              {{- else -}}
-              serviceName: ssl-redirect
-              servicePort: use-annotation
-              {{- end }}
-        {{- end }}
        {{- range .paths }}
          - path: {{ . }}
-            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-            pathType: ImplementationSpecific
-            {{- end }}
            backend:
-              {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $svcPort }}
-              {{- else -}}
              serviceName: {{ $fullName }}
              servicePort: {{ $svcPort }}
-              {{- end }}
        {{- end }}
  {{- end }}
 {{- end }}
--- a/tip-wlan/charts/wlan-cloud-graphql-gw/templates/service.yaml
+++ b/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 }}
--- a/tip-wlan/charts/wlan-cloud-graphql-gw/templates/tests/test-connection.yaml
+++ b/tip-wlan/charts/wlan-cloud-graphql-gw/templates/tests/test-connection.yaml
@@ -11,7 +11,7 @@ metadata:
 spec:
  containers:
    - name: wget
-      image: {{ .Values.testConnectionImage.registry }}/{{ .Values.testConnectionImage.repository }}:{{ .Values.testConnectionImage.tag }}
+      image: busybox
      command: ['wget']
      args: ['{{ include "common.fullname" . }}:{{ .Values.service.port }}']
  restartPolicy: Never
--- a/tip-wlan/charts/wlan-cloud-graphql-gw/values.yaml
+++ b/tip-wlan/charts/wlan-cloud-graphql-gw/values.yaml
@@ -9,16 +9,11 @@

 replicaCount: 1

-image:
+image: 
  name: wlan-cloud-graphql-gw
-  tag: 1.2.0-SNAPSHOT
+  tag: latest
  pullPolicy: IfNotPresent

-testConnectionImage:
-  registry: tip-docker-cache-repo.jfrog.io
-  repository: library/alpine
-  tag: 3.13
-
 nameOverride: ""
 fullnameOverride: ""

@@ -56,31 +51,33 @@ 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"
-  hosts: []
-  #  - host: wlan-ui-graphql.local
-  #    paths: [
-  #       /
-  #      ]
+  hosts:
+    - host: wlan-ui-graphql.zone3.lab.connectus.ai
+      paths: [
+         /
+        ]
  tls: []
  #  - secretName: chart-example-tls
  #    hosts:
-  #      - wlan-ui-graphql.local
+  #      - chart-example.local

-resources:
-  limits:
-    cpu: 500m
-    memory: 128Mi
-  requests:
-    cpu: 10m
-    memory: 128Mi
+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: {}

--- a/tip-wlan/charts/wlan-cloud-static-portal/templates/deployment.yaml
+++ b/tip-wlan/charts/wlan-cloud-static-portal/templates/deployment.yaml
@@ -25,11 +25,11 @@ spec:
          securityContext:
            {{- toYaml .Values.securityContext | nindent 12 }}
          {{- if .Values.global.testingEnabled }}
-          image: {{ .Values.global.repository.registry  }}/{{ .Values.image.name }}:{{ .Values.image.tag }}-{{.Values.global.testingTimestamp}}
+          image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}-{{.Values.global.testingTimestamp}}
          {{- else }}
-          image: {{ .Values.global.repository.registry  }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
+          image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
          {{- end }}
-          imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
+          imagePullPolicy: {{ .Values.global.pullPolicy }}
          env:
          - name: API
            value: {{ .Values.env.graphql }}
--- a/tip-wlan/charts/wlan-cloud-static-portal/templates/ingress.yaml
+++ b/tip-wlan/charts/wlan-cloud-static-portal/templates/ingress.yaml
@@ -1,9 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "common.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-apiVersion: networking.k8s.io/v1
-{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}
 apiVersion: extensions/v1beta1
@@ -26,9 +24,7 @@ spec:
      {{- range .hosts }}
        - {{ . | quote }}
      {{- end }}
-      {{- if .secretName }}
      secretName: {{ .secretName }}
-      {{- end }}
  {{- end }}
 {{- end }}
  rules:
@@ -36,37 +32,11 @@ spec:
    - host: {{ .host | quote }}
      http:
        paths:
-        {{- if $.Values.ingress.lb_https_redirect }}
-          - path: /*
-            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-            pathType: ImplementationSpecific
-            {{- end }}
-            backend:
-              {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-              service:
-                name: ssl-redirect
-                port:
-                  name: use-annotation
-              {{- else -}}
-              serviceName: ssl-redirect
-              servicePort: use-annotation
-              {{- end }}
-        {{- end }}
        {{- range .paths }}
          - path: {{ . }}
-            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-            pathType: ImplementationSpecific
-            {{- end }}
            backend:
-              {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $svcPort }}
-              {{- else -}}
              serviceName: {{ $fullName }}
              servicePort: {{ $svcPort }}
-              {{- end }}
        {{- end }}
  {{- end }}
 {{- end }}
--- a/tip-wlan/charts/wlan-cloud-static-portal/templates/service.yaml
+++ b/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:
--- a/tip-wlan/charts/wlan-cloud-static-portal/templates/tests/test-connection.yaml
+++ b/tip-wlan/charts/wlan-cloud-static-portal/templates/tests/test-connection.yaml
@@ -11,7 +11,7 @@ metadata:
 spec:
  containers:
    - name: wget
-      image: {{ .Values.testConnectionImage.registry }}/{{ .Values.testConnectionImage.repository }}:{{ .Values.testConnectionImage.tag }}
+      image: busybox
      command: ['wget']
      args: ['{{ include "common.fullname" . }}:{{ .Values.service.port }}']
  restartPolicy: Never
--- a/tip-wlan/charts/wlan-cloud-static-portal/values.yaml
+++ b/tip-wlan/charts/wlan-cloud-static-portal/values.yaml
@@ -9,16 +9,11 @@

 replicaCount: 1

-image:
+image: 
  name: wlan-cloud-ui
-  tag: 1.2.0-SNAPSHOT
+  tag: latest
  pullPolicy: IfNotPresent

-testConnectionImage:
-  registry: tip-docker-cache-repo.jfrog.io
-  repository: library/alpine
-  tag: 3.13
-
 nameOverride: ""
 fullnameOverride: ""

@@ -55,27 +50,30 @@ 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"
-  hosts: []
-  #  - host: wlan-ui.local
-  #    paths: [
-  #       /
-  #      ]
+  hosts:
+    - host: wlan-ui.zone3.lab.connectus.ai
+      paths: [
+         /
+        ]
  tls: []
  #  - secretName: chart-example-tls
  #    hosts:
-  #      - wlan-ui.local
+  #      - chart-example.local

-resources:
-  limits:
-    cpu: 500m
-    memory: 128Mi
-  requests:
-    cpu: 10m
-    memory: 5Mi
+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: {}

--- a/tip-wlan/charts/wlan-integrated-cloud-component-service/resources/config/certs/README.md
+++ b/tip-wlan/charts/wlan-integrated-cloud-component-service/resources/config/certs/README.md
@@ -0,0 +1,2 @@
+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
--- a/tip-wlan/charts/wlan-integrated-cloud-component-service/resources/config/logback.xml
+++ b/tip-wlan/charts/wlan-integrated-cloud-component-service/resources/config/logback.xml
@@ -46,6 +46,7 @@
    </triggeringPolicy>
  </appender>

+
  <!--
  details: http://logback.qos.ch/manual/configuration.html#auto_configuration

@@ -70,5 +71,5 @@
    <appender-ref ref="stdout"/>
    <appender-ref ref="logfile"/>
  </root>
-
+  
 </configuration>
--- a/tip-wlan/charts/wlan-integrated-cloud-component-service/templates/configmap.yaml
+++ b/tip-wlan/charts/wlan-integrated-cloud-component-service/templates/configmap.yaml
@@ -4,4 +4,4 @@ metadata:
  name: {{ include "common.fullname" . }}-log-config
  namespace: {{ include "common.namespace" . }}
 data:
-{{ (.Files.Glob "resources/config/logback.xml").AsConfig | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/logback.xml").AsConfig . | indent 2 }}
--- a/tip-wlan/charts/wlan-integrated-cloud-component-service/templates/deployment.yaml
+++ b/tip-wlan/charts/wlan-integrated-cloud-component-service/templates/deployment.yaml
@@ -19,126 +19,121 @@ spec:
        {{- include "common.selectorLabels" . | nindent 8 }}
    spec:
      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
+        - name: "{{ include "common.namespace" . }}-docker-registry-key"
      serviceAccountName: {{ include "common.serviceAccountName" . }}
      securityContext:
        {{- toYaml .Values.podSecurityContext | nindent 8 }}
      {{- if .Values.integratedWithPersistence.enabled }}
      initContainers:
-      - name: wait-for-services
-        image: {{ .Values.waitForServicesImage.registry }}/{{ .Values.waitForServicesImage.repository }}:{{ .Values.waitForServicesImage.tag }}
-        args:
-        - "-service={{ .Release.Name }}-postgresql"
-        - -check_interval=5
-      - name: {{ include "common.name" . }}-create-db-schema
-        env:
-        - name: POSTGRESQL_PORT_NUMBER
-          value: "5432"
-        - name: POSTGRES_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "common.fullname" . }}-creds
-              key: postgresql-password
-        - name: SCHEMA_REPO_USER
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "common.fullname" . }}-creds
-              key: schema-repo-user
-        - name: SCHEMA_REPO_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "common.fullname" . }}-creds
-              key: schema-repo-password
-        image: {{ .Values.createDbSchemaImage.registry }}/{{ .Values.createDbSchemaImage.repository }}:{{ .Values.createDbSchemaImage.tag }}
-        args:
-        imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
-        command:
-        - sh
-        - -c
-        - |
-          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"
-          echo "***** Now executing cloud-sdk-schema-postgresql.sql and creating/updating schema on Postgres instance *****"
-          PGPASSWORD=$POSTGRES_PASSWORD psql -h {{- include "postgresql.service" . -}} -U postgres -f cloud-sdk-schema-postgresql.sql
-          exit
-        resources:
-          requests:
-            cpu: 50m
-            memory: 256Mi
-        terminationMessagePath: /dev/termination-log
-        terminationMessagePolicy: File
-        volumeMounts:
-        - mountPath: /dev/shm
-          name: dshm
-        - mountPath: /bitnami/postgresql
-          name: data
+        - name: {{ include "common.name" . }}-readiness
+          image: busybox:1.28
+          imagePullPolicy: {{ .Values.global.pullPolicy }}
+          command: ['sh', '-c', "until nslookup {{ $pg }}.{{ $ns }}.svc.cluster.local; do echo waiting for POSTGRES; sleep 2; done"]
+        - name: {{ include "common.name" . }}-create-db-schema
+          env:
+          - name: POSTGRESQL_PORT_NUMBER
+            value: "5432"
+          - name: POSTGRES_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "common.fullname" . }}-creds
+                key: postgresql-password
+          - name: SCHEMA_REPO_USER
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "common.fullname" . }}-creds
+                key: schema-repo-user
+          - name: SCHEMA_REPO_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "common.fullname" . }}-creds
+                key: schema-repo-password
+          image: postgres:latest
+          imagePullPolicy: {{ .Values.global.pullPolicy }}
+          command:
+          - sh
+          - -c
+          - |
+            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"
+            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
+          ports:
+          - containerPort: 5432
+            name: tcp-postgresql
+            protocol: TCP
+          resources:
+            requests:
+              cpu: 250m
+              memory: 256Mi
+          terminationMessagePath: /dev/termination-log
+          terminationMessagePolicy: File
+          volumeMounts:
+          - mountPath: /dev/shm
+            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.registry  }}/{{ .Values.image.name }}:{{ .Values.image.tag }}-{{.Values.global.testingTimestamp}}
-        {{- else }}
-        image: {{ .Values.global.repository.registry  }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
-        {{- end }}
-        imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
-        env:
-          - name: BACKEND_SERVER
-            value: {{ .Release.Name }}-{{ .Chart.Name }}
-        {{- if .Values.probes.enabled }}
-        livenessProbe:
-          httpGet:
-            path: /ping
-            port: {{ .Values.service.port1 }}
-            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.port1 }}
-            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 }}
-        startupProbe:
-          httpGet:
-            path: /ping
-            port: {{ .Values.service.port1 }}
-            scheme: {{ .Values.probes.readinessProbe.scheme }}
-          failureThreshold: {{ .Values.probes.startupProbe.failureThreshold }}
-          periodSeconds: {{ .Values.probes.startupProbe.periodSeconds}}
-        {{- 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/intcloudcomp/logback.xml
-          name: logback-config
-          subPath: logback.xml
-        ports:
-          - name: {{ .Values.service.name1 }}
-            containerPort: {{ .Values.service.port1 }}
-            protocol: TCP
-          - name: {{ .Values.service.name2 }}
-            containerPort: {{ .Values.service.port2 }}
-            protocol: TCP
-        resources:
-          {{- toYaml .Values.resources | nindent 12 }}
+        - 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:
+              path: /ping
+              port: {{ .Values.service.port1 }}
+              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.port1 }}
+              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/intcloudcomp/logback.xml
+            name: logback-config
+            subPath: logback.xml
+          ports:
+            - name: {{ .Values.service.name1 }}
+              containerPort: {{ .Values.service.port1 }}
+              protocol: TCP
+            - name: {{ .Values.service.name2 }}
+              containerPort: {{ .Values.service.port2 }}
+              protocol: TCP
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
      {{- with .Values.nodeSelector }}
      nodeSelector:
        {{- toYaml . | nindent 8 }}
@@ -155,7 +150,7 @@ spec:
      volumes:
      - name: certificates
        secret:
-          secretName: tip-common-postgres-client-certs
+          secretName: {{ include "common.fullname" . }}-certs
      - name: logback-config
        configMap:
            name: {{ include "common.fullname" . }}-log-config
--- a/tip-wlan/charts/wlan-integrated-cloud-component-service/templates/secret.yaml
+++ b/tip-wlan/charts/wlan-integrated-cloud-component-service/templates/secret.yaml
@@ -1,5 +1,4 @@
 {{- if .Values.global.integratedDeployment }}
---
 apiVersion: v1
 kind: Secret
 metadata:
@@ -8,8 +7,9 @@ metadata:
 type: Opaque
 data:
 {{ tpl (.Files.Glob "resources/config/certs/*").AsSecrets . | indent 2 }}
-
+{{- end}}
 ---
+{{- if .Values.global.integratedDeployment }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -22,7 +22,9 @@ metadata:
    heritage: {{ .Release.Service | quote }}
 type: Opaque
 data:
-  postgresql-password: {{ .Values.global.postgres.password | b64enc | quote }}
-  schema-repo-user: {{ .Values.global.schema.username | b64enc | quote }}
-  schema-repo-password: {{ .Values.global.schema.password | b64enc | quote }}
+  {{- if .Values.creds.enabled }}
+  postgresql-password: {{ .Values.creds.postgres.password | b64enc | quote }}
+  schema-repo-user: {{ .Values.creds.schema_repo.username | b64enc | quote }}
+  schema-repo-password: {{ .Values.creds.schema_repo.password | b64enc | quote }}
+  {{- end }}
 {{- end}}
--- a/tip-wlan/charts/wlan-integrated-cloud-component-service/templates/tests/test-connection.yaml
+++ b/tip-wlan/charts/wlan-integrated-cloud-component-service/templates/tests/test-connection.yaml
@@ -11,7 +11,7 @@ metadata:
 spec:
  containers:
    - name: wget
-      image: {{ .Values.testConnectionImage.registry }}/{{ .Values.testConnectionImage.repository }}:{{ .Values.testConnectionImage.tag }}
+      image: busybox
      command: ['wget']
      args: ['{{ include "common.fullname" . }}:{{ .Values.service.port1 }}']
  restartPolicy: Never
--- a/tip-wlan/charts/wlan-integrated-cloud-component-service/values.yaml
+++ b/tip-wlan/charts/wlan-integrated-cloud-component-service/values.yaml
@@ -11,22 +11,7 @@ replicaCount: 1

 image:
  name: wlan-integrated-cloud-component-service
-  tag: 1.2.0-SNAPSHOT
-
-waitForServicesImage:
-  registry: tip-docker-cache-repo.jfrog.io
-  repository: opsfleet/depends-on
-  tag: v1.0.0
-
-testConnectionImage:
-  registry: tip-docker-cache-repo.jfrog.io
-  repository: library/alpine
-  tag: 3.13
-
-createDbSchemaImage:
-  registry: tip-docker-cache-repo.jfrog.io
-  repository: library/postgres
-  tag: 13.2-alpine
+  tag: 0.0.1-SNAPSHOT

 nameOverride: ""
 fullnameOverride: ""
@@ -61,9 +46,6 @@ probes:
    successThreshold: 1
    failureThreshold: 3
    scheme: HTTPS
-  startupProbe:
-    periodSeconds: 30
-    failureThreshold: 500

 securityContext: {}
  # capabilities:
@@ -76,6 +58,14 @@ securityContext: {}
 # Enable/Disable Helm tests
 testsEnabled: false

+creds:
+  enabled: true
+  postgres:
+    password: DUMMY_POSTGRES_PASSWORD
+  schema_repo:
+    username: DUMMY_SCHEMA_REPO_USERNAME
+    password: DUMMY_SCHEMA_REPO_PASSWORD
+
 service:
  type: NodePort
  port1: 9091
@@ -85,7 +75,7 @@ service:
  name2: secondary-port
  nodePort2: 52

-postgresql:
+postgresql: 
  url: postgresql-headless

 integratedWithPersistence:
@@ -96,19 +86,19 @@ ingress:
  annotations: {}
    # kubernetes.io/ingress.class: nginx
    # kubernetes.io/tls-acme: "true"
-  hosts: []
-  #  - host: wlan-integrated-cloud-component-service.local
-  #    paths: [
-  #       /portal
-  #      ]
-  tls: []
-  # - secretName: portal-secret
-  #   hosts:
-  #     - wlan-integrated-cloud-component-service.local
+  hosts:
+    - host: example.com
+      paths: [
+         /portal 
+        ]
+  tls: 
+   - secretName: portal-secret
+     hosts:
+       - example.com

 # Transport-Server-passthrough properties
 tsp:
-  host: wlan-portal-service.local
+  host: wlan-portal-service.zone3.lab.connectus.ai

 resources: {}
  # We usually recommend not to specify default resources and to leave this as a conscious
--- a/tip-wlan/charts/wlan-port-forwarding-gateway-service/resources/config/certs/README.md
+++ b/tip-wlan/charts/wlan-port-forwarding-gateway-service/resources/config/certs/README.md
@@ -0,0 +1,2 @@
+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
--- a/tip-wlan/charts/wlan-port-forwarding-gateway-service/resources/config/logback.xml
+++ b/tip-wlan/charts/wlan-port-forwarding-gateway-service/resources/config/logback.xml
@@ -46,6 +46,7 @@
    </triggeringPolicy>
  </appender>

+
  <!--
  details: http://logback.qos.ch/manual/configuration.html#auto_configuration

@@ -70,5 +71,5 @@
    <appender-ref ref="stdout"/>
    <appender-ref ref="logfile"/>
  </root>
-
+  
 </configuration>
--- a/tip-wlan/charts/wlan-port-forwarding-gateway-service/resources/config/run.sh
+++ b/tip-wlan/charts/wlan-port-forwarding-gateway-service/resources/config/run.sh
@@ -0,0 +1,56 @@
+#!/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
--- a/tip-wlan/charts/wlan-port-forwarding-gateway-service/templates/configmap.yaml
+++ b/tip-wlan/charts/wlan-port-forwarding-gateway-service/templates/configmap.yaml
@@ -4,5 +4,4 @@ metadata:
  name: {{ include "common.fullname" . }}-config
  namespace: {{ include "common.namespace" . }}
 data:
-{{ (.Files.Glob "resources/config/logback.xml").AsConfig | indent 2 }}
-
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
--- a/tip-wlan/charts/wlan-port-forwarding-gateway-service/templates/deployment.yaml
+++ b/tip-wlan/charts/wlan-port-forwarding-gateway-service/templates/deployment.yaml
@@ -22,10 +22,9 @@ spec:
      securityContext:
        {{- toYaml .Values.podSecurityContext | nindent 8 }}
      initContainers:
-        {{- include "jmxPrometheus.initContainer" . | nindent 8 }}
        - name: {{ include "common.name" . }}-readiness-opensync-gw
-          image: {{ .Values.opensyncGwReadinessImage.registry }}/{{ .Values.opensyncGwReadinessImage.repository }}:{{ .Values.opensyncGwReadinessImage.tag }}
-          imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
+          image: alpine
+          imagePullPolicy: {{ .Values.global.pullPolicy }}
          command:
          - sh
          - -c
@@ -48,17 +47,17 @@ spec:
            else
              echo ${url} service failed to respond after 50 secs
              exit 1
-            fi
+            fi        
      containers:
        - name: {{ .Chart.Name }}
          securityContext:
            {{- toYaml .Values.securityContext | nindent 12 }}
          {{- if .Values.global.testingEnabled }}
-          image: {{ .Values.global.repository.registry  }}/{{ .Values.image.name }}:{{ .Values.image.tag }}-{{.Values.global.testingTimestamp}}
+          image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}-{{.Values.global.testingTimestamp}}
          {{- else }}
-          image: {{ .Values.global.repository.registry  }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
+          image: {{ .Values.global.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag }}
          {{- end }}
-          imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
+          imagePullPolicy: {{ .Values.global.pullPolicy }}
          env:
            {{- include "common.env" . | nindent 12 }}
            - name: PF_GATEWAY_RELEASE_URL
@@ -72,19 +71,13 @@ spec:
              value: {{ .Values.externallyVisible.host }}
            - name: PF_GATEWAY_RELEASE_EXT_PORT
              value: "{{ .Values.externallyVisible.port }}"
-            - name: EXT_PORT_RANGE_START
-              value: "{{ include "apDebugPortsStart" . }}"
-            - name: EXT_PORT_RANGE_END
-              value: "{{ sub (include "apDebugPortsEnd" . | atoi) 1 }}"
-            - name: JVM_MEM_OPTIONS
-              value: "{{ include "jmxPrometheus.jvmOpts" . }}"
          {{- if .Values.probes.enabled }}
          livenessProbe:
            httpGet:
              path: /ping
              port: {{ .Values.service.port2 }}
              scheme: {{ .Values.probes.livenessProbe.scheme }}
-            initialDelaySeconds: {{ .Values.probes.livenessProbe.initialDelaySeconds }}
+            initialDelaySeconds: {{ .Values.probes.livenessProbe.initialDelaySeconds }}  
            timeoutSeconds: {{ .Values.probes.livenessProbe.timeoutSeconds }}
            failureThreshold: {{ .Values.probes.livenessProbe.failureThreshold }}
            periodSeconds: {{ .Values.probes.livenessProbe.periodSeconds }}
@@ -99,13 +92,6 @@ spec:
            failureThreshold: {{ .Values.probes.readinessProbe.failureThreshold }}
            periodSeconds: {{ .Values.probes.readinessProbe.periodSeconds }}
            successThreshold: {{ .Values.probes.readinessProbe.successThreshold }}
-          startupProbe:
-            httpGet:
-              path: /ping
-              port: {{ .Values.service.port2 }}
-              scheme: {{ .Values.probes.readinessProbe.scheme }}
-            failureThreshold: {{ .Values.probes.startupProbe.failureThreshold }}
-            periodSeconds: {{ .Values.probes.startupProbe.periodSeconds}}
          {{- end }}
          volumeMounts:
          - mountPath: /opt/tip-wlan/certs/client_keystore.jks
@@ -120,9 +106,9 @@ spec:
          - mountPath: /app/port-forwarding-gateway/logback.xml
            name: configuration
            subPath: logback.xml
-          {{- include "jmxPrometheus.configVolumeMount" . | nindent 10 }}
-          {{- include "jmxPrometheus.tmpVolumeMount" . | nindent 10 }}
-
+          - mountPath: /app/run.sh
+            name: configuration
+            subPath: run.sh
          ports:
            - name: {{ .Values.service.name1 }}
              containerPort: {{ .Values.service.port1 }}
@@ -135,8 +121,7 @@ spec:
              containerPort: {{ .Values.service.port3 }}
              protocol: TCP
            {{- end }}
-            {{- include "container.dev.apDebugPorts" . | nindent 10 }}
-            {{- include "jmxPrometheus.port" . | nindent 12 }}
+            {{- include "container.dev.debugport" . | nindent 10 }}
          resources:
            {{- toYaml .Values.resources | nindent 12 }}
      {{- with .Values.nodeSelector }}
@@ -154,11 +139,9 @@ spec:
      volumes:
      - name: certificates
        secret:
-          secretName: tip-common-kafka-client-certs
+          secretName: {{ include "common.fullname" . }}-certs
          defaultMode: 0400
      - name: configuration
        configMap:
            name: {{ include "common.fullname" . }}-config
-            defaultMode: 0755
-      {{- include "jmxPrometheus.configVolume" . | nindent 6 }}
-      {{- include "jmxPrometheus.tmpVolume" . | nindent 6 }}
+            defaultMode: 0755
--- a/tip-wlan/charts/wlan-port-forwarding-gateway-service/templates/pod-monitor.yaml
+++ b/tip-wlan/charts/wlan-port-forwarding-gateway-service/templates/pod-monitor.yaml
@@ -1 +0,0 @@
-{{ include "jmxPrometheus.podMonitor" . }}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Gleb Boushev	d7ac826a84	postgres moved to a outside chart	2020-11-23 18:54:55 +03:00
Gleb Boushev	05eeda31eb	removing some extra files	2020-11-23 11:46:31 +03:00
Gleb Boushev	44295c7a55	removing accidental files	2020-11-23 11:44:59 +03:00
Gleb Boushev	c248877825	initial postgres rework commit	2020-11-23 11:42:18 +03:00
Gleb Boushev	f0098d1749	minor things updated	2020-11-23 11:42:11 +03:00
Gleb Boushev	2992d325bc	gitignore modified for local development	2020-11-23 10:22:33 +03:00
				`@@ -0,0 +1 @@`
				`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`