Skip to content

Commit 68825e3

Browse files
Racer159Racer159
authored
Merge branch 'main' into helm-git-example
2 parents 17de90e + 583a3dd commit 68825e3

10 files changed

Lines changed: 127 additions & 33 deletions

File tree

‎examples/big-bang/config/disable-all.yaml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
istio:
33
enabled: false
44

5-
istiooperator:
5+
istioOperator:
66
enabled: false
77

88
jaeger:
@@ -20,16 +20,16 @@ gatekeeper:
2020
kyverno:
2121
enabled: false
2222

23-
kyvernopolicies:
23+
kyvernoPolicies:
2424
enabled: false
2525

26-
kyvernoreporter:
26+
kyvernoReporter:
2727
enabled: false
2828

29-
logging:
29+
elasticsearchKibana:
3030
enabled: false
3131

32-
eckoperator:
32+
eckOperator:
3333
enabled: false
3434

3535
fluentbit:
@@ -53,5 +53,6 @@ monitoring:
5353
twistlock:
5454
enabled: false
5555

56-
metricsServer:
57-
enabled: false
56+
addons:
57+
metricsServer:
58+
enabled: false

‎examples/big-bang/config/kyverno.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ clusterAuditor:
55
enabled: false
66
kyverno:
77
enabled: true
8-
kyvernopolicies:
8+
kyvernoPolicies:
99
enabled: true
1010
values:
1111
policies:

‎examples/big-bang/config/loki.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Use Loki instead of EFK
2-
logging:
2+
elasticsearchKibana:
33
enabled: false
44

5-
eckoperator:
5+
eckOperator:
66
enabled: false
77

88
fluentbit:
99
enabled: false
10-
10+
1111
loki:
1212
enabled: true
1313

‎examples/big-bang/zarf.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ metadata:
33
name: big-bang-example
44
description: "Deploy Big Bang Core"
55
# renovate: datasource=gitlab-releases depName=big-bang/bigbang versioning=semver registryUrl=https://repo1.dso.mil/
6-
version: 1.57.1
6+
version: 2.0.0
77
url: https://p1.dso.mil/products/big-bang
88
# Big Bang / Iron Bank are only amd64
99
architecture: amd64
@@ -19,7 +19,7 @@ components:
1919
extensions:
2020
bigbang:
2121
# renovate: datasource=gitlab-releases depName=big-bang/bigbang versioning=semver registryUrl=https://repo1.dso.mil/
22-
version: 1.57.1
22+
version: 2.0.0
2323
valuesFiles:
2424
# Istio configs
2525
- config/ingress.yaml

‎src/extensions/bigbang/bigbang.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ func addBigBangManifests(manifestDir string, cfg *extensions.BigBang) (types.Zar
387387
}
388388

389389
// Create the zarf-credentials secret manifest.
390-
if err := addManifest("bb-ext-zarf-credentials.yaml", manifestZarfCredentials()); err != nil {
390+
if err := addManifest("bb-ext-zarf-credentials.yaml", manifestZarfCredentials(cfg.Version)); err != nil {
391391
return manifest, err
392392
}
393393

‎src/extensions/bigbang/manifests.go‎

Lines changed: 46 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"regexp"
1212
"strings"
1313

14+
"github.com/Masterminds/semver/v3"
1415
"github.com/defenseunicorns/zarf/src/types/extensions"
1516
fluxHelmCtrl "github.com/fluxcd/helm-controller/api/v2beta1"
1617
fluxSrcCtrl "github.com/fluxcd/source-controller/api/v1beta2"
@@ -20,18 +21,7 @@ import (
2021

2122
var nonAlphnumeric = regexp.MustCompile("[^a-zA-Z0-9]+")
2223

23-
func manifestZarfCredentials() corev1.Secret {
24-
return corev1.Secret{
25-
TypeMeta: metav1.TypeMeta{
26-
Kind: "Secret",
27-
APIVersion: "v1",
28-
},
29-
ObjectMeta: metav1.ObjectMeta{
30-
Namespace: bb,
31-
Name: "zarf-credentials",
32-
},
33-
StringData: map[string]string{
34-
"values.yaml": `
24+
const bbV1ZarfCredentialsValues = `
3525
registryCredentials:
3626
registry: "###ZARF_REGISTRY###"
3727
username: "zarf-pull"
@@ -42,14 +32,56 @@ git:
4232
# -- HTTP git credentials, both username and password must be provided
4333
username: "###ZARF_GIT_PUSH###"
4434
password: "###ZARF_GIT_AUTH_PUSH###"
35+
# -- Big Bang v1 Kyverno Support
4536
kyvernopolicies:
4637
values:
4738
exclude:
4839
any:
4940
- resources:
5041
namespaces:
51-
- zarf # don't have kyverno prevent zarf from doing zarf things
52-
`,
42+
- zarf # don't have Kyverno prevent Zarf from doing zarf things
43+
`
44+
45+
const bbV2ZarfCredentialsValues = `
46+
registryCredentials:
47+
registry: "###ZARF_REGISTRY###"
48+
username: "zarf-pull"
49+
password: "###ZARF_REGISTRY_AUTH_PULL###"
50+
git:
51+
existingSecret: "private-git-server" # -- Chart created secrets with user defined values
52+
credentials:
53+
# -- HTTP git credentials, both username and password must be provided
54+
username: "###ZARF_GIT_PUSH###"
55+
password: "###ZARF_GIT_AUTH_PUSH###"
56+
# -- Big Bang v2 Kyverno Support
57+
kyvernoPolicies:
58+
values:
59+
exclude:
60+
any:
61+
- resources:
62+
namespaces:
63+
- zarf # don't have Kyverno prevent Zarf from doing zarf things
64+
`
65+
66+
func manifestZarfCredentials(version string) corev1.Secret {
67+
values := bbV1ZarfCredentialsValues
68+
69+
semverVersion, err := semver.NewVersion(version)
70+
if err != nil && semverVersion.Major() == 2 {
71+
values = bbV2ZarfCredentialsValues
72+
}
73+
74+
return corev1.Secret{
75+
TypeMeta: metav1.TypeMeta{
76+
Kind: "Secret",
77+
APIVersion: "v1",
78+
},
79+
ObjectMeta: metav1.ObjectMeta{
80+
Namespace: bb,
81+
Name: "zarf-credentials",
82+
},
83+
StringData: map[string]string{
84+
"values.yaml": values,
5385
},
5486
}
5587
}

‎src/extensions/bigbang/test/bigbang_test.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ func TestReleases(t *testing.T) {
4949

5050
// Build the previous version
5151
bbVersion := fmt.Sprintf("--set=BB_VERSION=%s", previous)
52-
zarfExec(t, "package", "create", "../src/extensions/bigbang/test/package", bbVersion, "--confirm")
52+
bbMajor := fmt.Sprintf("--set=BB_MAJOR=%s", previous[0:1])
53+
zarfExec(t, "package", "create", "../src/extensions/bigbang/test/package", bbVersion, bbMajor, "--confirm")
5354

5455
// Deploy the previous version
5556
pkgPath := fmt.Sprintf("zarf-package-big-bang-test-amd64-%s.tar.zst", previous)
@@ -69,7 +70,8 @@ func TestReleases(t *testing.T) {
6970

7071
// Build the latest version
7172
bbVersion = fmt.Sprintf("--set=BB_VERSION=%s", latest)
72-
zarfExec(t, "package", "create", "../src/extensions/bigbang/test/package", bbVersion, "--confirm")
73+
bbMajor = fmt.Sprintf("--set=BB_MAJOR=%s", latest[0:1])
74+
zarfExec(t, "package", "create", "../src/extensions/bigbang/test/package", bbVersion, bbMajor, "--confirm")
7375

7476
// Clean up zarf cache now that all packages are built to reduce disk pressure
7577
zarfExec(t, "tools", "clear-cache")

src/extensions/bigbang/test/package/disable-all.yaml renamed to src/extensions/bigbang/test/package/disable-all-bb1.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,6 @@ monitoring:
5353
twistlock:
5454
enabled: false
5555

56-
metricsServer:
57-
enabled: false
56+
addons:
57+
metricsServer:
58+
enabled: false

‎src/extensions/bigbang/test/package/disable-all-bb2.yaml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# Disable everything
2+
istio:
3+
enabled: false
4+
5+
istioOperator:
6+
enabled: false
7+
8+
jaeger:
9+
enabled: false
10+
11+
kiali:
12+
enabled: false
13+
14+
clusterAuditor:
15+
enabled: false
16+
17+
gatekeeper:
18+
enabled: false
19+
20+
kyverno:
21+
enabled: false
22+
23+
kyvernoPolicies:
24+
enabled: false
25+
26+
kyvernoReporter:
27+
enabled: false
28+
29+
elasticsearchKibana:
30+
enabled: false
31+
32+
eckOperator:
33+
enabled: false
34+
35+
fluentbit:
36+
enabled: false
37+
38+
promtail:
39+
enabled: false
40+
41+
loki:
42+
enabled: false
43+
44+
neuvector:
45+
enabled: false
46+
47+
tempo:
48+
enabled: false
49+
50+
monitoring:
51+
enabled: false
52+
53+
twistlock:
54+
enabled: false
55+
56+
addons:
57+
metricsServer:
58+
enabled: false

‎src/extensions/bigbang/test/package/zarf.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ components:
1919
bigbang:
2020
version: "###ZARF_PKG_TMPL_BB_VERSION###"
2121
valuesFiles:
22-
- disable-all.yaml
22+
- disable-all-bb###ZARF_PKG_TMPL_BB_MAJOR###.yaml
2323
- enable-twistlock.yaml

0 commit comments

Comments
 (0)