add extraEnv

Author: prasebha

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 2024-08-23
+### Changed
+- Management Agent docker image has been updated to version 1.5.0
+- Extra environment (extraEnv) added to Management Agent. 
+
 ## 2024-07-08
 ### Added
 - Option to disable JRE default security property for Agent.

charts/mgmt-agent/Chart.yaml

@@ -18,7 +18,7 @@ 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: 3.0.3
+version: 3.0.4
 
 # 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

charts/mgmt-agent/templates/env-configmap.yaml

@@ -15,11 +15,3 @@ data:
   {{- if .Values.deployment.cleanupEpochTime }}
   POD_CLEANUP_ID: "{{ .Values.deployment.cleanupEpochTime }}"
   {{- end }}
-
-  # Modifiable properties
-  # Add new or change the below existing properties as required
-
-  # Openjdk on RHEL with FIPS requires the default security property to be disabled, 
-  # so that Management Agent can use its own bcfips security provider.
-  # Set this to true to disable, and pass disableJREDefaultSecurityPropertiesFile=true via the rsp file.
-  DISABLE_JRE_DEFAULT_SECURITY_PROPERTIES_FILE: "false"

charts/mgmt-agent/templates/mgmt-agent-daemonset.yaml

@@ -38,6 +38,13 @@ spec:
           envFrom:
           - configMapRef:
               name: {{ include "mgmt-agent.resourceNamePrefix" . }}-env
+          env:
+            {{- if .Values.mgmtagent.extraEnv }}
+            {{- range .Values.mgmtagent.extraEnv }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+            {{- end }}
+            {{- end }}
           resources:
             requests:
               cpu: {{ .Values.deployment.resource.request.cpuCore }}

charts/mgmt-agent/templates/mgmt-agent-statefulset.yaml

@@ -39,6 +39,13 @@ spec:
           envFrom:
           - configMapRef:
               name: {{ include "mgmt-agent.resourceNamePrefix" . }}-env
+          env:
+            {{- if .Values.mgmtagent.extraEnv }}
+            {{- range .Values.mgmtagent.extraEnv }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+            {{- end }}
+            {{- end }}
           resources:
             requests:
               cpu: {{ .Values.deployment.resource.request.cpuCore }}

charts/mgmt-agent/values.yaml

@@ -32,6 +32,13 @@ mgmtagent:
       url:
       # -- Image secrets to use for pulling container image (base64 encoded content of ~/.docker/config.json file)
       secret:
+   # Please specify additional environment variables in name:value pairs
+   extraEnv:
+      # Openjdk on RHEL with FIPS requires the default security property to be disabled, 
+      # so that Management Agent can use its own bcfips security provider.
+      # Set this to true to disable, and pass disableJREDefaultSecurityPropertiesFile=true via the rsp file.
+      - name: DISABLE_JRE_DEFAULT_SECURITY_PROPERTIES_FILE
+        value: "false"
 
 # -- Kubernetes namespace to create and install this helm chart in
 namespace: "{{ .Values.global.namespace }}"

charts/oci-onm/Chart.yaml

@@ -18,7 +18,7 @@ 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: 3.4.4
+version: 3.4.5
 
 # 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
@@ -36,6 +36,6 @@ dependencies:
   repository: "file://../logan"
   condition: oci-onm-logan.enabled
 - name: oci-onm-mgmt-agent
-  version: "3.0.3"
+  version: "3.0.4"
   repository: "file://../mgmt-agent"
   condition: oci-onm-mgmt-agent.enabled