release v1.0.0

* automate Helm chart release process

.github/workflows/helm-build.yml

@@ -3,28 +3,60 @@ 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: 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: |
-          helm repo update
-          helm search repo tip
+          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
+      - name: Upload tip-wlan chart to the TIP helm registry
+        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') }}

.github/workflows/prepare-release-description.py

@@ -0,0 +1,24 @@
+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}') 

CHANGELOG.md

@@ -5,29 +5,33 @@ 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](xxx)
+## [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)
+- 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)
+- 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)
 
 ### 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
+- 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)
 
-## [0.4.0](https://github.com/Telecominfraproject/wlan-cloud-helm/compare/f7c67645736e3dac498e2caec8c267f04d08b7bc...v0.4) - 2021-01-28
+### 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.
-
+- 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)

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: 0.4.0
+version: 1.0.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.16.0
+appVersion: 1.0.0
 
 home: https://telecominfraproject.com/wifi/
 sources:

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

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

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

@@ -56,6 +56,8 @@ 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.

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

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: opensync-gateway-cloud
-  tag: 0.0.1-SNAPSHOT
+  tag: 1.0.0
 
 nameOverride: ""
 fullnameOverride: ""

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

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: opensync-gateway-static
-  tag: 0.0.1-SNAPSHOT
+  tag: 1.0.0
 
 nameOverride: ""
 fullnameOverride: ""

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

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: wlan-cloud-graphql-gw
-  tag: 0.0.1-SNAPSHOT
+  tag: 1.0.0
   pullPolicy: IfNotPresent
 
 nameOverride: ""

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

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: wlan-cloud-ui
-  tag: 0.0.1-SNAPSHOT
+  tag: 1.0.0
   pullPolicy: IfNotPresent
 
 nameOverride: ""

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

@@ -58,7 +58,7 @@ spec:
           apt update
           apt -y install curl
           echo "***** Fetching cloud-sdk-schema-postgresql.sql from JFrog *****"
-          curl -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/0.0.1-SNAPSHOT/sql/cloud-sdk-schema-postgresql.sql"
+          curl -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.0.0-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

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

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: wlan-integrated-cloud-component-service
-  tag: 0.0.1-SNAPSHOT
+  tag: 1.0.0
 
 nameOverride: ""
 fullnameOverride: ""
@@ -111,4 +111,4 @@ nodeSelector: {}
 
 tolerations: []
 
-affinity: {}
+affinity: {}

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

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: wlan-port-forwarding-gateway-service
-  tag: 0.0.1-SNAPSHOT
+  tag: 1.0.0
 
 nameOverride: ""
 fullnameOverride: ""

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

@@ -7,7 +7,7 @@
 <!-- For professional support please see                            -->
 <!--    http://www.qos.ch/shop/products/professionalSupport         -->
 <!--                                                                -->
-<configuration>
+<configuration scan="true" scanPeriod="30 seconds">
   <conversionRule conversionWord="filteredStack"
                   converterClass="com.telecominfraproject.wlan.server.exceptions.logback.ExceptionCompressingConverter" />
 

tip-wlan/charts/wlan-portal-service/resources/config/ssl.properties

@@ -0,0 +1,14 @@
+truststorePass={{ .Values.global.certificatePasswords.sslTruststore }}
+truststoreFile=file:///opt/tip-wlan/certs/truststore.jks
+truststoreType=JKS
+truststoreProvider=SUN
+
+keyAlias=1
+keystorePass={{ .Values.global.certificatePasswords.sslKeystore }}
+keystoreFile=file:///opt/tip-wlan/certs/server.pkcs12
+keystoreType=pkcs12
+keystoreProvider=SunJSSE
+
+sslProtocol=TLS
+sslEnabledProtocols=TLSv1.2,TLSv1.1,TLSv1
+sslCiphers=TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA

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

@@ -0,0 +1,10 @@
+{{- if not .Values.tlsv13.enabled }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "common.fullname" . }}-ssl-config
+  namespace: {{ include "common.namespace" . }}
+type: Opaque
+data:
+  ssl.properties: {{ tpl ( .Files.Get "resources/config/ssl.properties" ) . | b64enc }}
+{{- end }}

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

@@ -7,6 +7,7 @@ metadata:
   labels:
     {{- include "common.labels" . | nindent 4 }}
 spec:
+  podManagementPolicy: Parallel
   serviceName: {{ include "common.fullname" . }}
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -113,9 +114,12 @@ spec:
           - mountPath: /opt/tip-wlan/certs/server.pkcs12
             name: certificates
             subPath: server.pkcs12
-          - mountPath: /app/portal/logback.xml
+          - mountPath: /app/portal/log
             name: logback-config
-            subPath: logback.xml
+          {{- if not .Values.tlsv13.enabled }}
+          - mountPath: /app/portal/certs
+            name: ssl-config
+          {{- end }}
           - mountPath: {{ $file_store_path }}
             name: file-store-data
           {{- include "jmxPrometheus.configVolumeMount" . | nindent 10 }}
@@ -155,6 +159,11 @@ spec:
       - name: logback-config
         configMap:
             name: {{ include "common.fullname" . }}-log-config
+      {{- if not .Values.tlsv13.enabled }}
+      - name: ssl-config
+        secret:
+          secretName: {{ include "common.fullname" . }}-ssl-config
+      {{- end }}
       {{- if not .Values.persistence.enabled }}
       - name: file-store-data
         emptyDir: {}

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

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: wlan-portal-service
-  tag: 0.0.1-SNAPSHOT
+  tag: 1.0.0
 
 nameOverride: ""
 fullnameOverride: ""
@@ -153,3 +153,6 @@ env:
 # on the PV
 filestore:
   internal: "/tmp/filestore"
+
+tlsv13:
+  enabled: true

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

@@ -62,8 +62,8 @@ spec:
             apt update
             apt -y install curl
             echo "***** Fetching latest cloud-sdk-schema-postgresql for DB and Tables sql from JFrog *****"
-            curl --insecure -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-db-user.sql"
-            curl --insecure -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-tables.sql"
+            curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.0.0-SNAPSHOT/sql/cloud-sdk-schema-postgresql-db-user.sql"
+            curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.0.0-SNAPSHOT/sql/cloud-sdk-schema-postgresql-tables.sql"
             echo "***** Now executing cloud-sdk-schema-postgresql-db-user.sql on host {{ $pg }} and creating db prov_db and user tip_user using User Postgres. This uses full client-cert authentication *****"
             ### Observed that PSQL was unable to resolve the Postgres-service host because the postgres service wasnt
             ### really ready when running Postgres in Master-Slave config... hence the below retry-logic

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

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: wlan-prov-service
-  tag: 0.0.1-SNAPSHOT
+  tag: 1.0.0
 
 nameOverride: ""
 fullnameOverride: ""
@@ -128,7 +128,7 @@ affinity: {}
 
 postgresql:
   url: postgresql
-  image: postgres:latest
+  image: postgres:11
 
 env:
   protocol: https

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

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: wlan-spc-service
-  tag: 0.0.1-SNAPSHOT
+  tag: 1.0.0
 
 nameOverride: ""
 fullnameOverride: ""

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

@@ -11,8 +11,10 @@ data:
             contact-points = [ "{{ include "cassandra.service" . }}:9042" ]
             load-balancing-policy.local-datacenter = datacenter1
             session-keyspace = tip_wlan_keyspace
+            request.consistency = LOCAL_QUORUM
         }
 
+        advanced.resolve-contact-points = false
         advanced.ssl-engine-factory {
             class = DefaultSslEngineFactory
             hostname-validation = false

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

@@ -54,7 +54,7 @@ spec:
             apt update
             apt -y install curl
             echo "***** Fetching cloud-sdk-schema-cassandra.cql from JFrog *****"
-            curl --insecure -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/cql/cloud-sdk-schema-cassandra.cql"
+            curl --insecure -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/1.0.0-SNAPSHOT/cql/cloud-sdk-schema-cassandra.cql"
             echo "***** Now executing cloud-sdk-schema-cassandra.cql and creating/updating schema on Cassandra instance *****"
             counter=0
             status=1

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

@@ -11,7 +11,7 @@ replicaCount: 1
 
 image:
   name: wlan-ssc-service
-  tag: 0.0.1-SNAPSHOT
+  tag: 1.0.0
 
 nameOverride: ""
 fullnameOverride: ""

tip-wlan/example-values/microk8s-basic/values.yaml

@@ -31,6 +31,8 @@ wlan-cloud-graphql-gw:
   enabled: true
   env:
     portalsvc: tip-wlan-wlan-portal-service:9051
+  service:
+    type: ClusterIP
   ingress:
     hosts:
       - host: wlan-ui-graphql.wlan.local
@@ -45,8 +47,6 @@ wlan-cloud-static-portal:
   enabled: true
   env:
     graphql: https://wlan-ui-graphql.wlan.local
-  service:
-    type: NodePort
   ingress:
     hosts:
       - host: wlan-ui.wlan.local
@@ -67,6 +67,8 @@ wlan-portal-service:
     type: LoadBalancer
     annotations:
       metallb.universe.tf/allow-shared-ip: default
+  tlsv13:
+    enabled: false
 
 wlan-prov-service:
   enabled: true

tip-wlan/values.yaml

@@ -130,6 +130,12 @@ kafka:
     - name: customer_events
       partitions: 1
       replicationFactor: 1
+    - name: location_metrics
+      partitions: 1
+      replicationFactor: 1
+    - name: location_events
+      partitions: 1
+      replicationFactor: 1
   creds:
     sslKeyPassword: *sslKeyPassword
     sslKeystorePassword: *sslKeystorePassword