Skip to content

Commit f09ea4d

Browse files
mjnagelmjnagel
committed
Release 2.x
1 parent 413f381 commit f09ea4d

File tree

196 files changed

+3863
-754
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+3863
-754
lines changed

‎README.md

+7-3
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@ Big Bang is a declarative, continuous delivery tool for deploying DoD hardened a
66
77
## Usage & Scope
88

9-
Big Bang's scope is to provide publicly available installation manifests for:
9+
Big Bang's scope is to provide publicly available installation manifests for packages required to adhere to the DoD DevSecOps Reference Architecture and additional useful utilities. Big Bang packages are broken into three categories:
1010

11-
- A specific set of packages that adhere to the DevSecOps Reference Architecture. The core list of packages can be found [here](https://repo1.dso.mil/platform-one/big-bang/apps/core).
11+
- Core: [Core packages](./docs/understanding-bigbang/package-architecture/README.md##Core) are a group of capabilities required by the DoD DevSecOps Reference Architecture, that are supported directly by the Big Bang development team. The specific capabilities that are considered core currently are Service Mesh, Policy Enforcement, Logging, Monitoring, and Runtime Security.
1212

13-
- Packages that facilitate development of applications that adhere to the DevSecOps Reference Architecture. The full list of packages can be found [here](https://repo1.dso.mil/platform-one/big-bang/apps).
13+
- Addons: [Addon packages](./docs/understanding-bigbang/package-architecture/README.md##Addons) are any packages/capabilities that the Big Bang development team directly supports that do not fall under the above core definition. These serve to extend the functionality/features of Big Bang.
14+
15+
- Community: [Community packages](https://repo1.dso.mil/big-bang/product/community) are any packages that are maintained by the broader Big Bang community (users, vendors, etc). These packages could be alternatives to core or addon packages, or even entirely new packages to help extend usage/functionality of Big Bang.
16+
17+
In order for an installation of Big Bang to be a valid installation/configuration you must install/deploy a core package of each category (for additional details on categories and options see [here](./docs/understanding-bigbang/package-architecture/README.md##Core)).
1418

1519
Big Bang also builds tooling around the testing and validation of Big Bang packages. These tools are provided as-is, without support.
1620

‎chart/templates/NOTES.txt

+34-29
Original file line numberDiff line numberDiff line change
@@ -116,20 +116,25 @@ PLATFORM ONE ANCHORE WARNING:
116116
{{- end }}
117117
{{- end }}
118118

119-
{{- if and $.Values.eckoperator.enabled $.Values.logging.enabled }}
120-
{{- if $.Values.logging.sso.enabled }}
121-
{{- if and (not $.Values.logging.license.trial) (not $.Values.logging.license.keyJSON) }}
119+
{{- if and $.Values.eckOperator.enabled $.Values.elasticsearchKibana.enabled }}
120+
{{- if $.Values.elasticsearchKibana.sso.enabled }}
121+
{{- if and (not $.Values.elasticsearchKibana.license.trial) (not $.Values.elasticsearchKibana.license.keyJSON) }}
122122
PLATFORM ONE LOGGING WARNING:
123123
You have enabled SSO but not provided an enterprise license configuration to use. SSO is not functional without a license.
124124
Edit the values for the eck-operator to specify a license key JSON or use the trial license for development.
125125
{{- end }}
126126
{{- end }}
127127
{{- end }}
128128

129-
{{- if and (or $.Values.promtail.enabled $.Values.loki.enabled) .Values.logging.enabled }}
129+
{{- if and .Values.promtail.enabled .Values.fluentbit.enabled }}
130130
PLATFORM ONE LOGGING WARNING:
131-
You have enabled both promtail/loki and efk logging. This is permitted during beta testing of promtail/loki.
132-
After the beta period, only one logging stack will be supported at one time, with the PLG stack becoming the default supported stack.
131+
You have enabled both Promtail and Fluentbit (log forwarders). This is not a supported configuration and you may see conflicts as a result of both applications attempting to ship logs.
132+
{{- end }}
133+
134+
{{- if and .Values.loki.enabled .Values.elasticsearchKibana.enabled }}
135+
PLATFORM ONE LOGGING WARNING:
136+
You have enabled both Loki and Elastic (log storage). This is not a supported configuration and you may see issues as a result of running both applications.
137+
If using Elastic for other functionality, deploying both applications is acceptable.
133138
{{- end }}
134139

135140
{{- if and $.Values.loki.enabled (dig "values" "global" "createGlobalConfig" false $.Values.loki) }}
@@ -182,14 +187,14 @@ DEPRECATION NOTICE:
182187
{{- if .Values.addons.nexus }}
183188
DEPRECATION NOTICE:
184189
.Values.addons.nexus has been deprecated and will be removed in a future Big Bang release.
185-
Please reconfigure your values overrides to use .Values.addons.nexusRepositoryManager
190+
Please reconfigure your values overrides to use .Values.addons.nexusRepositoryManager
186191
{{- end }}
187192

188193
{{- $nexusOldValues := default dict .Values.addons.nexus -}}
189194
{{- $nexusValues := merge $nexusOldValues .Values.addons.nexusRepositoryManager -}}
190195

191196
{{- with .Values }}
192-
{{- if and .sso.url (coalesce .sso.oidc.host .sso.oidc.realm .sso.certificate_authority .sso.jwks .sso.jwks_uri .sso.client_id .sso.client_secret .sso.token_url .sso.auth_url .sso.secretName .logging.sso.issuer .logging.sso.auth_url .logging.sso.token_url .logging.sso.userinfo_url .logging.sso.jwkset_url .logging.sso.claims_principal .logging.sso.endsession_url .logging.sso.claims_group .logging.sso.claims_mail .monitoring.sso.grafana.auth_url .monitoring.sso.grafana.token_url .monitoring.sso.grafana.api_url .twistlock.sso.provider_name .twistlock.sso.issuer_uri .twistlock.sso.idp_url .twistlock.sso.console_url .twistlock.sso.cert .addons.argocd.sso.provider_name .addons.gitlab.sso.label .addons.gitlab.sso.issuer_uri .addons.gitlab.sso.end_session_uri .addons.gitlab.sso.uid_field .addons.mattermost.sso.auth_endpoint .addons.mattermost.sso.token_endpoint .addons.mattermost.sso.user_api_endpoint $nexusValues.sso.idp_data.idpMetadata .addons.sonarqube.sso.provider_name .addons.sonarqube.sso.certificate) }}
197+
{{- if and .sso.url (coalesce .sso.oidc.host .sso.oidc.realm .sso.certificate_authority .sso.jwks .sso.jwks_uri .sso.client_id .sso.client_secret .sso.token_url .sso.auth_url .sso.secretName .elasticsearchKibana.sso.issuer .elasticsearchKibana.sso.auth_url .elasticsearchKibana.sso.token_url .elasticsearchKibana.sso.userinfo_url .elasticsearchKibana.sso.jwkset_url .elasticsearchKibana.sso.claims_principal .elasticsearchKibana.sso.endsession_url .elasticsearchKibana.sso.claims_group .elasticsearchKibana.sso.claims_mail .monitoring.sso.grafana.auth_url .monitoring.sso.grafana.token_url .monitoring.sso.grafana.api_url .twistlock.sso.provider_name .twistlock.sso.issuer_uri .twistlock.sso.idp_url .twistlock.sso.console_url .twistlock.sso.cert .addons.argocd.sso.provider_name .addons.gitlab.sso.label .addons.gitlab.sso.issuer_uri .addons.gitlab.sso.end_session_uri .addons.gitlab.sso.uid_field .addons.mattermost.sso.auth_endpoint .addons.mattermost.sso.token_endpoint .addons.mattermost.sso.user_api_endpoint $nexusValues.sso.idp_data.idpMetadata .addons.sonarqube.sso.provider_name .addons.sonarqube.sso.certificate) }}
193198
DEPRECATION NOTICE:
194199
The following SSO keys have been deprecated. Deprecated keys will continue to work, but will be removed in a future release. Please update your overrides.
195200
{{- if coalesce .sso.oidc.host .sso.oidc.realm .sso.certificate_authority .sso.jwks .sso.jwks_uri .sso.client_id .sso.client_secret .sso.token_url .sso.auth_url .sso.secretName }}
@@ -238,44 +243,44 @@ DEPRECATION NOTICE:
238243
secretName: {{ .sso.secretName }}
239244
{{- end }}
240245
{{- end }}
241-
{{- if coalesce .logging.sso.issuer .logging.sso.auth_url .logging.sso.token_url .logging.sso.userinfo_url .logging.sso.jwkset_url .logging.sso.claims_principal .logging.sso.endsession_url .logging.sso.claims_group .logging.sso.claims_mail }}
242-
logging:
246+
{{- if coalesce .elasticsearchKibana.sso.issuer .elasticsearchKibana.sso.auth_url .elasticsearchKibana.sso.token_url .elasticsearchKibana.sso.userinfo_url .elasticsearchKibana.sso.jwkset_url .elasticsearchKibana.sso.claims_principal .elasticsearchKibana.sso.endsession_url .elasticsearchKibana.sso.claims_group .elasticsearchKibana.sso.claims_mail }}
247+
elasticsearchKibana:
243248
sso:
244-
{{- if .logging.sso.issuer }}
249+
{{- if .elasticsearchKibana.sso.issuer }}
245250
# "issuer" was moved to "sso.url"
246-
issuer: {{ .logging.sso.issuer }}
251+
issuer: {{ .elasticsearchKibana.sso.issuer }}
247252
{{- end }}
248-
{{- if .logging.sso.auth_url }}
253+
{{- if .elasticsearchKibana.sso.auth_url }}
249254
# "auth_url" was moved to "sso.oidc.authorization"
250-
auth_url: {{ .logging.sso.auth_url }}
255+
auth_url: {{ .elasticsearchKibana.sso.auth_url }}
251256
{{- end }}
252-
{{- if .logging.sso.token_url }}
257+
{{- if .elasticsearchKibana.sso.token_url }}
253258
# "token_url" was moved to "sso.oidc.token"
254-
token_url: {{ .logging.sso.token_url }}
259+
token_url: {{ .elasticsearchKibana.sso.token_url }}
255260
{{- end }}
256-
{{- if .logging.sso.userinfo_url }}
261+
{{- if .elasticsearchKibana.sso.userinfo_url }}
257262
# "userinfo_url" was moved to "sso.oidc.userinfo"
258-
userinfo_url: {{ .logging.sso.userinfo_url }}
263+
userinfo_url: {{ .elasticsearchKibana.sso.userinfo_url }}
259264
{{- end }}
260-
{{- if .logging.sso.jwkset_url }}
265+
{{- if .elasticsearchKibana.sso.jwkset_url }}
261266
# "jwkset_url" was moved to "sso.oidc.jwksUrl"
262-
jwkset_url: {{ .logging.sso.jwkset_url }}
267+
jwkset_url: {{ .elasticsearchKibana.sso.jwkset_url }}
263268
{{- end }}
264-
{{- if .logging.sso.claims_principal }}
269+
{{- if .elasticsearchKibana.sso.claims_principal }}
265270
# "claims_principal" was moved to "sso.oidc.claims.username"
266-
claims_principal: {{ .logging.sso.claims_principal }}
271+
claims_principal: {{ .elasticsearchKibana.sso.claims_principal }}
267272
{{- end }}
268-
{{- if .logging.sso.endsession_url }}
273+
{{- if .elasticsearchKibana.sso.endsession_url }}
269274
# "endsession_url" was moved to "sso.oidc.endsession"
270-
endsession_url: {{ .logging.sso.endsession_url }}
275+
endsession_url: {{ .elasticsearchKibana.sso.endsession_url }}
271276
{{- end }}
272-
{{- if .logging.sso.claims_group }}
277+
{{- if .elasticsearchKibana.sso.claims_group }}
273278
# "claims_group" was moved to "sso.oidc.claims.groups"
274-
claims_group: {{ .logging.sso.claims_group }}
279+
claims_group: {{ .elasticsearchKibana.sso.claims_group }}
275280
{{- end }}
276-
{{- if .logging.sso.claims_mail }}
281+
{{- if .elasticsearchKibana.sso.claims_mail }}
277282
# "claims_mail" was moved to "sso.oidc.claims.email"
278-
claims_mail: {{ .logging.sso.claims_mail }}
283+
claims_mail: {{ .elasticsearchKibana.sso.claims_mail }}
279284
{{- end }}
280285
{{- end }}
281286
{{- if coalesce .monitoring.sso.grafana.auth_url .monitoring.sso.grafana.token_url .monitoring.sso.grafana.api_url }}
@@ -390,5 +395,5 @@ DEPRECATION NOTICE:
390395
{{- if .Values.addons.mattermostoperator }}
391396
DEPRECATION NOTICE:
392397
.Values.addons.mattermostoperator has been deprecated and will be removed in a future Big Bang release.
393-
Please reconfigure your values overrides to use .Values.addons.mattermostOperator
398+
Please reconfigure your values overrides to use .Values.addons.mattermostOperator
394399
{{- end }}

‎chart/templates/_helpers.tpl

+2-27
Original file line numberDiff line numberDiff line change
@@ -53,31 +53,6 @@ branch: {{ .branch | quote }}
5353
{{- end -}}
5454
{{- end -}}
5555

56-
{{/*
57-
Check for git ref, given package values map
58-
*/}}
59-
{{- define "checkGitRef" -}}
60-
{{- $git := (dig "git" dict .) -}}
61-
{{- if not $git.repo -}}
62-
false
63-
{{- else -}}
64-
{{- if $git.commit -}}
65-
{{- if not $git.branch -}}
66-
false
67-
{{- end -}}
68-
true
69-
{{- else if $git.semver -}}
70-
true
71-
{{- else if $git.tag -}}
72-
true
73-
{{- else if $git.branch -}}
74-
true
75-
{{- else -}}
76-
false
77-
{{- end -}}
78-
{{- end -}}
79-
{{- end -}}
80-
8156
{{/*
8257
Build the appropriate git credentials secret for private git repositories
8358
*/}}
@@ -176,7 +151,7 @@ bigbang.addValueIfSet can be used to nil check parameters before adding them to
176151
Annotation for Istio version
177152
*/}}
178153
{{- define "istioAnnotation" -}}
179-
{{- if (eq (include "checkGitRef" .Values.istio) "true") -}}
154+
{{- if (eq .Values.istio.sourceType "git") -}}
180155
{{- if .Values.istio.git.semver -}}
181156
bigbang.dev/istioVersion: {{ .Values.istio.git.semver | trimSuffix (regexFind "-bb.*" .Values.istio.git.semver) }}
182157
{{- else if .Values.istio.git.tag -}}
@@ -185,7 +160,7 @@ bigbang.dev/istioVersion: {{ .Values.istio.git.tag | trimSuffix (regexFind "-bb.
185160
bigbang.dev/istioVersion: {{ .Values.istio.git.branch }}
186161
{{- end -}}
187162
{{- else -}}
188-
bigbang.dev/istioVersion: {{ .Values.istio.oci.tag }}
163+
bigbang.dev/istioVersion: {{ .Values.istio.helmRepo.tag }}
189164
{{- end -}}
190165
{{- end -}}
191166

‎chart/templates/anchore/gitrepository.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if and (eq (include "checkGitRef" .Values.addons.anchore) "true") .Values.addons.anchore.enabled }}
1+
{{- if and (eq .Values.addons.anchore.sourceType "git") .Values.addons.anchore.enabled }}
22
apiVersion: source.toolkit.fluxcd.io/v1beta2
33
kind: GitRepository
44
metadata:

‎chart/templates/anchore/helmrelease.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ spec:
1010
targetNamespace: anchore
1111
chart:
1212
spec:
13-
{{- if eq (include "checkGitRef" .Values.addons.anchore) "true" }}
13+
{{- if eq .Values.addons.anchore.sourceType "git" }}
1414
chart: {{ .Values.addons.anchore.git.path }}
1515
sourceRef:
1616
kind: GitRepository
1717
name: anchore
1818
namespace: {{ .Release.Namespace }}
1919
{{- else }}
20-
chart: {{ .Values.addons.anchore.oci.name }}
21-
version: {{ .Values.addons.anchore.oci.tag }}
20+
chart: {{ .Values.addons.anchore.helmRepo.chartName }}
21+
version: {{ .Values.addons.anchore.helmRepo.tag }}
2222
sourceRef:
2323
kind: HelmRepository
24-
name: {{ .Values.addons.anchore.oci.repo }}
24+
name: {{ .Values.addons.anchore.helmRepo.repoName }}
2525
namespace: {{ .Release.Namespace }}
2626
{{- end }}
2727
interval: 5m

‎chart/templates/argocd/gitrepository.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if and (eq (include "checkGitRef" .Values.addons.argocd) "true") .Values.addons.argocd.enabled }}
1+
{{- if and (eq .Values.addons.argocd.sourceType "git") .Values.addons.argocd.enabled }}
22
apiVersion: source.toolkit.fluxcd.io/v1beta2
33
kind: GitRepository
44
metadata:

‎chart/templates/argocd/helmrelease.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ spec:
1313
targetNamespace: argocd
1414
chart:
1515
spec:
16-
{{- if eq (include "checkGitRef" .Values.addons.argocd) "true" }}
16+
{{- if eq .Values.addons.argocd.sourceType "git" }}
1717
chart: {{ .Values.addons.argocd.git.path }}
1818
sourceRef:
1919
kind: GitRepository
2020
name: argocd
2121
namespace: {{ .Release.Namespace }}
2222
{{- else }}
23-
chart: {{ .Values.addons.argocd.oci.name }}
24-
version: {{ .Values.addons.argocd.oci.tag }}
23+
chart: {{ .Values.addons.argocd.helmRepo.chartName }}
24+
version: {{ .Values.addons.argocd.helmRepo.tag }}
2525
sourceRef:
2626
kind: HelmRepository
27-
name: {{ .Values.addons.argocd.oci.repo }}
27+
name: {{ .Values.addons.argocd.helmRepo.repoName }}
2828
namespace: {{ .Release.Namespace }}
2929
{{- end }}
3030
interval: 5m

‎chart/templates/authservice/gitrepository.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if and .Values.istio.enabled (eq (include "checkGitRef" .Values.addons.authservice) "true") (or .Values.addons.authservice.enabled (and .Values.monitoring.enabled .Values.monitoring.sso.enabled) (and .Values.jaeger.enabled .Values.jaeger.sso.enabled) (and .Values.tempo.enabled .Values.tempo.sso.enabled)) }}
1+
{{- if and .Values.istio.enabled (eq .Values.addons.authservice.sourceType "git") (or .Values.addons.authservice.enabled (and .Values.monitoring.enabled .Values.monitoring.sso.enabled) (and .Values.jaeger.enabled .Values.jaeger.sso.enabled) (and .Values.tempo.enabled .Values.tempo.sso.enabled)) }}
22
apiVersion: source.toolkit.fluxcd.io/v1beta2
33
kind: GitRepository
44
metadata:

‎chart/templates/authservice/helmrelease.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ spec:
1313
targetNamespace: authservice
1414
chart:
1515
spec:
16-
{{- if eq (include "checkGitRef" .Values.addons.authservice) "true" }}
16+
{{- if eq .Values.addons.authservice.sourceType "git" }}
1717
chart: {{ .Values.addons.authservice.git.path }}
1818
sourceRef:
1919
kind: GitRepository
2020
name: authservice
2121
namespace: {{ .Release.Namespace }}
2222
{{- else }}
23-
chart: {{ .Values.addons.authservice.oci.name }}
24-
version: {{ .Values.addons.authservice.oci.tag }}
23+
chart: {{ .Values.addons.authservice.helmRepo.chartName }}
24+
version: {{ .Values.addons.authservice.helmRepo.tag }}
2525
sourceRef:
2626
kind: HelmRepository
27-
name: {{ .Values.addons.authservice.oci.repo }}
27+
name: {{ .Values.addons.authservice.helmRepo.repoName }}
2828
namespace: {{ .Release.Namespace }}
2929
{{- end }}
3030
interval: 5m

‎chart/templates/cluster-auditor/gitrepository.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if and (eq (include "checkGitRef" .Values.clusterAuditor) "true") (not .Values.offline) .Values.clusterAuditor.enabled }}
1+
{{- if and (eq .Values.clusterAuditor.sourceType "git") (not .Values.offline) .Values.clusterAuditor.enabled }}
22
apiVersion: source.toolkit.fluxcd.io/v1beta2
33
kind: GitRepository
44
metadata:

‎chart/templates/cluster-auditor/helmrelease.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ spec:
1313
targetNamespace: cluster-auditor
1414
chart:
1515
spec:
16-
{{- if eq (include "checkGitRef" .Values.clusterAuditor) "true" }}
16+
{{- if eq .Values.clusterAuditor.sourceType "git" }}
1717
chart: {{ .Values.clusterAuditor.git.path }}
1818
sourceRef:
1919
kind: GitRepository
2020
name: cluster-auditor
2121
namespace: {{ .Release.Namespace }}
2222
{{- else }}
23-
chart: {{ .Values.clusterAuditor.oci.name }}
24-
version: {{ .Values.clusterAuditor.oci.tag }}
23+
chart: {{ .Values.clusterAuditor.helmRepo.chartName }}
24+
version: {{ .Values.clusterAuditor.helmRepo.tag }}
2525
sourceRef:
2626
kind: HelmRepository
27-
name: {{ .Values.clusterAuditor.oci.repo }}
27+
name: {{ .Values.clusterAuditor.helmRepo.repoName }}
2828
namespace: {{ .Release.Namespace }}
2929
{{- end }}
3030
interval: 5m

‎chart/templates/logging/eck-operator/gitrepository.yaml renamed to ‎chart/templates/eck-operator/gitrepository.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if and (eq (include "checkGitRef" .Values.eckoperator) "true") (not .Values.offline) (or .Values.eckoperator.enabled .Values.logging.enabled) }}
1+
{{- if and (eq .Values.eckOperator.sourceType "git") (not .Values.offline) (or .Values.eckOperator.enabled .Values.elasticsearchKibana.enabled) }}
22
apiVersion: source.toolkit.fluxcd.io/v1beta2
33
kind: GitRepository
44
metadata:
@@ -10,9 +10,9 @@ metadata:
1010
{{- include "commonLabels" . | nindent 4}}
1111
spec:
1212
interval: {{ .Values.flux.interval }}
13-
url: {{ .Values.eckoperator.git.repo }}
13+
url: {{ .Values.eckOperator.git.repo }}
1414
ref:
15-
{{- include "validRef" .Values.eckoperator.git | nindent 4 }}
15+
{{- include "validRef" .Values.eckOperator.git | nindent 4 }}
1616
{{ include "gitIgnore" . }}
1717
{{- include "gitCreds" . | nindent 2 }}
1818
{{- end }}

0 commit comments

Comments
 (0)