From 9bb378f2c87a9959edb503b7285f6cc99f299b28 Mon Sep 17 00:00:00 2001 From: Thomas Runyon Date: Fri, 29 Jan 2021 05:45:45 -0500 Subject: [PATCH 1/5] feat: changed twistlock to use ironbank image for console --- chart/Chart.yaml | 2 +- chart/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 381d4f4..940fd47 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v2 name: twistlock -version: 0.0.2-bb.1 +version: 0.0.2-bb.2 appVersion: 20.04.163 \ No newline at end of file diff --git a/chart/values.yaml b/chart/values.yaml index f623052..bd716f0 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -9,8 +9,8 @@ console: hostname: bigbang.dev image: - repository: registry.dso.mil/platform-one/big-bang/apps/security-tools/twistlock/console - tag: 20.04.163 + repository: registry1.dso.mil/ironbank/twistlock/console/console + tag: 20.12.531 persistence: size: 100Gi -- GitLab From fce46c4e548fd71d29e15bee53fc2c8c912b569e Mon Sep 17 00:00:00 2001 From: Thomas Runyon Date: Fri, 29 Jan 2021 06:14:29 -0500 Subject: [PATCH 2/5] chore: add imagepullsecrets to tests and chart --- chart/templates/twistlock_console.yaml | 4 ++++ chart/values.yaml | 5 ++++- tests/test-values.yml | 17 +++-------------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/chart/templates/twistlock_console.yaml b/chart/templates/twistlock_console.yaml index e8c1f70..ca6f997 100644 --- a/chart/templates/twistlock_console.yaml +++ b/chart/templates/twistlock_console.yaml @@ -70,6 +70,10 @@ spec: spec: restartPolicy: Always serviceAccountName: twistlock-console + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} containers: - name: twistlock-console image: {{ .Values.console.image.repository }}:{{ .Values.console.image.tag }} diff --git a/chart/values.yaml b/chart/values.yaml index bd716f0..66d2018 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -4,7 +4,10 @@ prometheus: istio: enabled: false - + +# imagePullSecrets defines the secrets to use when pulling the operator container image. +imagePullSecrets: [] + console: hostname: bigbang.dev diff --git a/tests/test-values.yml b/tests/test-values.yml index 016fd0d..4a81fc8 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -1,17 +1,6 @@ -prometheus: - servicemonitor: - enabled: false +imagePullSecrets: +- name: private-registry-mil -istio: - enabled: true - console: - hostname: bigbang.dev - - image: - repository: registry.dso.mil/platform-one/big-bang/apps/security-tools/twistlock/console - tag: 20.04.163 - persistence: - size: 100Gi - accessMode: ReadWriteOnce \ No newline at end of file + size: 5Gi \ No newline at end of file -- GitLab From 33045be8b5d85a94c58ef5a273df5e072ea77fe4 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Thu, 11 Feb 2021 13:25:48 -0700 Subject: [PATCH 3/5] chore: Updating Changelog syntax and versioning --- CHANGELOG.md | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6d9c4e..f991b5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,25 @@ -#Twistlock +# Changelog -0.1.0 (06/15/2020) -Manifests for deploying Twistlock 20.04.196 +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.2-bb.2] - 2021-02-11 +### Added +- imagePullSecret array to values. + +### Changed +- Image based on 20.12 version from IronBank. + +## [0.0.2-bb.1] - 2021-01-27 +### Changed +- Updating all "dsop.io" URLs to "dso.mil". + +## [0.0.2-bb.0] - 2020-12-15 +### Added +- Istio flag to enable VirtualService when true. + +## [0.0.1-bb.0] - 2020-06-15 +### Added +- Initial manifests for deploying Twistlock version 20.04.196. -0.2.0 (08/24/2020) -Updated docs/readme.md to reflect keycloak SAML setup. -- GitLab From 576ce305d596545d0babe9fcb28957ff9fd52bae Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Thu, 11 Feb 2021 13:40:36 -0700 Subject: [PATCH 4/5] chore: cypress testubg fixes --- tests/cypress.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cypress.json b/tests/cypress.json index 81dd4b8..589f3f1 100644 --- a/tests/cypress.json +++ b/tests/cypress.json @@ -3,6 +3,6 @@ "supportFile": false, "fixturesFolder": false, "env": { - "twistlock_url": "twistlock.bigbang.dev" + "twistlock_url": "https://twistlock.bigbang.dev" } } -- GitLab From fd2c2f70d0d499e294707e5c1e228552b2624501 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Thu, 11 Feb 2021 13:47:09 -0700 Subject: [PATCH 5/5] refactor: Reverting cypress.json --- tests/cypress.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cypress.json b/tests/cypress.json index 589f3f1..81dd4b8 100644 --- a/tests/cypress.json +++ b/tests/cypress.json @@ -3,6 +3,6 @@ "supportFile": false, "fixturesFolder": false, "env": { - "twistlock_url": "https://twistlock.bigbang.dev" + "twistlock_url": "twistlock.bigbang.dev" } } -- GitLab