Skip to content

Commit 799b786

Browse files
committed
update
1 parent d119c17 commit 799b786

File tree

3 files changed

+53
-25
lines changed

3 files changed

+53
-25
lines changed

Diff for: api/openapi-spec/swagger.json

+32-1
Original file line numberDiff line numberDiff line change
@@ -18867,7 +18867,7 @@
1886718867
}
1886818868
},
1886918869
"com.github.karmada-io.karmada.pkg.apis.policy.v1alpha1.Overriders": {
18870-
"description": "Overriders offers various alternatives to represent the override rules.\n\nIf more than one alternative exists, they will be applied with following order: - ImageOverrider - CommandOverrider - ArgsOverrider - LabelsOverrider - AnnotationsOverrider - Plaintext",
18870+
"description": "Overriders offers various alternatives to represent the override rules.\n\nIf more than one alternative exists, they will be applied with following order: - ImageOverrider - CommandOverrider - ArgsOverrider - LabelsOverrider - AnnotationsOverrider - Plaintext - PlaintextObjectOverrider",
1887118871
"type": "object",
1887218872
"properties": {
1887318873
"annotationsOverrider": {
@@ -18917,6 +18917,14 @@
1891718917
"default": {},
1891818918
"$ref": "#/definitions/com.github.karmada-io.karmada.pkg.apis.policy.v1alpha1.PlaintextOverrider"
1891918919
}
18920+
},
18921+
"plaintextObjectOverrider": {
18922+
"description": "PlaintextObjectOverrider represents the rules dedicated to handling yaml or json object overrides",
18923+
"type": "array",
18924+
"items": {
18925+
"default": {},
18926+
"$ref": "#/definitions/com.github.karmada-io.karmada.pkg.apis.policy.v1alpha1.PlaintextObjectOverrider"
18927+
}
1892018928
}
1892118929
}
1892218930
},
@@ -18958,6 +18966,29 @@
1895818966
}
1895918967
}
1896018968
},
18969+
"com.github.karmada-io.karmada.pkg.apis.policy.v1alpha1.PlaintextObjectOverrider": {
18970+
"description": "PlaintextObjectOverrider represents the rules dedicated to handling yaml or json object overrides",
18971+
"type": "object",
18972+
"required": [
18973+
"path",
18974+
"plaintext"
18975+
],
18976+
"properties": {
18977+
"path": {
18978+
"description": "Path indicates the path of target field",
18979+
"type": "string",
18980+
"default": ""
18981+
},
18982+
"plaintext": {
18983+
"description": "Plaintext represents override rules defined with plaintext overriders.",
18984+
"type": "array",
18985+
"items": {
18986+
"default": {},
18987+
"$ref": "#/definitions/com.github.karmada-io.karmada.pkg.apis.policy.v1alpha1.PlaintextOverrider"
18988+
}
18989+
}
18990+
}
18991+
},
1896118992
"com.github.karmada-io.karmada.pkg.apis.policy.v1alpha1.PlaintextOverrider": {
1896218993
"description": "PlaintextOverrider is a simple overrider that overrides target fields according to path, operator and value.",
1896318994
"type": "object",

Diff for: pkg/apis/policy/v1alpha1/override_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ type RuleWithCluster struct {
102102
// - LabelsOverrider
103103
// - AnnotationsOverrider
104104
// - Plaintext
105-
// - PlaintextObjectOverrider
105+
// - PlaintextObjectOverrider
106106
type Overriders struct {
107107
// Plaintext represents override rules defined with plaintext overriders.
108108
// +optional

Diff for: pkg/util/overridemanager/overridemanager_test.go

+20-23
Original file line numberDiff line numberDiff line change
@@ -492,9 +492,9 @@ key:
492492
Path: "data.test\\.yaml",
493493
Plaintext: []policyv1alpha1.PlaintextOverrider{
494494
{
495-
Path: "/key/key1",
495+
Path: "/key/key1",
496496
Operator: policyv1alpha1.OverriderOpReplace,
497-
Value: apiextensionsv1.JSON{Raw:[]byte(`"updated_value"`)},
497+
Value: apiextensionsv1.JSON{Raw: []byte(`"updated_value"`)},
498498
},
499499
},
500500
},
@@ -518,20 +518,20 @@ key:
518518
PolicyName: "test1",
519519
Overriders: policyv1alpha1.Overriders{
520520
PlaintextObjectOverrider: []policyv1alpha1.PlaintextObjectOverrider{
521-
{
522-
Path: "data.test\\.yaml",
523-
Plaintext: []policyv1alpha1.PlaintextOverrider{
524-
{
525-
Path: "/key/key1",
526-
Operator: policyv1alpha1.OverriderOpReplace,
527-
Value: apiextensionsv1.JSON{Raw:[]byte(`"updated_value"`)},
521+
{
522+
Path: "data.test\\.yaml",
523+
Plaintext: []policyv1alpha1.PlaintextOverrider{
524+
{
525+
Path: "/key/key1",
526+
Operator: policyv1alpha1.OverriderOpReplace,
527+
Value: apiextensionsv1.JSON{Raw: []byte(`"updated_value"`)},
528+
},
528529
},
529530
},
530531
},
531532
},
532533
},
533534
},
534-
},
535535
},
536536
wantErr: false,
537537
},
@@ -565,7 +565,6 @@ key:
565565
}
566566
}
567567

568-
569568
func Test_overrideManagerImpl_ApplyJSONOverridePolicies(t *testing.T) {
570569
configmap := helper.NewConfigMap(metav1.NamespaceDefault, "test1", map[string]string{
571570
"test.yaml": `{"key":{"key1":"value"}`,
@@ -612,9 +611,9 @@ func Test_overrideManagerImpl_ApplyJSONOverridePolicies(t *testing.T) {
612611
Path: "data.test\\.yaml",
613612
Plaintext: []policyv1alpha1.PlaintextOverrider{
614613
{
615-
Path: "/key/key1",
614+
Path: "/key/key1",
616615
Operator: policyv1alpha1.OverriderOpReplace,
617-
Value: apiextensionsv1.JSON{Raw:[]byte(`"updated_value"`)},
616+
Value: apiextensionsv1.JSON{Raw: []byte(`"updated_value"`)},
618617
},
619618
},
620619
},
@@ -638,20 +637,20 @@ func Test_overrideManagerImpl_ApplyJSONOverridePolicies(t *testing.T) {
638637
PolicyName: "test1",
639638
Overriders: policyv1alpha1.Overriders{
640639
PlaintextObjectOverrider: []policyv1alpha1.PlaintextObjectOverrider{
641-
{
642-
Path: "data.test\\.yaml",
643-
Plaintext: []policyv1alpha1.PlaintextOverrider{
644-
{
645-
Path: "/key/key1",
646-
Operator: policyv1alpha1.OverriderOpReplace,
647-
Value: apiextensionsv1.JSON{Raw:[]byte(`"updated_value"`)},
640+
{
641+
Path: "data.test\\.yaml",
642+
Plaintext: []policyv1alpha1.PlaintextOverrider{
643+
{
644+
Path: "/key/key1",
645+
Operator: policyv1alpha1.OverriderOpReplace,
646+
Value: apiextensionsv1.JSON{Raw: []byte(`"updated_value"`)},
647+
},
648648
},
649649
},
650650
},
651651
},
652652
},
653653
},
654-
},
655654
},
656655
wantErr: false,
657656
},
@@ -682,5 +681,3 @@ func Test_overrideManagerImpl_ApplyJSONOverridePolicies(t *testing.T) {
682681
})
683682
}
684683
}
685-
686-

0 commit comments

Comments
 (0)