Msgdp pub 1.13.0.15

charts/msg-ems-tp/Chart.yaml

@@ -16,4 +16,4 @@ maintainers:
 - email: [email protected]
   name: TIBCO Cloud Messaging Team
 name: msg-ems-tp
-version: "1.12.9"
+version: "1.13.15"

charts/msg-ems-tp/scripts/mk-common.conf.sh

@@ -38,116 +38,116 @@ cat - <<EOF > $outfile
 [FILTER]
     Name modify
     Match *
-    Condition Key_Value_Equals log.level EMERG
-    Set log.level ERROR
+    Condition Key_Value_Equals log.log_level EMERG
+    Set log.log_level ERROR
 
 [FILTER]
     Name modify
     Match *
-    Condition Key_Value_Equals log.level emerg
-    Set log.level ERROR
+    Condition Key_Value_Equals log.log_level emerg
+    Set log.log_level ERROR
 
 [FILTER]
     Name modify
     Match *
-    Condition Key_Value_Equals log.level alert
-    Set log.level ALERT
+    Condition Key_Value_Equals log.log_level alert
+    Set log.log_level ALERT
 
 [FILTER]
     Name modify
     Match *
-    Condition Key_Value_Equals log.level CRIT
-    Set log.level ERROR
+    Condition Key_Value_Equals log.log_level CRIT
+    Set log.log_level ERROR
 
 [FILTER]
     Name modify
     Match *
-    Condition Key_Value_Equals log.level crit
-    Set log.level ERROR
+    Condition Key_Value_Equals log.log_level crit
+    Set log.log_level ERROR
 
 [FILTER]
     Name modify
     Match *
-    Condition Key_Value_Equals log.level seve
-    Set log.level ERROR
+    Condition Key_Value_Equals log.log_level seve
+    Set log.log_level ERROR
 
 [FILTER]
     Name modify
     Match *
-    Condition Key_Value_Equals log.level error
-    Set log.level ERROR
+    Condition Key_Value_Equals log.log_level error
+    Set log.log_level ERROR
 
 [FILTER]
     Name modify
     Match *
-    Condition Key_Value_Equals log.level WARNING
-    Set log.level WARN
+    Condition Key_Value_Equals log.log_level WARNING
+    Set log.log_level WARN
 
 [FILTER]
     Name modify
     Match *
-    Condition Key_Value_Equals log.level warn
-    Set log.level WARN
+    Condition Key_Value_Equals log.log_level warn
+    Set log.log_level WARN
 
 [FILTER]
     Name modify
     Match *
-    Condition Key_Value_Equals log.level notice
-    Set log.level NOTICE
+    Condition Key_Value_Equals log.log_level notice
+    Set log.log_level NOTICE
 
 # [FILTER]
 #     Name modify
 #     Match *
-#     Condition Key_Value_Equals log.level NOTICE
-#     Set log.level INFO
+#     Condition Key_Value_Equals log.log_level NOTICE
+#     Set log.log_level INFO
 
 [FILTER]
     Name modify
     Match *
-    Condition Key_Value_Equals log.level info
-    Set log.level INFO
+    Condition Key_Value_Equals log.log_level info
+    Set log.log_level INFO
 
 [FILTER]
     Name modify
     Match *
-    Condition Key_Value_Equals log.level debug
-    Set log.level DEBUG
+    Condition Key_Value_Equals log.log_level debug
+    Set log.log_level DEBUG
 
 [FILTER]
     Name modify
     Match *
-    Condition Key_Value_Equals log.level VERBOSE
-    Set log.level DEBUG
+    Condition Key_Value_Equals log.log_level VERBOSE
+    Set log.log_level DEBUG
 
 [FILTER]
     Name modify
     Match *
-    Condition Key_Value_Equals log.level verb
-    Set log.level DEBUG
+    Condition Key_Value_Equals log.log_level verb
+    Set log.log_level DEBUG
 
 [FILTER]
     Name modify
     Match *
-    Condition Key_Value_Equals log.level dbg1
-    Set log.level DEBUG
+    Condition Key_Value_Equals log.log_level dbg1
+    Set log.log_level DEBUG
 
 [FILTER]
     Name modify
     Match *
-    Condition Key_Value_Equals log.level dbg2
-    Set log.level DEBUG
+    Condition Key_Value_Equals log.log_level dbg2
+    Set log.log_level DEBUG
 
 [FILTER]
     Name modify
     Match *
-    Condition Key_Value_Equals log.level dbg3
-    Set log.level DEBUG
+    Condition Key_Value_Equals log.log_level dbg3
+    Set log.log_level DEBUG
 
 # rewrite the tag for debug and verbose logs so we can re-route them (nowhere)
 [FILTER]
     Name rewrite_tag
     Match dp.routable
-    Rule log.level /DEBUG/ dp.non_routable false
+    Rule log.log_level /DEBUG/ dp.non_routable false
 
 [FILTER]
     Name nest

charts/msg-ems-tp/scripts/mk-ftlserver.yaml.sh

@@ -34,6 +34,7 @@ servers:
         -listens: ${EMS_LISTEN_URLS}
         -health_check_listen: http://0.0.0.0:${EMS_HTTP_PORT}
         -store: "$podData/emsdata"
+        -standby_only:
         -config_wait:
     - realm:
         data: "$podData/realm"
@@ -58,7 +59,6 @@ servers:
         -listens: ${EMS_LISTEN_URLS}
         -health_check_listen: http://0.0.0.0:${EMS_HTTP_PORT}
         -store: "$podData/emsdata"
-        -standby_only:
         -config_wait:
     - realm:
         data: "$podData/realm"

charts/msg-ems-tp/scripts/mk-tibemsd-ftl.json.sh

@@ -13,6 +13,7 @@ realmPort="${FTL_REALM_PORT-9013}"
 emsTcpPort="${EMS_TCP_PORT:-9011}"
 emsSslPort="${EMS_SSL_PORT:-9012}"
 EMS_FTL_SPIN="${EMS_FTL_SPIN:-disabled}"
+EMS_MAX_MEMORY=${EMS_MAX_MEMORY:-4GB}
 subData="/data"
 pstoreData="/data"
 
@@ -151,7 +152,7 @@ cat - <<EOF > $outfile
     "large_destination_memory":"3200MB",
     "max_client_msg_size":"2MB",
     "max_connections":"3000",
-    "max_msg_memory":"8GB",
+    "max_msg_memory":"$EMS_MAX_MEMORY",
     "max_stat_memory":"64MB",
     "msg_swapping":true,
     "network_thread_count":3,

charts/msg-ems-tp/templates/_dp.helpers.tpl

@@ -187,7 +187,7 @@ note: tib-msg-stsname will be added directly in statefulset charts, as it needs
 */}}
 {{- define "msg.dpparams.labels" }}
 tib-dp-release: {{ .dp.release }}
-tib-dp-msgbuild: "1.12.0.9"
+tib-dp-msgbuild: "1.13.0.15"
 tib-dp-chart: {{ .dp.chart }}
 tib-dp-workload-type: "user-app"
 tib-dp-dataplane-id: "{{ .dp.name }}"

charts/msg-ems-tp/templates/_ems.dp.helpers.tpl

@@ -37,6 +37,7 @@ need.msg.ems.params
 {{- $cpuReq := "0.3" -}}
 {{- $cpuLim := "3" -}}
 {{- $memReq := "1Gi" -}}
+{{- $maxMsgMemory := "3GB" -}}
 {{- $memLim := "4Gi" -}}
 {{- $stores := ternary "ftl" .Values.ems.stores ( not .Values.ems.stores ) -}}
 {{- $allowNodeSkew := "yes" -}}
@@ -58,20 +59,23 @@ need.msg.ems.params
     {{- $cpuReq = "1.0" -}}
     {{- $cpuLim = "5" -}}
     {{- $memReq = "2Gi" -}}
+    {{- $maxMsgMemory = "6GB" -}}
     {{- $memLim = "8Gi" -}}
   {{- else if eq $sizing "large" -}}
     {{- $msgStorageSize = "50Gi" -}}
     {{- $logStorageSize = "25Gi" -}}
     {{- $cpuReq = "2" -}}
     {{- $cpuLim = "8" -}}
     {{- $memReq = "8Gi" -}}
+    {{- $maxMsgMemory = "16GB" -}}
     {{- $memLim = "20Gi" -}}
   {{- else if eq $sizing "xlarge" -}}
     {{- $msgStorageSize = "100Gi" -}}
     {{- $logStorageSize = "100Gi" -}}
     {{- $cpuReq = "4" -}}
     {{- $cpuLim = "16" -}}
     {{- $memReq = "16Gi" -}}
+    {{- $maxMsgMemory = "26GB" -}}
     {{- $memLim = "30Gi" -}}
   {{- else if ne $sizing "small" -}}
     {{- $sizeError := printf "Config error, size of %s not supported. " $sizing -}}
@@ -120,6 +124,7 @@ ems:
   pvcShareSize: {{ $pvcShareSize }}
   activationSecret: "{{ .Values.ems.activationSecret | default "cp-license-file-secret" }}"
   activationSecretKey: "{{ .Values.ems.activationSecretKey | default "license-file.bin" }}"
+  maxMsgMemory: "{{ $maxMsgMemory }}"
   msgData: 
     volName: ems-data
     storageType: {{ $msgStorageType }}
@@ -224,7 +229,7 @@ note: expects a $emsParams as its argument
 {{- define "ems.std.labels" }}
 release: "{{ .dp.release }}"
 tib-dp-app: msg-ems-ftl
-tib-msgdp-mm-version: "1.12.0-0"
+tib-msgdp-mm-version: "1.13.0-0"
 tib-msg-group-name: "{{ .ems.name }}"
 tib-msg-ems-name: "{{ .ems.name }}"
 tib-msg-ems-sizing: "{{ .ems.sizing }}"
@@ -237,3 +242,23 @@ platform.tibco.com/app.resources.requests.memory: {{ if and .ems.resources .ems.
 platform.tibco.com/app.resources.limits.cpu: {{ if and .ems.resources .ems.resources.limits -}}  {{ .ems.resources.limits.cpu | default "3" | quote }} {{- else -}} "3" {{- end }}
 platform.tibco.com/app.resources.limits.memory: {{ if and .ems.resources .ems.resources.limits -}} {{ .ems.resources.limits.memory | default "4Gi" | quote }} {{- else -}} "4Gi" {{- end }}
 {{- end }}
+
+{{/*
+ems.prom.annotations 
+*/}}
+{{- define "ems.prom.annotations" }}
+prometheus.io/scrape: "true"
+prometheus.io/port: "{{ .ems.ports.httpPort }}"
+prometheus.io/scheme: "http"
+prometheus.io/path: /metrics
+prometheus.io/insecure_skip_verify: "true"
+{{- end }}
+
+{{/*
+ems.prom.o11y.labels 
+*/}}
+{{- define "ems.prom.o11y.labels" }}
+platform.tibco.com/scrape_o11y: "true"
+prometheus.io/scrape: "true"
+prometheus.io/port: "{{ .ems.ports.httpPort }}"
+{{- end }}

charts/msg-ems-tp/templates/ems-init.job.yaml

@@ -133,6 +133,8 @@ spec:
                 {{ end }}
                 - name: EMS_INIT_JSON
                   value: "/data/boot/tibemsd-ftl.json"
+                - name: EMS_MAX_MEMORY
+                  value: "{{ $emsParams.ems.maxMsgMemory }}"
                 - name: EMS_HTTP_PORT
                   value: "{{ $emsParams.ems.ports.httpPort }}"
                 - name: FTL_REALM_URL

charts/msg-ems-tp/templates/ems.prom.svc.yaml

@@ -1,3 +1,4 @@
+{{ if .Values.keepPromServices }}
 #
 # Copyright (c) 2023-2025. Cloud Software Group, Inc.
 # This file is subject to the license terms contained
@@ -14,35 +15,6 @@
 #
 kind: Service
 apiVersion: v1
-metadata:
-  name: "{{ $svcPromServer }}"
-  labels:
-    {{ include "ems.std.labels" $emsParams | indent 4 }}
-    tib-dp-app: msg-ems-ftl
-    tib-msg-stsname: "{{ $stsname }}"
-    tib-msg-svcname: "{{ $svcPromServer }}"
-    {{ include "msg.dp.labels" . | indent 4 }}
-    prometheus.io/scrape: "true"
-    platform.tibco.com/scrape_finops: "true"
-    prometheus.io/port: "{{ $emsParams.ems.ports.httpPort }}"
-  annotations:
-    prometheus.io/scrape: "true"
-    prometheus.io/port: "{{ $emsParams.ems.ports.httpPort }}"
-    prometheus.io/scheme: "http"
-    prometheus.io/path: /metrics/server
-    prometheus.io/insecure_skip_verify: "true"
-spec:
-  ports:
-  - name: ems-http-port
-    port: {{ int $emsParams.ems.ports.httpPort }}
-    protocol: TCP
-  selector:
-    tib-msg-stsname: "{{ $stsname }}"
-    tib-msg-stsrole: "leader"
-...
----
-kind: Service
-apiVersion: v1
 metadata:
   name: "{{ $svcPromFull }}"
   labels:
@@ -67,3 +39,5 @@ spec:
   selector:
     tib-msg-stsname: "{{ $stsname }}"
     tib-msg-stsrole: "leader"
+
+{{ end }}

charts/msg-ems-tp/templates/ems.stateful.yaml

@@ -61,14 +61,15 @@ spec:
                 {{ include "msg.dp.labels" . | indent 16 }}
                 {{ include "msg.dp.net.all" . | indent 16}}
                 {{ include "ems.std.labels" $emsParams | indent 16 }}
+                {{ include "ems.prom.o11y.labels" $emsParams | indent 16 }}
                 tib-msg-stsname: "{{ $stsname }}"
                 tib-msg-stsrole: "standby"
                 name: ems
                 app: msg-ems-ftl
-                "sidecar.istio.io/inject": "{{ $emsParams.ems.istioEnable }}"
             name: ems
             annotations:
               cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
+              {{ include "ems.prom.annotations" $emsParams | indent 14 }}
         spec:
             {{- if ne "none" $emsParams.dp.pullSecret }}
             imagePullSecrets:
@@ -154,9 +155,8 @@ spec:
               volumeMounts:
               - mountPath: /boot
                 name: scripts-vol
-              - mountPath: /boot-activation/license-file.bin
+              - mountPath: /boot-activation
                 name: activation-vol
-                subPath: license-file.bin
               - mountPath: /boot-certs
                 name: certs-vol
               - mountPath: /data 
@@ -253,6 +253,8 @@ spec:
                 value: "{{ $emsParams.ems.ports.httpPort }}"
               - name: EMS_FTL_SPIN
                 value: "{{ $emsParams.ems.ftl_spin }}"
+              - name: EMS_MAX_MEMORY
+                value: "{{ $emsParams.ems.maxMsgMemory }}"
               - name: EMS_SERVICE
                 value: "{{ $emsParams.ems.stsname }}"
               - name: MY_GROUPNAME

charts/msg-ems-tp/values.yaml

@@ -4,10 +4,15 @@
 # in the license file that is distributed with this file.
 #
 
+# Keep until o11y updates for demo installs
+keepPromServices: true
+
 # DO NOT SET .global.cp VALUES, these keys are controlled by the Control Plane
 # and will be overridden by the Control Plane.
 global:
   cp:
+    containerRegistry:
+    serviceaccount:
     dataplaneId:
     instanceId:
     enableClusterScopedPerm: true
@@ -31,8 +36,6 @@ ems:
   stores: ftl
   sizing: small
   use: dev
-  # .ems.activationUrl will be ignored once CP Activation server support is available
-  activationUrl: "https://tib-activate:7070"
   # CAUTION: Current chart does not support overriding internal ports
   ports:
     httpPort: 9010

charts/msg-gateway-tp/Chart.yaml

@@ -10,4 +10,4 @@ description: A Helm chart for deploying msg-gateway in K8DPs
 keywords:
 - tp-msg-gateway
 name: msg-gateway-tp
-version: 1.12.9
+version: 1.13.15