Release v2.2.3, update helm chart

- add wait measure config to helm chart
- update default values to align with orchestrator str substitution
- update helm version and appversion

CHANGELOG.md

@@ -17,6 +17,12 @@ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). Releases are
 versioned in accordance with [Semantic
 Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.2.3] "genesis" - 2023-03-31
+
+### Changed
+
+- Update ID of appD config to use optimizerID instead of workloadID
+
 ## [2.2.2] "genesis" - 2023-03-20
 
 ### Changed

helm/Chart.yaml

@@ -20,10 +20,10 @@ 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.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.2.2
+version: 2.2.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "2.2.2"
+appVersion: "2.2.3"

helm/templates/configmap.yaml

@@ -50,3 +50,5 @@ data:
           min: 0
           max: 1
           pinned: True
+    wait:
+      measure_enabled: True

helm/templates/deployment.yaml

@@ -83,37 +83,28 @@ spec:
             memory: 128Mi
         env:
         - name: SERVICE_URL
-          value: {{ default "<SERVICE_URL>" .Values.agentMgmtServiceUrlOverride }}
-        - name: CLUSTER_NAME
-          value: {{ default "<CLUSTER_NAME>" .Values.clusterNameOverride }}
-        - name: CLIENT_TYPE
+          value: {{ default "SERVICE_URL_VALUE" .Values.agentMgmtServiceUrlOverride }}
+        - name: SERVICE_NAME
           value: {{ default "optimize:servo" .Values.agentFmmTypeOverride }}
+        - name: CLUSTER_NAME
+          value: {{ default "CLUSTER_NAME_VALUE" .Values.clusterNameOverride }}
         - name: CONFIG_FILE_PATH
           value: /agent-management-sidecar
         - name: NAME_SPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
         - name: OAUTH_ID
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "servox.fullname" . }}
-              key: OAUTH_ID
+          value: {{ default "OAUTH_ID_VALUE" .Values.clientId }}
         - name: OAUTH_SECRET
           valueFrom:
             secretKeyRef:
               name: {{ include "servox.fullname" . }}
               key: OAUTH_SECRET
         - name: OAUTH_URL
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "servox.fullname" . }}
-              key: OAUTH_URL
+          value: {{ if .Values.baseUrl }}{{ printf "%s/auth" (urlParse .Values.baseUrl).host }}{{ else }}OAUTH_URL_VALUE{{ end }}
         - name: OAUTH_TENANT_ID
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "servox.fullname" . }}
-              key: OAUTH_TENANT_ID
+          value: {{ default "OAUTH_TENANT_ID_VALUE" .Values.tenantId }}
         volumeMounts:
         - name: agent-management-sidecar
           mountPath: /agent-management-sidecar

helm/templates/secret.yaml

@@ -20,14 +20,12 @@ metadata:
   labels:
     {{- include "servox.labels" . | nindent 4 }}
 type: Opaque
+{{- if eq .Values.connectionSettingsType "static" }}
 stringData:
-  {{- if eq .Values.connectionSettingsType "static" }}
   client_secret: {{ .Values.clientSecret | required ".Values.clientSecret is required with static connection settings type" }}
-  {{- else if eq .Values.connectionSettingsType "sidecar" }}
-  OAUTH_ID: {{ default "<OAUTH_ID>" .Values.clientId }}
-  OAUTH_SECRET: {{ default "<OAUTH_SECRET>" .Values.clientSecret }}
-  OAUTH_URL: {{ if .Values.baseUrl }}{{ printf "%s/auth" (urlParse .Values.baseUrl).host }}{{ else }}<OAUTH_URL>{{ end }}
-  OAUTH_TENANT_ID: {{ default "<OAUTH_TENANT_ID>" .Values.tenantId }}
-  {{- else }}
-  {{- fail ( printf "Unexpected configuration for .Values.connectionSettingsType: %s" .Values.connectionSettingsType ) }}
-  {{- end }}
+{{- else if eq .Values.connectionSettingsType "sidecar" }}
+data:
+  OAUTH_SECRET: {{ default "OAUTH_SECRET_VALUE" .Values.clientSecret }}
+{{- else }}
+{{- fail ( printf "Unexpected configuration for .Values.connectionSettingsType: %s" .Values.connectionSettingsType ) }}
+{{- end }}

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "servox"
-version = "2.2.2"
+version = "2.2.3"
 description = "Opsani Servo: The Next Generation"
 homepage = "https://opsani.com/"
 repository = "https://github.com/opsani/servox"