Add support for disa stig version v2r4

AleksandarSavchev · AleksandarSavchev · commit b689b3df6eac · 2025-09-30T17:44:25.000+03:00
diff --git a/docs/providers/garden.md b/docs/providers/garden.md
@@ -8,9 +8,9 @@ The `Garden` provider is capable of accessing a Garden cluster environment and r
 
 The `Garden` provider implements the following `rulesets`:
 - [Security Hardened Shoot Cluster](../rulesets/security-hardened-shoot-cluster/ruleset.md)
-    - v0.2.1
-    - v0.2.0
-    - v0.1.0
+  - v0.2.1
+  - v0.2.0
+  - v0.1.0
 
 ### Configuration
 
diff --git a/docs/providers/gardener.md b/docs/providers/gardener.md
@@ -8,9 +8,9 @@ The `Gardener` provider is capable of accessing a `seed/shoot` environment and r
 
 The `Gardener` provider implements the following `rulesets`:
 - [DISA Kubernetes Security Technical Implementation Guide](../rulesets/disa-k8s-stig/ruleset.md)
-    - v2r3
-    - v2r2
-    
+  - v2r4
+  - v2r3
+
 ### Configuration
 
 See an [example Diki configuration](../../example/config/gardener.yaml) for this provider.
diff --git a/docs/providers/managedk8s.md b/docs/providers/managedk8s.md
@@ -10,8 +10,8 @@ The `Managed Kubernetes` provider is capable of accessing a managed Kubernetes e
 The `Managed Kubernetes` provider implements the following `rulesets`:
 
 - [DISA Kubernetes Security Technical Implementation Guide](../rulesets/disa-k8s-stig/ruleset.md)
+  - v2r4
   - v2r3
-  - v2r2
 
 - [Security Hardened Kubernetes Cluster](../rulesets/security-hardened-k8s/ruleset.md)
   - v0.1.0
diff --git a/docs/providers/virtualgarden.md b/docs/providers/virtualgarden.md
@@ -8,9 +8,8 @@ The `Virtual Garden` provider is capable of accessing a `runtime/virtual garden`
 
 The `Gardener` provider implements the following `rulesets`:
 - [DISA Kubernetes Security Technical Implementation Guide](../rulesets/disa-k8s-stig/ruleset.md)
-    - v2r3
-    - v2r2
-    
+  - v2r4
+  - v2r3
 
 ### Configuration
 
diff --git a/example/config/gardener.yaml b/example/config/gardener.yaml
@@ -15,7 +15,7 @@ providers:             # contains information about known providers
   rulesets:
   - id: disa-kubernetes-stig
     name: DISA Kubernetes Security Technical Implementation Guide
-    version: v2r3
+    version: v2r4
     # args:
     #   maxRetries: 1 # number of maximum rule run retries. Defaults to 1 
     ruleOptions:
diff --git a/example/config/managedk8s.yaml b/example/config/managedk8s.yaml
@@ -11,7 +11,7 @@ providers:                   # contains information about known providers
   rulesets:
   - id: disa-kubernetes-stig
     name: DISA Kubernetes Security Technical Implementation Guide
-    version: v2r3
+    version: v2r4
     # args:
     #   maxRetries: 1 # number of maximum rule run retries. Defaults to 1
     ruleOptions:
diff --git a/example/config/virtualgarden.yaml b/example/config/virtualgarden.yaml
@@ -10,7 +10,7 @@ providers:               # contains information about known providers
   rulesets:
   - id: disa-kubernetes-stig
     name: DISA Kubernetes Security Technical Implementation Guide
-    version: v2r3
+    version: v2r4
     # args:
     #   maxRetries: 1 # number of maximum rule run retries. Defaults to 1 
     ruleOptions:
diff --git a/hack/run.sh b/hack/run.sh
@@ -9,7 +9,7 @@ set -e
 rule_id=""
 provider="gardener"
 ruleset_id="disa-kubernetes-stig"
-ruleset_version="v2r3"
+ruleset_version="v2r4"
 run_all="false"
 
 
@@ -29,7 +29,7 @@ This command runs diki with a specified config file.
                       specified ruleset are executed.
     --provider        Ruleset provider. Defaults to "gardener".
     --ruleset-id      ID of ruleset that will be ran. Defaults to "disa-kubernetes-stig".
-    --ruleset-version Version of ruleset that will be ran. Defaults to "v2r3".
+    --ruleset-version Version of ruleset that will be ran. Defaults to "v2r4".
     
   environment variables:
     IMAGEVECTOR_OVERWRITE Overwrites diki/imagesvector/images.yaml file with specified file path.
diff --git a/pkg/provider/gardener/ruleset/disak8sstig/ruleset.go b/pkg/provider/gardener/ruleset/disak8sstig/ruleset.go
@@ -33,7 +33,7 @@ var (
 	_ ruleset.Ruleset = &Ruleset{}
 	// SupportedVersions is a list of available versions for the DISA Kubernetes STIG Ruleset.
 	// Versions are sorted from newest to oldest.
-	SupportedVersions = []string{"v2r3", "v2r2"}
+	SupportedVersions = []string{"v2r4", "v2r3"}
 )
 
 // Ruleset implements DISA Kubernetes STIG.
@@ -128,18 +128,18 @@ func FromGenericConfig(rulesetConfig config.RulesetConfig, additionalOpsPodLabel
 	}
 
 	switch rulesetConfig.Version {
-	case "v2r2":
-		if err := ruleset.validateV2R2RuleOptions(indexedRuleOptions, fldPath.Child("ruleOptions")); err != nil {
+	case "v2r3":
+		if err := ruleset.validateV2R3RuleOptions(indexedRuleOptions, fldPath.Child("ruleOptions")); err != nil {
 			return nil, err
 		}
-		if err := ruleset.registerV2R2Rules(ruleOptions); err != nil {
+		if err := ruleset.registerV2R3Rules(ruleOptions); err != nil {
 			return nil, err
 		}
-	case "v2r3":
-		if err := ruleset.validateV2R3RuleOptions(indexedRuleOptions, fldPath.Child("ruleOptions")); err != nil {
+	case "v2r4":
+		if err := ruleset.validateV2R4RuleOptions(indexedRuleOptions, fldPath.Child("ruleOptions")); err != nil {
 			return nil, err
 		}
-		if err := ruleset.registerV2R3Rules(ruleOptions); err != nil {
+		if err := ruleset.registerV2R4Rules(ruleOptions); err != nil {
 			return nil, err
 		}
 	default:
diff --git a/pkg/provider/gardener/ruleset/disak8sstig/v2r3_ruleset.go b/pkg/provider/gardener/ruleset/disak8sstig/v2r3_ruleset.go
@@ -112,7 +112,7 @@ func (r *Ruleset) registerV2R3Rules(ruleOptions map[string]config.RuleOptionsCon
 		return err
 	}
 
-	opts242390, err := getV2R2OptionOrNil[sharedrules.Options242390](ruleOptions[sharedrules.ID242390].Args)
+	opts242390, err := getV2R3OptionOrNil[sharedrules.Options242390](ruleOptions[sharedrules.ID242390].Args)
 	if err != nil {
 		return fmt.Errorf("rule option 242390 error: %s", err.Error())
 	}
diff --git a/pkg/provider/gardener/ruleset/disak8sstig/v2r4_ruleset.go b/pkg/provider/gardener/ruleset/disak8sstig/v2r4_ruleset.go
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Gardener contributors
+// SPDX-FileCopyrightText: 2025 SAP SE or an SAP affiliate company and Gardener contributors
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -27,8 +27,8 @@ import (
 	sharedrules "github.com/gardener/diki/pkg/shared/ruleset/disak8sstig/rules"
 )
 
-func validateV2R2Options[O rules.RuleOption](options any, fldPath *field.Path) field.ErrorList {
-	parsedOptions, err := getV2R2OptionOrNil[O](options)
+func validateV2R4Options[O rules.RuleOption](options any, fldPath *field.Path) field.ErrorList {
+	parsedOptions, err := getV2R4OptionOrNil[O](options)
 	if err != nil {
 		return field.ErrorList{
 			field.InternalError(fldPath, err),
@@ -46,7 +46,7 @@ func validateV2R2Options[O rules.RuleOption](options any, fldPath *field.Path) f
 	return nil
 }
 
-func parseV2R2Options[O rules.RuleOption](options any) (*O, error) {
+func parseV2R4Options[O rules.RuleOption](options any) (*O, error) {
 	optionsByte, err := json.Marshal(options)
 	if err != nil {
 		return nil, err
@@ -60,33 +60,33 @@ func parseV2R2Options[O rules.RuleOption](options any) (*O, error) {
 	return &parsedOptions, nil
 }
 
-func getV2R2OptionOrNil[O rules.RuleOption](options any) (*O, error) {
+func getV2R4OptionOrNil[O rules.RuleOption](options any) (*O, error) {
 	if options == nil {
 		return nil, nil
 	}
-	return parseV2R2Options[O](options)
+	return parseV2R4Options[O](options)
 }
 
-func (r *Ruleset) validateV2R2RuleOptions(ruleOptions map[string]internalconfig.IndexedRuleOptionsConfig, fldPath *field.Path) error {
+func (r *Ruleset) validateV2R4RuleOptions(ruleOptions map[string]internalconfig.IndexedRuleOptionsConfig, fldPath *field.Path) error {
 	allErrs := field.ErrorList{}
 
-	allErrs = append(allErrs, validateV2R2Options[sharedrules.Options242390](ruleOptions[sharedrules.ID242390].Args, fldPath.Index(ruleOptions[sharedrules.ID242390].Index).Child("args"))...)
-	allErrs = append(allErrs, validateV2R2Options[rules.Options242400](ruleOptions[sharedrules.ID242400].Args, fldPath.Index(ruleOptions[sharedrules.ID242400].Index).Child("args"))...)
-	allErrs = append(allErrs, validateV2R2Options[disaoption.Options242414](ruleOptions[sharedrules.ID242414].Args, fldPath.Index(ruleOptions[sharedrules.ID242414].Index).Child("args"))...)
-	allErrs = append(allErrs, validateV2R2Options[disaoption.Options242415](ruleOptions[sharedrules.ID242415].Args, fldPath.Index(ruleOptions[sharedrules.ID242415].Index).Child("args"))...)
-	allErrs = append(allErrs, validateV2R2Options[disaoption.Options242442](ruleOptions[sharedrules.ID242442].Args, fldPath.Index(ruleOptions[sharedrules.ID242442].Index).Child("args"))...)
-	allErrs = append(allErrs, validateV2R2Options[disaoption.FileOwnerOptions](ruleOptions[sharedrules.ID242445].Args, fldPath.Index(ruleOptions[sharedrules.ID242445].Index).Child("args"))...)
-	allErrs = append(allErrs, validateV2R2Options[disaoption.FileOwnerOptions](ruleOptions[sharedrules.ID242446].Args, fldPath.Index(ruleOptions[sharedrules.ID242446].Index).Child("args"))...)
-	allErrs = append(allErrs, validateV2R2Options[rules.Options242451](ruleOptions[sharedrules.ID242451].Args, fldPath.Index(ruleOptions[sharedrules.ID242451].Index).Child("args"))...)
-	allErrs = append(allErrs, validateV2R2Options[rules.Options242466](ruleOptions[sharedrules.ID242466].Args, fldPath.Index(ruleOptions[sharedrules.ID242466].Index).Child("args"))...)
-	allErrs = append(allErrs, validateV2R2Options[rules.Options242467](ruleOptions[sharedrules.ID242467].Args, fldPath.Index(ruleOptions[sharedrules.ID242467].Index).Child("args"))...)
-	allErrs = append(allErrs, validateV2R2Options[sharedrules.Options245543](ruleOptions[sharedrules.ID245543].Args, fldPath.Index(ruleOptions[sharedrules.ID245543].Index).Child("args"))...)
-	allErrs = append(allErrs, validateV2R2Options[sharedrules.Options254800](ruleOptions[sharedrules.ID254800].Args, fldPath.Index(ruleOptions[sharedrules.ID254800].Index).Child("args"))...)
+	allErrs = append(allErrs, validateV2R4Options[sharedrules.Options242390](ruleOptions[sharedrules.ID242390].Args, fldPath.Index(ruleOptions[sharedrules.ID242390].Index).Child("args"))...)
+	allErrs = append(allErrs, validateV2R4Options[rules.Options242400](ruleOptions[sharedrules.ID242400].Args, fldPath.Index(ruleOptions[sharedrules.ID242400].Index).Child("args"))...)
+	allErrs = append(allErrs, validateV2R4Options[disaoption.Options242414](ruleOptions[sharedrules.ID242414].Args, fldPath.Index(ruleOptions[sharedrules.ID242414].Index).Child("args"))...)
+	allErrs = append(allErrs, validateV2R4Options[disaoption.Options242415](ruleOptions[sharedrules.ID242415].Args, fldPath.Index(ruleOptions[sharedrules.ID242415].Index).Child("args"))...)
+	allErrs = append(allErrs, validateV2R4Options[disaoption.Options242442](ruleOptions[sharedrules.ID242442].Args, fldPath.Index(ruleOptions[sharedrules.ID242442].Index).Child("args"))...)
+	allErrs = append(allErrs, validateV2R4Options[disaoption.FileOwnerOptions](ruleOptions[sharedrules.ID242445].Args, fldPath.Index(ruleOptions[sharedrules.ID242445].Index).Child("args"))...)
+	allErrs = append(allErrs, validateV2R4Options[disaoption.FileOwnerOptions](ruleOptions[sharedrules.ID242446].Args, fldPath.Index(ruleOptions[sharedrules.ID242446].Index).Child("args"))...)
+	allErrs = append(allErrs, validateV2R4Options[rules.Options242451](ruleOptions[sharedrules.ID242451].Args, fldPath.Index(ruleOptions[sharedrules.ID242451].Index).Child("args"))...)
+	allErrs = append(allErrs, validateV2R4Options[rules.Options242466](ruleOptions[sharedrules.ID242466].Args, fldPath.Index(ruleOptions[sharedrules.ID242466].Index).Child("args"))...)
+	allErrs = append(allErrs, validateV2R4Options[rules.Options242467](ruleOptions[sharedrules.ID242467].Args, fldPath.Index(ruleOptions[sharedrules.ID242467].Index).Child("args"))...)
+	allErrs = append(allErrs, validateV2R4Options[sharedrules.Options245543](ruleOptions[sharedrules.ID245543].Args, fldPath.Index(ruleOptions[sharedrules.ID245543].Index).Child("args"))...)
+	allErrs = append(allErrs, validateV2R4Options[sharedrules.Options254800](ruleOptions[sharedrules.ID254800].Args, fldPath.Index(ruleOptions[sharedrules.ID254800].Index).Child("args"))...)
 
 	return allErrs.ToAggregate()
 }
 
-func (r *Ruleset) registerV2R2Rules(ruleOptions map[string]config.RuleOptionsConfig) error { // TODO: add to FromGenericConfig
+func (r *Ruleset) registerV2R4Rules(ruleOptions map[string]config.RuleOptionsConfig) error { // TODO: add to FromGenericConfig
 	shootClient, err := client.New(r.ShootConfig, client.Options{Scheme: kubernetesgardener.ShootScheme})
 	if err != nil {
 		return err
@@ -112,51 +112,51 @@ func (r *Ruleset) registerV2R2Rules(ruleOptions map[string]config.RuleOptionsCon
 		return err
 	}
 
-	opts242390, err := getV2R2OptionOrNil[sharedrules.Options242390](ruleOptions[sharedrules.ID242390].Args)
+	opts242390, err := getV2R4OptionOrNil[sharedrules.Options242390](ruleOptions[sharedrules.ID242390].Args)
 	if err != nil {
 		return fmt.Errorf("rule option 242390 error: %s", err.Error())
 	}
-	opts242400, err := getV2R2OptionOrNil[rules.Options242400](ruleOptions[sharedrules.ID242400].Args)
+	opts242400, err := getV2R4OptionOrNil[rules.Options242400](ruleOptions[sharedrules.ID242400].Args)
 	if err != nil {
 		return fmt.Errorf("rule option 242400 error: %s", err.Error())
 	}
-	opts242414, err := getV2R2OptionOrNil[disaoption.Options242414](ruleOptions[sharedrules.ID242414].Args)
+	opts242414, err := getV2R4OptionOrNil[disaoption.Options242414](ruleOptions[sharedrules.ID242414].Args)
 	if err != nil {
 		return fmt.Errorf("rule option 242414 error: %s", err.Error())
 	}
-	opts242415, err := getV2R2OptionOrNil[disaoption.Options242415](ruleOptions[sharedrules.ID242415].Args)
+	opts242415, err := getV2R4OptionOrNil[disaoption.Options242415](ruleOptions[sharedrules.ID242415].Args)
 	if err != nil {
 		return fmt.Errorf("rule option 242415 error: %s", err.Error())
 	}
-	opts242442, err := getV2R2OptionOrNil[disaoption.Options242442](ruleOptions[sharedrules.ID242442].Args)
+	opts242442, err := getV2R4OptionOrNil[disaoption.Options242442](ruleOptions[sharedrules.ID242442].Args)
 	if err != nil {
 		return fmt.Errorf("rule option 242442 error: %s", err.Error())
 	}
-	opts242445, err := getV2R2OptionOrNil[disaoption.FileOwnerOptions](ruleOptions[sharedrules.ID242445].Args)
+	opts242445, err := getV2R4OptionOrNil[disaoption.FileOwnerOptions](ruleOptions[sharedrules.ID242445].Args)
 	if err != nil {
 		return fmt.Errorf("rule option 242445 error: %s", err.Error())
 	}
-	opts242446, err := getV2R2OptionOrNil[disaoption.FileOwnerOptions](ruleOptions[sharedrules.ID242446].Args)
+	opts242446, err := getV2R4OptionOrNil[disaoption.FileOwnerOptions](ruleOptions[sharedrules.ID242446].Args)
 	if err != nil {
 		return fmt.Errorf("rule option 242446 error: %s", err.Error())
 	}
-	opts242451, err := getV2R2OptionOrNil[rules.Options242451](ruleOptions[sharedrules.ID242451].Args)
+	opts242451, err := getV2R4OptionOrNil[rules.Options242451](ruleOptions[sharedrules.ID242451].Args)
 	if err != nil {
 		return fmt.Errorf("rule option 242451 error: %s", err.Error())
 	}
-	opts242466, err := getV2R2OptionOrNil[rules.Options242466](ruleOptions[sharedrules.ID242466].Args)
+	opts242466, err := getV2R4OptionOrNil[rules.Options242466](ruleOptions[sharedrules.ID242466].Args)
 	if err != nil {
 		return fmt.Errorf("rule option 242466 error: %s", err.Error())
 	}
-	opts242467, err := getV2R2OptionOrNil[rules.Options242467](ruleOptions[sharedrules.ID242467].Args)
+	opts242467, err := getV2R4OptionOrNil[rules.Options242467](ruleOptions[sharedrules.ID242467].Args)
 	if err != nil {
 		return fmt.Errorf("rule option 242467 error: %s", err.Error())
 	}
-	opts245543, err := getV2R2OptionOrNil[sharedrules.Options245543](ruleOptions[sharedrules.ID245543].Args)
+	opts245543, err := getV2R4OptionOrNil[sharedrules.Options245543](ruleOptions[sharedrules.ID245543].Args)
 	if err != nil {
 		return fmt.Errorf("rule option 245543 error: %s", err.Error())
 	}
-	opts254800, err := getV2R2OptionOrNil[sharedrules.Options254800](ruleOptions[sharedrules.ID254800].Args)
+	opts254800, err := getV2R4OptionOrNil[sharedrules.Options254800](ruleOptions[sharedrules.ID254800].Args)
 	if err != nil {
 		return fmt.Errorf("rule option 254800 error: %s", err.Error())
 	}
@@ -699,6 +699,27 @@ func (r *Ruleset) registerV2R2Rules(ruleOptions map[string]config.RuleOptionsCon
 			rule.Skipped,
 			rule.SkipRuleWithSeverity(rule.SeverityHigh),
 		),
+		rule.NewSkipRule(
+			sharedrules.ID274882,
+			"Kubernetes Secrets must be encrypted at rest.",
+			"Rule is not implemented.",
+			rule.NotImplemented,
+			rule.SkipRuleWithSeverity(rule.SeverityHigh),
+		),
+		rule.NewSkipRule(
+			sharedrules.ID274883,
+			"Sensitive information must be stored using Kubernetes Secrets or an external Secret store provider.",
+			"Rule is not implemented.",
+			rule.NotImplemented,
+			rule.SkipRuleWithSeverity(rule.SeverityHigh),
+		),
+		rule.NewSkipRule(
+			sharedrules.ID274884,
+			"Kubernetes must limit Secret access on a need-to-know basis.",
+			"Rule is not implemented.",
+			rule.NotImplemented,
+			rule.SkipRuleWithSeverity(rule.SeverityMedium),
+		),
 	}
 
 	for i, r := range rules {
@@ -717,8 +738,8 @@ func (r *Ruleset) registerV2R2Rules(ruleOptions map[string]config.RuleOptionsCon
 
 	// check that the registered rules equal
 	// the number of rules in that ruleset version
-	if len(rules) != 91 {
-		return fmt.Errorf("revision expects 91 registered rules, but got: %d", len(rules))
+	if len(rules) != 94 {
+		return fmt.Errorf("revision expects 94 registered rules, but got: %d", len(rules))
 	}
 
 	return r.AddRules(rules...)
diff --git a/pkg/provider/managedk8s/ruleset/disak8sstig/ruleset.go b/pkg/provider/managedk8s/ruleset/disak8sstig/ruleset.go
@@ -33,7 +33,7 @@ var (
 	_ ruleset.Ruleset = &Ruleset{}
 	// SupportedVersions is a list of available versions for the DISA Kubernetes STIG Ruleset.
 	// Versions are sorted from newest to oldest.
-	SupportedVersions = []string{"v2r3", "v2r2"}
+	SupportedVersions = []string{"v2r4", "v2r3"}
 )
 
 // Ruleset implements DISA Kubernetes STIG.
@@ -123,18 +123,18 @@ func FromGenericConfig(rulesetConfig config.RulesetConfig, additionalOpsPodLabel
 	}
 
 	switch rulesetConfig.Version {
-	case "v2r2":
-		if err := ruleset.validateV2R2RuleOptions(indexedRuleOptions, fldPath.Child("ruleOptions")); err != nil {
+	case "v2r3":
+		if err := ruleset.validateV2R3RuleOptions(indexedRuleOptions, fldPath.Child("ruleOptions")); err != nil {
 			return nil, err
 		}
-		if err := ruleset.registerV2R2Rules(ruleOptions); err != nil {
+		if err := ruleset.registerV2R3Rules(ruleOptions); err != nil {
 			return nil, err
 		}
-	case "v2r3":
-		if err := ruleset.validateV2R3RuleOptions(indexedRuleOptions, fldPath.Child("ruleOptions")); err != nil {
+	case "v2r4":
+		if err := ruleset.validateV2R4RuleOptions(indexedRuleOptions, fldPath.Child("ruleOptions")); err != nil {
 			return nil, err
 		}
-		if err := ruleset.registerV2R3Rules(ruleOptions); err != nil {
+		if err := ruleset.registerV2R4Rules(ruleOptions); err != nil {
 			return nil, err
 		}
 	default:
diff --git a/pkg/provider/managedk8s/ruleset/disak8sstig/v2r4_ruleset.go b/pkg/provider/managedk8s/ruleset/disak8sstig/v2r4_ruleset.go
diff --git a/pkg/provider/virtualgarden/ruleset/disak8sstig/ruleset.go b/pkg/provider/virtualgarden/ruleset/disak8sstig/ruleset.go
diff --git a/pkg/provider/virtualgarden/ruleset/disak8sstig/v2r4_ruleset.go b/pkg/provider/virtualgarden/ruleset/disak8sstig/v2r4_ruleset.go
diff --git a/pkg/shared/ruleset/disak8sstig/rules/ids.go b/pkg/shared/ruleset/disak8sstig/rules/ids.go

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ var (`
`33`	`33`	`_ ruleset.Ruleset = &Ruleset{}`
`34`	`34`	`// SupportedVersions is a list of available versions for the DISA Kubernetes STIG Ruleset.`
`35`	`35`	`// Versions are sorted from newest to oldest.`
`36`		`- SupportedVersions = []string{"v2r3", "v2r2"}`
	`36`	`+ SupportedVersions = []string{"v2r4", "v2r3"}`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`// Ruleset implements DISA Kubernetes STIG.`
`@@ -128,18 +128,18 @@ func FromGenericConfig(rulesetConfig config.RulesetConfig, additionalOpsPodLabel`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`switch rulesetConfig.Version {`
`131`		`- case "v2r2":`
`132`		`- if err := ruleset.validateV2R2RuleOptions(indexedRuleOptions, fldPath.Child("ruleOptions")); err != nil {`
	`131`	`+ case "v2r3":`
	`132`	`+ if err := ruleset.validateV2R3RuleOptions(indexedRuleOptions, fldPath.Child("ruleOptions")); err != nil {`
`133`	`133`	`return nil, err`
`134`	`134`	`}`
`135`		`- if err := ruleset.registerV2R2Rules(ruleOptions); err != nil {`
	`135`	`+ if err := ruleset.registerV2R3Rules(ruleOptions); err != nil {`
`136`	`136`	`return nil, err`
`137`	`137`	`}`
`138`		`- case "v2r3":`
`139`		`- if err := ruleset.validateV2R3RuleOptions(indexedRuleOptions, fldPath.Child("ruleOptions")); err != nil {`
	`138`	`+ case "v2r4":`
	`139`	`+ if err := ruleset.validateV2R4RuleOptions(indexedRuleOptions, fldPath.Child("ruleOptions")); err != nil {`
`140`	`140`	`return nil, err`
`141`	`141`	`}`
`142`		`- if err := ruleset.registerV2R3Rules(ruleOptions); err != nil {`
	`142`	`+ if err := ruleset.registerV2R4Rules(ruleOptions); err != nil {`
`143`	`143`	`return nil, err`
`144`	`144`	`}`
`145`	`145`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ func (r *Ruleset) registerV2R3Rules(ruleOptions map[string]config.RuleOptionsCon`
`112`	`112`	`return err`
`113`	`113`	`}`
`114`	`114`
`115`		`- opts242390, err := getV2R2OptionOrNil[sharedrules.Options242390](ruleOptions[sharedrules.ID242390].Args)`
	`115`	`+ opts242390, err := getV2R3OptionOrNil[sharedrules.Options242390](ruleOptions[sharedrules.ID242390].Args)`
`116`	`116`	`if err != nil {`
`117`	`117`	`return fmt.Errorf("rule option 242390 error: %s", err.Error())`
`118`	`118`	`}`