From ba58de765d37770a9497b1406cdccc5c82dcc486 Mon Sep 17 00:00:00 2001
From: Tunde Olu-isa <babatundeoluisa@gmail.com>
Date: Tue, 6 Apr 2021 10:21:50 -0500
Subject: [PATCH 1/4] add toleration and resource configuration support

---
 chart/templates/deployment.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index ff9eb7c..5db420b 100644
--- a/chart/templates/deployment.yaml
+++ b/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 | indent 12 }}
         env:
         - name: HIGH_AVAILABILITY_ENABLED
           value: "false"
-- 
GitLab


From 30bd07841271b7ac96da0319762aec2701f3c6b6 Mon Sep 17 00:00:00 2001
From: Tunde Olu-isa <babatundeoluisa@gmail.com>
Date: Tue, 6 Apr 2021 10:30:34 -0500
Subject: [PATCH 2/4] add values for resource and tolerations

---
 chart/values.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/chart/values.yaml b/chart/values.yaml
index 10b5185..e931cfa 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -46,3 +46,12 @@ affinity: {}
 
 nodeSelector: {}
   # node-type: twistlock"
+tolerations: []
+
+resources:
+  limits: {}
+  #   memory: 256Mi
+  #   cpu: 100m
+  requests: {}
+  #   memory: 256Mi
+  #   cpu: 100m
-- 
GitLab


From f67fdd1fcaed60856bb2539c376b19b14c061867 Mon Sep 17 00:00:00 2001
From: Micah Nagel <micah.nagel@parsons.com>
Date: Tue, 6 Apr 2021 12:41:55 -0600
Subject: [PATCH 3/4] nindent off

---
 chart/templates/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index 5db420b..0df696b 100644
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -48,7 +48,7 @@ spec:
         - name: mgmt-http
           containerPort: 8081
         resources:
-          {{ toYaml .Values.resources | indent 12 }}
+          {{ toYaml .Values.resources | nindent 10 }}
         env:
         - name: HIGH_AVAILABILITY_ENABLED
           value: "false"
-- 
GitLab


From eb98e7d8232698bb5a67857047e234a4bd5eb0ae Mon Sep 17 00:00:00 2001
From: "garcia.ryan" <garcia.ryan@solute.us>
Date: Tue, 6 Apr 2021 13:49:39 -0600
Subject: [PATCH 4/4] feat: Toleration and resource spec additions

---
 CHANGELOG.md      | 4 ++++
 chart/Chart.yaml  | 2 +-
 chart/values.yaml | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87805a9..39b9692 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 6824c66..7e5399a 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: twistlock
-version: 0.0.3-bb.3
+version: 0.0.3-bb.4
 appVersion: 20.12.531
diff --git a/chart/values.yaml b/chart/values.yaml
index e931cfa..e93950c 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -46,7 +46,12 @@ affinity: {}
 
 nodeSelector: {}
   # node-type: twistlock"
+
 tolerations: []
+  # - key: "key1"
+  #   operator: "Equal"
+  #   value: "value1"
+  #   effect: "NoSchedule"
 
 resources:
   limits: {}
-- 
GitLab