Merge branch 'issue-5' into 'main'

Add Support for Tolerations and Resources in Deployment object

See merge request !18

CHANGELOG.md

@@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ---
 
+## [0.0.3-bb.4] - 2021-04-06
+### Added
+- Resource and Toleration Values
+
 ## [0.0.3-bb.3] - 2021-04-05
 ### Changed
 - Affinity values modified to standardize

chart/Chart.yaml

 apiVersion: v2
 name: twistlock
-version: 0.0.3-bb.3
+version: 0.0.3-bb.4
 appVersion: 20.12.531

chart/templates/deployment.yaml

@@ -29,6 +29,10 @@ spec:
       nodeSelector:
         {{ toYaml .Values.nodeSelector | nindent 8 }}
       {{- end }}
+      {{- if .Values.tolerations }}
+      tolerations:
+        {{ toYaml .Values.tolerations | nindent 8 }}
+      {{- end }}
       {{- if .Values.affinity }}
       affinity:
         {{ toYaml .Values.affinity | nindent 8 }}
@@ -43,6 +47,8 @@ spec:
           containerPort: 8084
         - name: mgmt-http
           containerPort: 8081
+        resources:
+          {{ toYaml .Values.resources | nindent 10 }}
         env:
         - name: HIGH_AVAILABILITY_ENABLED
           value: "false"

chart/values.yaml

@@ -46,3 +46,17 @@ affinity: {}
 
 nodeSelector: {}
   # node-type: twistlock"
+
+tolerations: []
+  # - key: "key1"
+  #   operator: "Equal"
+  #   value: "value1"
+  #   effect: "NoSchedule"
+
+resources:
+  limits: {}
+  #   memory: 256Mi
+  #   cpu: 100m
+  requests: {}
+  #   memory: 256Mi
+  #   cpu: 100m