From ee3acde7ea6c871d7ff42387d8c7562549434984 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Tue, 3 Aug 2021 12:55:45 -0400 Subject: [PATCH 01/19] add changelog --- chart/templates/console/deployment.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/chart/templates/console/deployment.yaml b/chart/templates/console/deployment.yaml index 0df696b..fe62dbb 100644 --- a/chart/templates/console/deployment.yaml +++ b/chart/templates/console/deployment.yaml @@ -40,6 +40,8 @@ spec: containers: - name: twistlock-console image: {{ .Values.console.image.repository }}:{{ .Values.console.image.tag }} + resources: +{{ toYaml .Values.resources | indent 12 }} ports: - name: mgmt-https containerPort: 8083 @@ -47,8 +49,7 @@ spec: containerPort: 8084 - name: mgmt-http containerPort: 8081 - resources: - {{ toYaml .Values.resources | nindent 10 }} + env: - name: HIGH_AVAILABILITY_ENABLED value: "false" @@ -85,5 +86,6 @@ spec: configMap: name: twistlock-console - name: syslog-socket - hostPath: - path: "/dev/log" + persistentVolumeClaim: + claimName: "syslog-console" + -- GitLab From 3a1faf33a5a2aae1abcc1f460d603bfe1bc32bac Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Tue, 3 Aug 2021 14:12:28 -0400 Subject: [PATCH 02/19] add pv for syslog --- chart/templates/console/deployment.yaml | 2 +- chart/templates/console/pvc.yaml | 14 ++++++++++++++ chart/values.yaml | 3 +++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/chart/templates/console/deployment.yaml b/chart/templates/console/deployment.yaml index fe62dbb..9c34e07 100644 --- a/chart/templates/console/deployment.yaml +++ b/chart/templates/console/deployment.yaml @@ -87,5 +87,5 @@ spec: name: twistlock-console - name: syslog-socket persistentVolumeClaim: - claimName: "syslog-console" + claimName: "syslog-socket" diff --git a/chart/templates/console/pvc.yaml b/chart/templates/console/pvc.yaml index e419f32..0bb6b2d 100644 --- a/chart/templates/console/pvc.yaml +++ b/chart/templates/console/pvc.yaml @@ -10,3 +10,17 @@ spec: resources: requests: storage: {{ .Values.console.persistence.size }} +--- + +--- +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: syslog-socket + namespace: {{ .Release.Namespace }} +spec: + accessModes: + - {{ .Values.console.syslog-persistence.accessMode }} + resources: + requests: + storage: {{ .Values.console.syslog-persistence.size }} diff --git a/chart/values.yaml b/chart/values.yaml index 23bad32..7513950 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -33,6 +33,9 @@ console: persistence: size: 100Gi accessMode: ReadWriteOnce + syslog-persistence: + size: 100Gi + accessMode: ReadWriteOnce affinity: {} -- GitLab From 0b0a95e332a41ddfdd92aeb166c6b8a6e4d40ea2 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Tue, 3 Aug 2021 14:16:51 -0400 Subject: [PATCH 03/19] add pv for syslog --- chart/templates/console/pvc.yaml | 4 ++-- chart/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chart/templates/console/pvc.yaml b/chart/templates/console/pvc.yaml index 0bb6b2d..bd8eb6c 100644 --- a/chart/templates/console/pvc.yaml +++ b/chart/templates/console/pvc.yaml @@ -20,7 +20,7 @@ metadata: namespace: {{ .Release.Namespace }} spec: accessModes: - - {{ .Values.console.syslog-persistence.accessMode }} + - {{ .Values.console.syslogPersistence.accessMode }} resources: requests: - storage: {{ .Values.console.syslog-persistence.size }} + storage: {{ .Values.console.syslogPersistence.size }} diff --git a/chart/values.yaml b/chart/values.yaml index 7513950..0cd2e23 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -33,7 +33,7 @@ console: persistence: size: 100Gi accessMode: ReadWriteOnce - syslog-persistence: + syslogPersistence: size: 100Gi accessMode: ReadWriteOnce -- GitLab From 36c82ada5ff0f8728645efaf85379daf6a40597b Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Tue, 3 Aug 2021 14:40:06 -0400 Subject: [PATCH 04/19] add pv for syslog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eef171e..2980f0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ 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 + +### Added + +- Remove Hostpath violation in opa gatekeeper + ## [0.0.6-bb.1] - 2021-07-21 ### Added -- GitLab From 8f9f646614a1fd8c875e1db9dbabf3e25691ebc3 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Tue, 3 Aug 2021 14:46:26 -0400 Subject: [PATCH 05/19] add pv for syslog --- tests/test-values.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test-values.yml b/tests/test-values.yml index b0d2e56..6a40ac3 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -10,6 +10,8 @@ imagePullSecrets: console: persistence: size: 5Gi + syslogPersistence: + size: 5Gi bbtests: enabled: true -- GitLab From 3fb967ae1c6fb9266d0f477f116d23a83fa6f518 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Thu, 5 Aug 2021 14:26:40 +0000 Subject: [PATCH 06/19] Update Chart.yaml --- chart/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index a6616c5..70e0f1c 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: twistlock -version: 0.0.6-bb.1 +version: 0.0.6-bb.3 appVersion: 21.04.412 dependencies: - name: gluon -- GitLab From c51f1b4d7c27e6f5e82551cf4715311452944eda Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Thu, 5 Aug 2021 11:03:54 -0400 Subject: [PATCH 07/19] add chart version --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2980f0e..7155dcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Added -- Remove Hostpath violation in opa gatekeeper +- Remove Hostpath violation in opa gatekeeper ## [0.0.6-bb.1] - 2021-07-21 -- GitLab From 7012657cbc1f1091960e9c48db36fd74a2537b9a Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Thu, 5 Aug 2021 12:59:29 -0400 Subject: [PATCH 08/19] remove host mount path and volume --- chart/templates/console/deployment.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/chart/templates/console/deployment.yaml b/chart/templates/console/deployment.yaml index 9c34e07..6426a55 100644 --- a/chart/templates/console/deployment.yaml +++ b/chart/templates/console/deployment.yaml @@ -76,8 +76,7 @@ spec: - name: console-persistent-volume mountPath: "/var/lib/twistlock-backup" subPath: "var/lib/twistlock-backup" - - name: syslog-socket - mountPath: "/dev/log" + volumes: - name: console-persistent-volume persistentVolumeClaim: @@ -85,7 +84,5 @@ spec: - name: twistlock-config-volume configMap: name: twistlock-console - - name: syslog-socket - persistentVolumeClaim: - claimName: "syslog-socket" + -- GitLab From 442be9bb7900847cfb0988bb8bce9b83519d5f9b Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Thu, 5 Aug 2021 13:16:30 -0400 Subject: [PATCH 09/19] remove hospath mount and volume --- tests/test-values.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/test-values.yml b/tests/test-values.yml index 6a40ac3..8b35795 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -10,8 +10,7 @@ imagePullSecrets: console: persistence: size: 5Gi - syslogPersistence: - size: 5Gi + bbtests: enabled: true -- GitLab From 6a2ffd9bba1f2a5b25ff25e6b13273a7680fe490 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Thu, 5 Aug 2021 14:18:22 -0400 Subject: [PATCH 10/19] remote host path mount and volume --- chart/templates/console/pvc.yaml | 12 ------------ chart/values.yaml | 4 +--- tests/test-values.yml | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/chart/templates/console/pvc.yaml b/chart/templates/console/pvc.yaml index bd8eb6c..68b5d30 100644 --- a/chart/templates/console/pvc.yaml +++ b/chart/templates/console/pvc.yaml @@ -12,15 +12,3 @@ spec: storage: {{ .Values.console.persistence.size }} --- ---- -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: syslog-socket - namespace: {{ .Release.Namespace }} -spec: - accessModes: - - {{ .Values.console.syslogPersistence.accessMode }} - resources: - requests: - storage: {{ .Values.console.syslogPersistence.size }} diff --git a/chart/values.yaml b/chart/values.yaml index 0cd2e23..abe21a6 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -33,9 +33,7 @@ console: persistence: size: 100Gi accessMode: ReadWriteOnce - syslogPersistence: - size: 100Gi - accessMode: ReadWriteOnce + affinity: {} diff --git a/tests/test-values.yml b/tests/test-values.yml index 8b35795..b0d2e56 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -10,7 +10,6 @@ imagePullSecrets: console: persistence: size: 5Gi - bbtests: enabled: true -- GitLab From 86804304ec7af209608772518e76cca11dd83be6 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Thu, 5 Aug 2021 14:24:52 -0400 Subject: [PATCH 11/19] add changelog --- chart/templates/console/deployment.yaml | 7 +++++-- tests/test-values.yml | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/chart/templates/console/deployment.yaml b/chart/templates/console/deployment.yaml index 6426a55..9c34e07 100644 --- a/chart/templates/console/deployment.yaml +++ b/chart/templates/console/deployment.yaml @@ -76,7 +76,8 @@ spec: - name: console-persistent-volume mountPath: "/var/lib/twistlock-backup" subPath: "var/lib/twistlock-backup" - + - name: syslog-socket + mountPath: "/dev/log" volumes: - name: console-persistent-volume persistentVolumeClaim: @@ -84,5 +85,7 @@ spec: - name: twistlock-config-volume configMap: name: twistlock-console - + - name: syslog-socket + persistentVolumeClaim: + claimName: "syslog-socket" diff --git a/tests/test-values.yml b/tests/test-values.yml index b0d2e56..6a40ac3 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -10,6 +10,8 @@ imagePullSecrets: console: persistence: size: 5Gi + syslogPersistence: + size: 5Gi bbtests: enabled: true -- GitLab From 8070b46719f5afb7c8d898fd47bcf71c1e468219 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Thu, 5 Aug 2021 14:32:58 -0400 Subject: [PATCH 12/19] add changelog --- chart/templates/console/pvc.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/chart/templates/console/pvc.yaml b/chart/templates/console/pvc.yaml index 68b5d30..bd8eb6c 100644 --- a/chart/templates/console/pvc.yaml +++ b/chart/templates/console/pvc.yaml @@ -12,3 +12,15 @@ spec: storage: {{ .Values.console.persistence.size }} --- +--- +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: syslog-socket + namespace: {{ .Release.Namespace }} +spec: + accessModes: + - {{ .Values.console.syslogPersistence.accessMode }} + resources: + requests: + storage: {{ .Values.console.syslogPersistence.size }} -- GitLab From 9c328b68ad23fadfdff4854cb93a6e421837cbf4 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Thu, 5 Aug 2021 14:35:55 -0400 Subject: [PATCH 13/19] add changelog --- chart/values.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/chart/values.yaml b/chart/values.yaml index abe21a6..0cd2e23 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -33,7 +33,9 @@ console: persistence: size: 100Gi accessMode: ReadWriteOnce - + syslogPersistence: + size: 100Gi + accessMode: ReadWriteOnce affinity: {} -- GitLab From 0f2aad2439a895d04c5ffec75c11f1d2d9af9cf6 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Fri, 6 Aug 2021 18:00:29 -0400 Subject: [PATCH 14/19] add hostpath conditional --- chart/templates/console/deployment.yaml | 3 +-- chart/templates/console/pvc.yaml | 14 ++------------ chart/values.yaml | 3 +-- tests/test-values.yml | 3 +-- 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/chart/templates/console/deployment.yaml b/chart/templates/console/deployment.yaml index 9c34e07..65f721c 100644 --- a/chart/templates/console/deployment.yaml +++ b/chart/templates/console/deployment.yaml @@ -86,6 +86,5 @@ spec: configMap: name: twistlock-console - name: syslog-socket - persistentVolumeClaim: - claimName: "syslog-socket" + emptyDir: {} diff --git a/chart/templates/console/pvc.yaml b/chart/templates/console/pvc.yaml index bd8eb6c..bf65c91 100644 --- a/chart/templates/console/pvc.yaml +++ b/chart/templates/console/pvc.yaml @@ -12,15 +12,5 @@ spec: storage: {{ .Values.console.persistence.size }} --- ---- -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: syslog-socket - namespace: {{ .Release.Namespace }} -spec: - accessModes: - - {{ .Values.console.syslogPersistence.accessMode }} - resources: - requests: - storage: {{ .Values.console.syslogPersistence.size }} + + diff --git a/chart/values.yaml b/chart/values.yaml index 0cd2e23..acf9e79 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -34,8 +34,7 @@ console: size: 100Gi accessMode: ReadWriteOnce syslogPersistence: - size: 100Gi - accessMode: ReadWriteOnce + enabled: false affinity: {} diff --git a/tests/test-values.yml b/tests/test-values.yml index 6a40ac3..bf09ac4 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -10,8 +10,7 @@ imagePullSecrets: console: persistence: size: 5Gi - syslogPersistence: - size: 5Gi + bbtests: enabled: true -- GitLab From b10fb0bb7b9db6e071027e8a3555b3600de2ed09 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Mon, 9 Aug 2021 10:05:45 -0400 Subject: [PATCH 15/19] remove pv volume for hospath --- chart/templates/console/deployment.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/chart/templates/console/deployment.yaml b/chart/templates/console/deployment.yaml index 65f721c..38d99d5 100644 --- a/chart/templates/console/deployment.yaml +++ b/chart/templates/console/deployment.yaml @@ -86,5 +86,10 @@ spec: configMap: name: twistlock-console - name: syslog-socket + {{- if .Values.console.syslogPersistence.enabled}} + hostPath: + path: "/dev/log" + {{- else}} emptyDir: {} + {{- end}} -- GitLab From 565b8e9023491c8d00faaca6a2198daf2d06612d Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Mon, 9 Aug 2021 10:32:01 -0400 Subject: [PATCH 16/19] remove pv volume for hospath --- CHANGELOG.md | 2 +- chart/values.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7155dcd..a20fbef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Added -- Remove Hostpath violation in opa gatekeeper +- Add conditional hostpath for twistlock console. ## [0.0.6-bb.1] - 2021-07-21 diff --git a/chart/values.yaml b/chart/values.yaml index acf9e79..a19003a 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -33,6 +33,7 @@ console: persistence: size: 100Gi accessMode: ReadWriteOnce +# Enable syslog audit feature syslogPersistence: enabled: false -- GitLab From 576f6505696d11d738369157189bc61d5859292a Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Mon, 9 Aug 2021 10:42:42 -0400 Subject: [PATCH 17/19] remove pv volume for hospath --- chart/templates/console/deployment.yaml | 2 +- chart/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/templates/console/deployment.yaml b/chart/templates/console/deployment.yaml index 38d99d5..380535e 100644 --- a/chart/templates/console/deployment.yaml +++ b/chart/templates/console/deployment.yaml @@ -86,7 +86,7 @@ spec: configMap: name: twistlock-console - name: syslog-socket - {{- if .Values.console.syslogPersistence.enabled}} + {{- if .Values.console.syslogAuditIntegration.enabled}} hostPath: path: "/dev/log" {{- else}} diff --git a/chart/values.yaml b/chart/values.yaml index a19003a..9b5c9bc 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -34,7 +34,7 @@ console: size: 100Gi accessMode: ReadWriteOnce # Enable syslog audit feature - syslogPersistence: + syslogAuditIntegration: enabled: false affinity: -- GitLab From df0e4f4a4c1a00f6d597f14f80adceb1f6d429c1 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Mon, 9 Aug 2021 11:11:41 -0400 Subject: [PATCH 18/19] remove pv volume for hospath --- CHANGELOG.md | 6 ++++++ chart/Chart.yaml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d10b2a..9d72781 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ 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.7-bb.0] - 2021-08-09 + +### Added + +- Add conditional syslog audit integration for twistlock console. + ## [0.0.6-bb.2] - 2021-08-06 ### Added diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 9f112b0..53f05bd 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: twistlock -version: 0.0.6-bb.2 +version: 0.0.7-bb.0 appVersion: 21.04.412 dependencies: - name: gluon -- GitLab From 0b802beaa34d188217539be3e413e46533c39767 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Mon, 9 Aug 2021 11:17:34 -0400 Subject: [PATCH 19/19] remove pv volume for hospath --- chart/values.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/chart/values.yaml b/chart/values.yaml index 9325665..de04b1f 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -33,7 +33,9 @@ console: persistence: size: 100Gi accessMode: ReadWriteOnce -# Enable syslog audit feature +# Enable syslog audit feature. + ## Make sure when integrating with bigbang - https://repo1.dso.mil/platform-one/big-bang/bigbang/-/blob/master/chart/templates/gatekeeper/values.yaml there + ## is an exception for twistlock namespace in volumetypes. syslogAuditIntegration: enabled: false -- GitLab