diff --git a/CHANGELOG.md b/CHANGELOG.md index f991b5ca378ddea81f0791e6d410e1af3688ea40..042e26be1acf5adebf34a5f03eea9f85bb23d6d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), --- +## [0.0.3-bb.0] - 2021-02-12 +### Added +- Options under istio values to control labels, annotations, gateways and full URL modification for twistlock VirtualService. + +### Changed +- Position of "hostname" value in values, from "console.hostname" to toplevel "hostname". + ## [0.0.2-bb.2] - 2021-02-11 ### Added - imagePullSecret array to values. diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 940fd47e1bc3801d0d3edaed1cfa354473964db2..24e6a45664109d59dd9f4bdcac0d68dda39ea869 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v2 name: twistlock -version: 0.0.2-bb.2 -appVersion: 20.04.163 \ No newline at end of file +version: 0.0.3-bb.0 +appVersion: 20.12.531 diff --git a/chart/templates/console-vs.yaml b/chart/templates/console-vs.yaml index 248d14eb17e757b155a04475c4ebe4ba23a5d2f4..d0e2e49330481753a5925f8cd10f0618f262226b 100644 --- a/chart/templates/console-vs.yaml +++ b/chart/templates/console-vs.yaml @@ -1,14 +1,26 @@ -{{- if .Values.istio.enabled }} +{{- if and .Values.istio.enabled .Values.istio.console.enabled -}} apiVersion: networking.istio.io/v1alpha3 kind: VirtualService metadata: name: console namespace: {{ .Release.Namespace }} + {{- if .Values.istio.console.labels }} + labels: +{{ toYaml .Values.istio.console.labels | indent 4 }} + {{- end }} + {{- if .Values.istio.console.annotations }} + annotations: +{{ toYaml .Values.istio.console.annotations | indent 4 }} + {{- end }} spec: - hosts: - - "twistlock.{{ .Values.console.hostname }}" gateways: - - istio-system/main + {{- range .Values.istio.console.gateways }} + - {{ . }} + {{- end }} + hosts: + {{- range .Values.istio.console.hosts }} + - {{ tpl . $ }} + {{- end }} http: - route: - destination: diff --git a/chart/values.yaml b/chart/values.yaml index 66d2018fd1fa01632529aac358dc7c81fdd7f97f..64b927a6284742f6a523d0e0587baf4a8e6d9492 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1,16 +1,26 @@ +hostname: bigbang.dev prometheus: servicemonitor: enabled: false +hostname: bigbang.dev istio: + # Toggle istio integration enabled: false + console: + # Toggle vs creation + enabled: true + annotations: {} + labels: {} + gateways: + - istio-system/main + hosts: + - twistlock.{{ .Values.hostname }} # imagePullSecrets defines the secrets to use when pulling the operator container image. imagePullSecrets: [] - + console: - hostname: bigbang.dev - image: repository: registry1.dso.mil/ironbank/twistlock/console/console tag: 20.12.531 diff --git a/tests/test-values.yml b/tests/test-values.yml index c99f8e878dfcee6fc603a0108990c3e0bcaccf3f..96d4808ecbbf9ac667807a327dfb8705fb207620 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -1,12 +1,17 @@ hostname: bigbang.dev istio: enabled: true + console: + enabled: true + gateways: + - istio-system/main + hosts: + - twistlock.{{ .Values.hostname }} imagePullSecrets: - name: private-registry-mil console: - hostname: bigbang.dev image: repository: registry1.dso.mil/ironbank/twistlock/console/console tag: 20.12.531