Update STIGATRON with 1.25 support (release) (#141)

* AUTOMATION: SSF Prod Chart Update for stigatron-ui * 1.25 stig update (#116) * Add 1.25 stig configurations for stigatron * Update 1.25 PSA check * Attempt This * Update * Update min/max k8s versions * Chart version bump --------- Co-authored-by: Adam Toy <[email protected]> --------- Co-authored-by: Carbide SSF <[email protected]> Co-authored-by: Adam Toy <[email protected]>
rancherfederal · Nov 7, 2023 · 487fe76 · 487fe76
1 parent 530120e
commit 487fe76
Show file tree

Hide file tree

Showing 16 changed files with 1,620 additions and 894 deletions.
diff --git a/charts/stigatron-ui/Chart.yaml b/charts/stigatron-ui/Chart.yaml
@@ -3,5 +3,5 @@ name: stigatron-ui
 description: Rancher Government Stigatron UI Extension
 icon: https://raw.githubusercontent.com/rancherfederal/carbide-docs/main/static/img/carbide-logo.svg
 type: application
-version: 0.2.2
+version: 0.2.3
 appVersion: "0.2.0"
diff --git a/charts/stigatron/Chart.yaml b/charts/stigatron/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: stigatron
 description: Rancher Government Stigatron Extension
 icon: https://raw.githubusercontent.com/rancherfederal/carbide-docs/main/static/img/carbide-logo.svg
-version: "0.2.2"
+version: "0.2.3"
 appVersion: "0.2.0"
 dependencies:
   - name: heimdall2

diff --git a/charts/stigatron/templates/benchmarks/rke2/DISA_Preview/1.23/clusterscanbenchmark.yaml b/charts/stigatron/templates/benchmarks/rke2/DISA_Preview/1.23/clusterscanbenchmark.yaml
@@ -8,4 +8,5 @@ spec:
   clusterProvider: rke2
   customBenchmarkConfigMapName: rke2-stig-1.23-preview
   customBenchmarkConfigMapNamespace: cis-operator-system
-  minKubernetesVersion: 1.23.0
+  minKubernetesVersion: "1.23.0"
+  maxKubernetesVersion: "1.23.30"
diff --git a/charts/stigatron/templates/benchmarks/rke2/DISA_Preview/1.23/configmap.yaml b/charts/stigatron/templates/benchmarks/rke2/DISA_Preview/1.23/configmap.yaml
diff --git a/charts/stigatron/templates/benchmarks/rke2/DISA_Preview/1.24/clusterscanbenchmark.yaml b/charts/stigatron/templates/benchmarks/rke2/DISA_Preview/1.24/clusterscanbenchmark.yaml
@@ -8,4 +8,5 @@ spec:
   clusterProvider: rke2
   customBenchmarkConfigMapName: rke2-stig-1.24-preview
   customBenchmarkConfigMapNamespace: cis-operator-system
-  minKubernetesVersion: 1.24.0
+  minKubernetesVersion: "1.24.0"
+  maxKubernetesVersion: "1.24.30"
diff --git a/charts/stigatron/templates/benchmarks/rke2/DISA_Preview/1.24/configmap.yaml b/charts/stigatron/templates/benchmarks/rke2/DISA_Preview/1.24/configmap.yaml
diff --git a/charts/stigatron/templates/benchmarks/rke2/DISA_Preview/1.25/clusterscanbenchmark.yaml b/charts/stigatron/templates/benchmarks/rke2/DISA_Preview/1.25/clusterscanbenchmark.yaml
@@ -0,0 +1,12 @@
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke2-stig-1.25-preview
+  annotations:
+    field.cattle.io/description: RKE2 1.25 STIG Profile
+spec:
+  clusterProvider: rke2
+  customBenchmarkConfigMapName: rke2-stig-1.25-preview
+  customBenchmarkConfigMapNamespace: cis-operator-system
+  minKubernetesVersion: "1.25.0"
+  maxKubernetesVersion: "1.25.30"
diff --git a/charts/stigatron/templates/benchmarks/rke2/DISA_Preview/1.25/clusterscanprofile.yaml b/charts/stigatron/templates/benchmarks/rke2/DISA_Preview/1.25/clusterscanprofile.yaml
@@ -0,0 +1,9 @@
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: rke2-stig-1.25-preview-profile
+  annotations:
+    compliance.cattle.io/stigatron-enabled: "true"
+spec:
+  benchmarkVersion: rke2-stig-1.25-preview
+  skipTests: []