Merge branch 'main' into 'hospath-violation'

# Conflicts:
#   CHANGELOG.md
#   chart/Chart.yaml
#   chart/templates/console/deployment.yaml

CHANGELOG.md

@@ -3,11 +3,11 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ---
-## [0.0.6-bb.3] - 2021-08-03
+## [0.0.6-bb.2] - 2021-08-06
 
 ### Added
 
--  Add conditional hostpath for twistlock console.
+- Add Resource limit and request.
 
 ## [0.0.6-bb.1] - 2021-07-21
 

chart/Chart.yaml

 apiVersion: v2
 name: twistlock
-version: 0.0.6-bb.3
+version: 0.0.6-bb.2
 appVersion: 21.04.412
 dependencies:
   - name: gluon

chart/templates/console/deployment.yaml

@@ -41,7 +41,7 @@ spec:
       - name: twistlock-console
         image: {{ .Values.console.image.repository }}:{{ .Values.console.image.tag }}
         resources:
-{{ toYaml .Values.resources | indent 12 }}
+          {{ toYaml .Values.resources | nindent 10 }}
         ports:
         - name: mgmt-https
           containerPort: 8083

chart/values.yaml

@@ -66,11 +66,11 @@ tolerations:
   #   effect: "NoSchedule"
 
 resources:
-  limits: {}
-  #   memory: 256Mi
-  #   cpu: 100m
-  requests: {}
-  #   memory: 256Mi
-  #   cpu: 100m
+  limits: 
+     memory: 1Gi
+     cpu: 250m
+  requests: 
+     memory: 512Mi
+     cpu: 250m
 
 openshift: false