Merge pull request #22 from prasebha/feature/prasebha/v2.0.1

Resource limit

Author: niravg75

kubernetes-monitoring/mgmtagent_helm/Chart.yaml

@@ -15,7 +15,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: 2.0.0
+version: 2.0.1
 
 # 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

kubernetes-monitoring/mgmtagent_helm/templates/mgmtagent_statefulset.yaml

@@ -17,16 +17,23 @@ spec:
         app: mgmtagent
     spec:
       securityContext:
-        runAsUser: {{ default 0 .Values.mgmtagent.runAsUser }}
-        runAsGroup: {{ default 0 .Values.mgmtagent.runAsGroup }}
-        fsGroup: {{ default 0 .Values.mgmtagent.fsGroup }}
+        runAsUser: {{ default 0 .Values.deployment.security.runAsUser }}
+        runAsGroup: {{ default 0 .Values.deployment.security.runAsGroup }}
+        fsGroup: {{ default 0 .Values.deployment.security.fsGroup }}
       serviceAccountName: mgmtagent-serviceaccount
       imagePullSecrets:
         - name: mgmtagent-container-registry-key
       restartPolicy: Always
       containers:
         - name: mgmtagent
           image: {{ .Values.mgmtagent.image.url }}
+          resources:
+            requests:
+              cpu: {{ .Values.deployment.resource.request.cpuCore }}
+              memory: {{ .Values.deployment.resource.request.memory }}
+            limits:
+              cpu: {{ .Values.deployment.resource.limit.cpuCore }}
+              memory: {{ .Values.deployment.resource.limit.memory }}
           volumeMounts:
             - name: mgmtagent-secret
               mountPath: /opt/oracle/mgmtagent_secret
@@ -54,9 +61,9 @@ spec:
         name: mgmtagent-pvc
       spec:
         accessModes: [ "ReadWriteOnce" ]
-        {{- if .Values.kubernetesCluster.storageClass }}
-        storageClassName: {{ .Values.kubernetesCluster.storageClass }}
+        {{- if .Values.deployment.storageClass }}
+        storageClassName: {{ .Values.deployment.storageClass }}
         {{- end }}
         resources:
           requests:
-            storage: 2Gi
+            storage: {{ .Values.deployment.resource.request.storage }}

kubernetes-monitoring/mgmtagent_helm/values.schema.json

@@ -106,6 +106,91 @@
                 "name",
                 "namespace"
             ]
+        },
+        "deployment":
+        {
+            "properties":
+            {
+                "security":
+                {
+                    "properties":
+                    {
+                        "runAsUser":
+                        {
+                            "type":
+                            [
+                                "integer",
+                                "null"
+                            ]
+                        },
+                        "runAsGroup":
+                        {
+                            "type":
+                            [
+                                "integer",
+                                "null"
+                            ]
+                        },
+                        "fsGroup":
+                        {
+                            "type":
+                            [
+                                "integer",
+                                "null"
+                            ]
+                        }
+                    }
+                },
+                "resource":
+                {
+                    "properties":
+                    {
+                        "request":
+                        {
+                            "properties":
+                            {
+                                "cpuCore":
+                                {
+                                    "type": "string"
+                                },
+                                "memory":
+                                {
+                                    "type": "string"
+                                },
+                                "storage":
+                                {
+                                    "type": "string"
+                                }
+                            },
+                            "required":
+                            [
+                                "cpuCore",
+                                "memory",
+                                "storage"
+                            ]
+                        },
+                        "limit":
+                        {
+                            "properties":
+                            {
+                                "cpuCore":
+                                {
+                                    "type": "string"
+                                },
+                                "memory":
+                                {
+                                    "type": "string"
+                                }
+                            },
+                            "required":
+                            [
+                                "cpuCore",
+                                "memory"
+                            ]
+                        }
+                    }
+                }
+            }
         }
     },
     "required":

kubernetes-monitoring/mgmtagent_helm/values.yaml

@@ -1,11 +1,4 @@
 mgmtagent:
-   # Processes in the Container will run as user ID 1000, replace it with a different value if desired
-   runAsUser: 1000
-   # Processes in the Container will use group ID 2000, replace it with a different value if desired
-   runAsGroup: 2000
-   # Files created in the Container will use group ID 2000, replace it with a different value if desired
-   fsGroup: 2000
-   
    # Provide either installKeyFileContent or installKey as an install key. If both provided then installKeyFileContent will take higher precedence.
    # Provide the base64 encoded content of the Management Agent Install Key file
    installKeyFileContent:
@@ -29,9 +22,6 @@ namespace: mgmtagent
 # By default, metric server will be deployed and used by Management Agent to collect metrics. You can set this to false if you already have metric server installed on your cluster
 deployMetricServer: true
 
-# Provide the storage class for StatefulSet's PVC. If not provided then the Cluster's default storage class will be used.
-storageClass:
-
 # Kubernetes Cluster details to monitor
 kubernetesCluster:
    # OCI Compartment Id to push Kubernetes Monitoring metrics. If not specified default is same as Agent compartment
@@ -40,3 +30,32 @@ kubernetesCluster:
    name:
    # Kubernetes cluster namespace(s) to monitor. This can be a comma-separated list of namespaces or '*' to monitor all the namespaces
    namespace: '*'
+
+deployment:
+   security:
+      # Processes in the Container will run as user ID 1000, replace it with a different value if desired
+      runAsUser: 1000
+      # Processes in the Container will use group ID 2000, replace it with a different value if desired
+      runAsGroup: 2000
+      # Files created in the Container will use group ID 2000, replace it with a different value if desired
+      fsGroup: 2000
+
+   # Provide the agent resources as per Kubernetes resource quantity
+   resource:
+      # Provide the minimum required resources
+      request:
+         # specify the cpu cores
+         cpuCore: 100m
+         # specify the memory
+         memory: 500Mi
+         # specify the storage capacity for StatefulSet's PVC
+         storage: 2Gi
+      # Provide the maximum limit for resources
+      limit:
+         # specify the cpu cores
+         cpuCore: 500m
+         # specify the memory
+         memory: 1Gi
+   
+   # Provide the storage class for StatefulSet's PVC. If not provided then the Cluster's default storage class will be used.
+   storageClass: