Changed FE image tag back to 0.0.1-SNAPSHOT

WIFI-1812: Change the front-end image tags

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - 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)
+- Export servo MBeans with JMX Prometheus exporter [#65](https://github.com/Telecominfraproject/wlan-cloud-helm/pull/65)
 
 ### Changed
 

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

@@ -153,3 +153,6 @@ env:
 # on the PV
 filestore:
   internal: "/tmp/filestore"
+
+tlsv13:
+  enabled: true

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

@@ -128,7 +128,7 @@ affinity: {}
 
 postgresql:
   url: postgresql
-  image: postgres:latest
+  image: postgres:11
 
 env:
   protocol: https

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/resources/configs/jmx-prometheus-config.yml

@@ -1,13 +1,15 @@
 lowercaseOutputLabelNames: true
 lowercaseOutputName: true
-whitelistObjectNames: ["java.lang:type=OperatingSystem"]
+whitelistObjectNames:
+  - "java.lang:type=OperatingSystem"
+  - "com.netflix.servo:name=cassandra*,type=COUNTER"
+  - "com.netflix.servo:name=cassandra*,type=GAUGE"
+  - "com.netflix.servo:name=singleDataSource*,type=GAUGE"
+  - "com.netflix.servo:name=singleDataSource*,type=COUNTER"
+  - "com.netflix.servo:name=jdbc*,type=GAUGE"
+  - "com.netflix.servo:name=jdbc*,type=COUNTER"
+  - "com.netflix.servo:name=kafka*,type=GAUGE"
+  - "com.netflix.servo:name=kafka*,type=COUNTER"
+  - "com.netflix.servo:name=osgw*,type=GAUGE"
+  - "com.netflix.servo:name=osgw*,type=COUNTER"
 blacklistObjectNames: []
-rules:
-  - pattern: 'java.lang<type=OperatingSystem><>(committed_virtual_memory|free_physical_memory|free_swap_space|total_physical_memory|total_swap_space)_size:'
-    name: os_$1_bytes
-    type: GAUGE
-    attrNameSnakeCase: true
-  - pattern: 'java.lang<type=OperatingSystem><>((?!process_cpu_time)\w+):'
-    name: os_$1
-    type: GAUGE
-    attrNameSnakeCase: true