karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pkg+test: unify usage of policyv1alpha1 operators 

Signed-off-by: Mohamed Awnallah <mohamedmohey2352@gmail.com>
This commit is contained in:
Mohamed Awnallah 2024-09-09 17:52:48 +03:00
parent 32c2ef7aa4
commit be87fd5e71
8 changed files with 96 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controllers/namespace/namespace_sync_controller_test.go
View File

@ -287,7 +287,7 @@ func TestController_buildWorks(t *testing.T) {
Plaintext: []policyv1alpha1.PlaintextOverrider{ Plaintext: []policyv1alpha1.PlaintextOverrider{
{ {
Path: "/metadata/labels/overridden", Path: "/metadata/labels/overridden",
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: apiextensionsv1.JSON{ Value: apiextensionsv1.JSON{
Raw: []byte(`"true"`), Raw: []byte(`"true"`),
}, },

48
pkg/util/overridemanager/commandargsoverride_test.go
View File

@ -260,13 +260,13 @@ func TestParseJSONPatchesByCommandOverrider(t *testing.T) {
rawObj: generateTestCommandDeploymentYaml(), rawObj: generateTestCommandDeploymentYaml(),
CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{ CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
ContainerName: "nginx", ContainerName: "nginx",
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: []string{"&& echo 'hello karmada'"}, Value: []string{"&& echo 'hello karmada'"},
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/command", Path: "/spec/template/spec/containers/0/command",
Value: []string{"nginx", "-v", "-t", "&& echo 'hello karmada'"}, Value: []string{"nginx", "-v", "-t", "&& echo 'hello karmada'"},
}, },
@ -278,13 +278,13 @@ func TestParseJSONPatchesByCommandOverrider(t *testing.T) {
rawObj: generateTestCommandDeploymentYaml(), rawObj: generateTestCommandDeploymentYaml(),
CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{ CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
ContainerName: "nginx", ContainerName: "nginx",
Operator: "remove", Operator: policyv1alpha1.OverriderOpRemove,
Value: []string{"-t"}, Value: []string{"-t"},
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/command", Path: "/spec/template/spec/containers/0/command",
Value: []string{"nginx", "-v"}, Value: []string{"nginx", "-v"},
}, },
@ -296,13 +296,13 @@ func TestParseJSONPatchesByCommandOverrider(t *testing.T) {
rawObj: generateTestCommandDeploymentYaml(), rawObj: generateTestCommandDeploymentYaml(),
CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{ CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
ContainerName: "nginx", ContainerName: "nginx",
Operator: "remove", Operator: policyv1alpha1.OverriderOpRemove,
Value: []string{}, Value: []string{},
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/command", Path: "/spec/template/spec/containers/0/command",
Value: []string{"nginx", "-v", "-t"}, Value: []string{"nginx", "-v", "-t"},
}, },
@ -314,13 +314,13 @@ func TestParseJSONPatchesByCommandOverrider(t *testing.T) {
rawObj: generateTestCommandDeploymentYamlWithTwoContainer(), rawObj: generateTestCommandDeploymentYamlWithTwoContainer(),
CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{ CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
ContainerName: "nginx", ContainerName: "nginx",
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: []string{"echo 'hello karmada'"}, Value: []string{"echo 'hello karmada'"},
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/command", Path: "/spec/template/spec/containers/0/command",
Value: []string{"nginx", "-v", "-t", "echo 'hello karmada'"}, Value: []string{"nginx", "-v", "-t", "echo 'hello karmada'"},
}, },
@ -332,13 +332,13 @@ func TestParseJSONPatchesByCommandOverrider(t *testing.T) {
rawObj: generateTestCommandDeploymentYamlWithTwoContainer(), rawObj: generateTestCommandDeploymentYamlWithTwoContainer(),
CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{ CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
ContainerName: "nginx", ContainerName: "nginx",
Operator: "remove", Operator: policyv1alpha1.OverriderOpRemove,
Value: []string{"-t"}, Value: []string{"-t"},
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/command", Path: "/spec/template/spec/containers/0/command",
Value: []string{"nginx", "-v"}, Value: []string{"nginx", "-v"},
}, },
@ -350,13 +350,13 @@ func TestParseJSONPatchesByCommandOverrider(t *testing.T) {
rawObj: generateTestCommandPodYaml(), rawObj: generateTestCommandPodYaml(),
CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{ CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
ContainerName: "nginx", ContainerName: "nginx",
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: []string{"echo 'hello karmada'"}, Value: []string{"echo 'hello karmada'"},
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/containers/0/command", Path: "/spec/containers/0/command",
Value: []string{"nginx", "-v", "-t", "echo 'hello karmada'"}, Value: []string{"nginx", "-v", "-t", "echo 'hello karmada'"},
}, },
@ -368,13 +368,13 @@ func TestParseJSONPatchesByCommandOverrider(t *testing.T) {
rawObj: generateTestCommandStatefulSetYaml(), rawObj: generateTestCommandStatefulSetYaml(),
CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{ CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
ContainerName: "nginx", ContainerName: "nginx",
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: []string{"echo 'hello karmada'"}, Value: []string{"echo 'hello karmada'"},
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/command", Path: "/spec/template/spec/containers/0/command",
Value: []string{"nginx", "-v", "-t", "echo 'hello karmada'"}, Value: []string{"nginx", "-v", "-t", "echo 'hello karmada'"},
}, },
@ -386,13 +386,13 @@ func TestParseJSONPatchesByCommandOverrider(t *testing.T) {
rawObj: generateTestCommandReplicaSetYaml(), rawObj: generateTestCommandReplicaSetYaml(),
CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{ CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
ContainerName: "nginx", ContainerName: "nginx",
Operator: "remove", Operator: policyv1alpha1.OverriderOpRemove,
Value: []string{"-t"}, Value: []string{"-t"},
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/command", Path: "/spec/template/spec/containers/0/command",
Value: []string{"nginx", "-v"}, Value: []string{"nginx", "-v"},
}, },
@ -404,13 +404,13 @@ func TestParseJSONPatchesByCommandOverrider(t *testing.T) {
rawObj: generateTestCommandDaemonSetYaml(), rawObj: generateTestCommandDaemonSetYaml(),
CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{ CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
ContainerName: "nginx", ContainerName: "nginx",
Operator: "remove", Operator: policyv1alpha1.OverriderOpRemove,
Value: []string{"-t"}, Value: []string{"-t"},
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/command", Path: "/spec/template/spec/containers/0/command",
Value: []string{"nginx", "-v"}, Value: []string{"nginx", "-v"},
}, },
@ -449,13 +449,13 @@ func TestParseJSONPatchesByArgsOverrider(t *testing.T) {
rawObj: generateTestArgsDeploymentYaml(), rawObj: generateTestArgsDeploymentYaml(),
CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{ CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
ContainerName: "nginx", ContainerName: "nginx",
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: []string{"&& echo 'hello karmada'"}, Value: []string{"&& echo 'hello karmada'"},
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/args", Path: "/spec/template/spec/containers/0/args",
Value: []string{"nginx", "-v", "-t", "&& echo 'hello karmada'"}, Value: []string{"nginx", "-v", "-t", "&& echo 'hello karmada'"},
}, },
@ -467,13 +467,13 @@ func TestParseJSONPatchesByArgsOverrider(t *testing.T) {
rawObj: generateTestArgsDeploymentYaml(), rawObj: generateTestArgsDeploymentYaml(),
CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{ CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
ContainerName: "nginx", ContainerName: "nginx",
Operator: "remove", Operator: policyv1alpha1.OverriderOpRemove,
Value: []string{"-t"}, Value: []string{"-t"},
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/args", Path: "/spec/template/spec/containers/0/args",
Value: []string{"nginx", "-v"}, Value: []string{"nginx", "-v"},
}, },
@ -485,13 +485,13 @@ func TestParseJSONPatchesByArgsOverrider(t *testing.T) {
rawObj: generateTestCommandDeploymentYaml(), rawObj: generateTestCommandDeploymentYaml(),
CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{ CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
ContainerName: "nginx", ContainerName: "nginx",
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: []string{"-t"}, Value: []string{"-t"},
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "add", Op: string(policyv1alpha1.OverriderOpAdd),
Path: "/spec/template/spec/containers/0/args", Path: "/spec/template/spec/containers/0/args",
Value: []string{"-t"}, Value: []string{"-t"},
}, },

74
pkg/util/overridemanager/imageoverride_test.go
View File

@ -240,13 +240,13 @@ func TestParseJSONPatchesByImageOverrider(t *testing.T) {
rawObj: generateJobYaml(), rawObj: generateJobYaml(),
imageOverrider: &policyv1alpha1.ImageOverrider{ imageOverrider: &policyv1alpha1.ImageOverrider{
Component: "Registry", Component: "Registry",
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: "registry.k8s.io", Value: "registry.k8s.io",
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
Value: "registry.k8s.io/perl:5.34.0", Value: "registry.k8s.io/perl:5.34.0",
}, },
@ -262,13 +262,13 @@ func TestParseJSONPatchesByImageOverrider(t *testing.T) {
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
}, },
Component: "Registry", Component: "Registry",
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: "registry.k8s.io", Value: "registry.k8s.io",
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
Value: "registry.k8s.io/perl:5.34.0", Value: "registry.k8s.io/perl:5.34.0",
}, },
@ -281,13 +281,13 @@ func TestParseJSONPatchesByImageOverrider(t *testing.T) {
rawObj: generateDeploymentYaml(), rawObj: generateDeploymentYaml(),
imageOverrider: &policyv1alpha1.ImageOverrider{ imageOverrider: &policyv1alpha1.ImageOverrider{
Component: "Registry", Component: "Registry",
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: ".test", Value: ".test",
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
Value: "fictional.registry.example.test/imagename:v1.0.0", Value: "fictional.registry.example.test/imagename:v1.0.0",
}, },
@ -300,13 +300,13 @@ func TestParseJSONPatchesByImageOverrider(t *testing.T) {
rawObj: generateDeploymentYaml(), rawObj: generateDeploymentYaml(),
imageOverrider: &policyv1alpha1.ImageOverrider{ imageOverrider: &policyv1alpha1.ImageOverrider{
Component: "Registry", Component: "Registry",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "fictional.registry.us", Value: "fictional.registry.us",
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
Value: "fictional.registry.us/imagename:v1.0.0", Value: "fictional.registry.us/imagename:v1.0.0",
}, },
@ -319,13 +319,13 @@ func TestParseJSONPatchesByImageOverrider(t *testing.T) {
rawObj: generateDeploymentYaml(), rawObj: generateDeploymentYaml(),
imageOverrider: &policyv1alpha1.ImageOverrider{ imageOverrider: &policyv1alpha1.ImageOverrider{
Component: "Registry", Component: "Registry",
Operator: "remove", Operator: policyv1alpha1.OverriderOpRemove,
Value: "fictional.registry.us", Value: "fictional.registry.us",
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
Value: "imagename:v1.0.0", Value: "imagename:v1.0.0",
}, },
@ -338,13 +338,13 @@ func TestParseJSONPatchesByImageOverrider(t *testing.T) {
rawObj: generateDeploymentYaml(), rawObj: generateDeploymentYaml(),
imageOverrider: &policyv1alpha1.ImageOverrider{ imageOverrider: &policyv1alpha1.ImageOverrider{
Component: "Repository", Component: "Repository",
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: "/nginx", Value: "/nginx",
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
Value: "fictional.registry.example/imagename/nginx:v1.0.0", Value: "fictional.registry.example/imagename/nginx:v1.0.0",
}, },
@ -357,13 +357,13 @@ func TestParseJSONPatchesByImageOverrider(t *testing.T) {
rawObj: generateDeploymentYaml(), rawObj: generateDeploymentYaml(),
imageOverrider: &policyv1alpha1.ImageOverrider{ imageOverrider: &policyv1alpha1.ImageOverrider{
Component: "Repository", Component: "Repository",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "nginx", Value: "nginx",
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
Value: "fictional.registry.example/nginx:v1.0.0", Value: "fictional.registry.example/nginx:v1.0.0",
}, },
@ -376,13 +376,13 @@ func TestParseJSONPatchesByImageOverrider(t *testing.T) {
rawObj: generateDeploymentYaml(), rawObj: generateDeploymentYaml(),
imageOverrider: &policyv1alpha1.ImageOverrider{ imageOverrider: &policyv1alpha1.ImageOverrider{
Component: "Repository", Component: "Repository",
Operator: "remove", Operator: policyv1alpha1.OverriderOpRemove,
Value: "nginx", Value: "nginx",
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
Value: "fictional.registry.example/:v1.0.0", Value: "fictional.registry.example/:v1.0.0",
}, },
@ -395,13 +395,13 @@ func TestParseJSONPatchesByImageOverrider(t *testing.T) {
rawObj: generateDeploymentYaml(), rawObj: generateDeploymentYaml(),
imageOverrider: &policyv1alpha1.ImageOverrider{ imageOverrider: &policyv1alpha1.ImageOverrider{
Component: "Tag", Component: "Tag",
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: "sha256:dbcc1c35ac38df41fd2f5e4130b32ffdb93ebae8b3dbe638c23575912276fc9c", Value: "sha256:dbcc1c35ac38df41fd2f5e4130b32ffdb93ebae8b3dbe638c23575912276fc9c",
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
Value: "fictional.registry.example/imagename:v1.0.0", // only one of tag and digest is valid. Value: "fictional.registry.example/imagename:v1.0.0", // only one of tag and digest is valid.
}, },
@ -414,13 +414,13 @@ func TestParseJSONPatchesByImageOverrider(t *testing.T) {
rawObj: generateDeploymentYaml(), rawObj: generateDeploymentYaml(),
imageOverrider: &policyv1alpha1.ImageOverrider{ imageOverrider: &policyv1alpha1.ImageOverrider{
Component: "Tag", Component: "Tag",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "sha256:dbcc1c35ac38df41fd2f5e4130b32ffdb93ebae8b3dbe638c23575912276fc9c", Value: "sha256:dbcc1c35ac38df41fd2f5e4130b32ffdb93ebae8b3dbe638c23575912276fc9c",
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
Value: "fictional.registry.example/imagename@sha256:dbcc1c35ac38df41fd2f5e4130b32ffdb93ebae8b3dbe638c23575912276fc9c", Value: "fictional.registry.example/imagename@sha256:dbcc1c35ac38df41fd2f5e4130b32ffdb93ebae8b3dbe638c23575912276fc9c",
}, },
@ -433,13 +433,13 @@ func TestParseJSONPatchesByImageOverrider(t *testing.T) {
rawObj: generateDeploymentYaml(), rawObj: generateDeploymentYaml(),
imageOverrider: &policyv1alpha1.ImageOverrider{ imageOverrider: &policyv1alpha1.ImageOverrider{
Component: "Tag", Component: "Tag",
Operator: "remove", Operator: policyv1alpha1.OverriderOpRemove,
Value: "sha256:dbcc1c35ac38df41fd2f5e4130b32ffdb93ebae8b3dbe638c23575912276fc9c", Value: "sha256:dbcc1c35ac38df41fd2f5e4130b32ffdb93ebae8b3dbe638c23575912276fc9c",
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
Value: "fictional.registry.example/imagename", Value: "fictional.registry.example/imagename",
}, },
@ -452,13 +452,13 @@ func TestParseJSONPatchesByImageOverrider(t *testing.T) {
rawObj: generatePodYaml(), rawObj: generatePodYaml(),
imageOverrider: &policyv1alpha1.ImageOverrider{ imageOverrider: &policyv1alpha1.ImageOverrider{
Component: "Repository", Component: "Repository",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "nginx", Value: "nginx",
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/containers/0/image", Path: "/spec/containers/0/image",
Value: "fictional.registry.example/nginx:v1.0.0", Value: "fictional.registry.example/nginx:v1.0.0",
}, },
@ -471,13 +471,13 @@ func TestParseJSONPatchesByImageOverrider(t *testing.T) {
rawObj: generateStatefulSetYaml(), rawObj: generateStatefulSetYaml(),
imageOverrider: &policyv1alpha1.ImageOverrider{ imageOverrider: &policyv1alpha1.ImageOverrider{
Component: "Repository", Component: "Repository",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "nginx", Value: "nginx",
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
Value: "fictional.registry.example/nginx:v1.0.0", Value: "fictional.registry.example/nginx:v1.0.0",
}, },
@ -490,13 +490,13 @@ func TestParseJSONPatchesByImageOverrider(t *testing.T) {
rawObj: generateReplicaSetYaml(), rawObj: generateReplicaSetYaml(),
imageOverrider: &policyv1alpha1.ImageOverrider{ imageOverrider: &policyv1alpha1.ImageOverrider{
Component: "Repository", Component: "Repository",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "nginx", Value: "nginx",
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
Value: "fictional.registry.example/nginx:v1.0.0", Value: "fictional.registry.example/nginx:v1.0.0",
}, },
@ -509,13 +509,13 @@ func TestParseJSONPatchesByImageOverrider(t *testing.T) {
rawObj: generateDaemonSetYaml(), rawObj: generateDaemonSetYaml(),
imageOverrider: &policyv1alpha1.ImageOverrider{ imageOverrider: &policyv1alpha1.ImageOverrider{
Component: "Repository", Component: "Repository",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "nginx", Value: "nginx",
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
Value: "fictional.registry.example/nginx:v1.0.0", Value: "fictional.registry.example/nginx:v1.0.0",
}, },
@ -528,18 +528,18 @@ func TestParseJSONPatchesByImageOverrider(t *testing.T) {
rawObj: generateDeploymentYamlWithTwoContainer(), rawObj: generateDeploymentYamlWithTwoContainer(),
imageOverrider: &policyv1alpha1.ImageOverrider{ imageOverrider: &policyv1alpha1.ImageOverrider{
Component: "Repository", Component: "Repository",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "nginx", Value: "nginx",
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
Value: "fictional.registry.example/nginx:v1.0.0", Value: "fictional.registry.example/nginx:v1.0.0",
}, },
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/1/image", Path: "/spec/template/spec/containers/1/image",
Value: "registry.k8s.io/nginx:0.8", Value: "registry.k8s.io/nginx:0.8",
}, },
@ -555,13 +555,13 @@ func TestParseJSONPatchesByImageOverrider(t *testing.T) {
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
}, },
Component: "Repository", Component: "Repository",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "nginx", Value: "nginx",
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
Value: "fictional.registry.example/nginx:v1.0.0", Value: "fictional.registry.example/nginx:v1.0.0",
}, },
@ -577,13 +577,13 @@ func TestParseJSONPatchesByImageOverrider(t *testing.T) {
Path: "/spec/template/spec/containers/1/image", Path: "/spec/template/spec/containers/1/image",
}, },
Component: "Repository", Component: "Repository",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "nginx", Value: "nginx",
}, },
}, },
want: []overrideOption{ want: []overrideOption{
{ {
Op: "replace", Op: string(policyv1alpha1.OverriderOpReplace),
Path: "/spec/template/spec/containers/1/image", Path: "/spec/template/spec/containers/1/image",
Value: "registry.k8s.io/nginx:0.8", Value: "registry.k8s.io/nginx:0.8",
}, },

6
pkg/util/overridemanager/overridemanager_test.go
View File

@ -258,7 +258,7 @@ func TestGetMatchingOverridePolicies(t *testing.T) {
Plaintext: []policyv1alpha1.PlaintextOverrider{ Plaintext: []policyv1alpha1.PlaintextOverrider{
{ {
Path: "/metadata/annotations", Path: "/metadata/annotations",
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: apiextensionsv1.JSON{Raw: []byte(`"foo: bar"`)}, Value: apiextensionsv1.JSON{Raw: []byte(`"foo: bar"`)},
}, },
}, },
@ -267,7 +267,7 @@ func TestGetMatchingOverridePolicies(t *testing.T) {
Plaintext: []policyv1alpha1.PlaintextOverrider{ Plaintext: []policyv1alpha1.PlaintextOverrider{
{ {
Path: "/metadata/annotations", Path: "/metadata/annotations",
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: apiextensionsv1.JSON{Raw: []byte(`"aaa: bbb"`)}, Value: apiextensionsv1.JSON{Raw: []byte(`"aaa: bbb"`)},
}, },
}, },
@ -276,7 +276,7 @@ func TestGetMatchingOverridePolicies(t *testing.T) {
Plaintext: []policyv1alpha1.PlaintextOverrider{ Plaintext: []policyv1alpha1.PlaintextOverrider{
{ {
Path: "/metadata/annotations", Path: "/metadata/annotations",
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: apiextensionsv1.JSON{Raw: []byte(`"hello: world"`)}, Value: apiextensionsv1.JSON{Raw: []byte(`"hello: world"`)},
}, },
}, },

8
pkg/util/validation/validation_test.go
View File

@ -133,7 +133,7 @@ func TestValidateOverrideSpec(t *testing.T) {
Overriders: policyv1alpha1.Overriders{ Overriders: policyv1alpha1.Overriders{
AnnotationsOverrider: []policyv1alpha1.LabelAnnotationOverrider{ AnnotationsOverrider: []policyv1alpha1.LabelAnnotationOverrider{
{ {
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: map[string]string{"testannotation~projectId": "c-m-lfx9lk92p-v86cf"}, Value: map[string]string{"testannotation~projectId": "c-m-lfx9lk92p-v86cf"},
}, },
}, },
@ -154,7 +154,7 @@ func TestValidateOverrideSpec(t *testing.T) {
Overriders: policyv1alpha1.Overriders{ Overriders: policyv1alpha1.Overriders{
LabelsOverrider: []policyv1alpha1.LabelAnnotationOverrider{ LabelsOverrider: []policyv1alpha1.LabelAnnotationOverrider{
{ {
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: map[string]string{"testannotation~projectId": "c-m-lfx9lk92p-v86cf"}, Value: map[string]string{"testannotation~projectId": "c-m-lfx9lk92p-v86cf"},
}, },
}, },
@ -277,14 +277,14 @@ func TestEmptyOverrides(t *testing.T) {
ImageOverrider: []policyv1alpha1.ImageOverrider{ ImageOverrider: []policyv1alpha1.ImageOverrider{
{ {
Component: "Registry", Component: "Registry",
Operator: "remove", Operator: policyv1alpha1.OverriderOpRemove,
Value: "fictional.registry.us", Value: "fictional.registry.us",
}, },
}, },
CommandOverrider: []policyv1alpha1.CommandArgsOverrider{ CommandOverrider: []policyv1alpha1.CommandArgsOverrider{
{ {
ContainerName: "nginx", ContainerName: "nginx",
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: []string{"echo 'hello karmada'"}, Value: []string{"echo 'hello karmada'"},
}, },
}, },

2
test/e2e/clusteroverridepolicy_test.go
View File

@ -154,7 +154,7 @@ var _ = framework.SerialDescribe("The ClusterOverridePolicy with nil resourceSel
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
}, },
Component: "Registry", Component: "Registry",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "fictional.registry.us", Value: "fictional.registry.us",
}, },
}, },

8
test/e2e/failover_test.go
View File

@ -354,7 +354,7 @@ var _ = framework.SerialDescribe("failover testing", func() {
ImageOverrider: []policyv1alpha1.ImageOverrider{ ImageOverrider: []policyv1alpha1.ImageOverrider{
{ {
Component: "Registry", Component: "Registry",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "fake", Value: "fake",
}, },
}, },
@ -405,7 +405,7 @@ var _ = framework.SerialDescribe("failover testing", func() {
// modify gracePeriodSeconds to create a time difference with tolerationSecond to avoid cluster interference // modify gracePeriodSeconds to create a time difference with tolerationSecond to avoid cluster interference
patch := []map[string]interface{}{ patch := []map[string]interface{}{
{ {
"op": "replace", "op": policyv1alpha1.OverriderOpReplace,
"path": "/spec/failover/application/gracePeriodSeconds", "path": "/spec/failover/application/gracePeriodSeconds",
"value": ptr.To[int32](gracePeriodSeconds), "value": ptr.To[int32](gracePeriodSeconds),
}, },
@ -432,7 +432,7 @@ var _ = framework.SerialDescribe("failover testing", func() {
ImageOverrider: []policyv1alpha1.ImageOverrider{ ImageOverrider: []policyv1alpha1.ImageOverrider{
{ {
Component: "Registry", Component: "Registry",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "fake", Value: "fake",
}, },
}, },
@ -545,7 +545,7 @@ var _ = framework.SerialDescribe("failover testing", func() {
ImageOverrider: []policyv1alpha1.ImageOverrider{ ImageOverrider: []policyv1alpha1.ImageOverrider{
{ {
Component: "Registry", Component: "Registry",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "fake", Value: "fake",
}, },
}, },

44
test/e2e/overridepolicy_test.go
View File

@ -74,20 +74,20 @@ var _ = ginkgo.Describe("[OverridePolicy] apply overriders testing", func() {
}, policyv1alpha1.Overriders{ }, policyv1alpha1.Overriders{
LabelsOverrider: []policyv1alpha1.LabelAnnotationOverrider{ LabelsOverrider: []policyv1alpha1.LabelAnnotationOverrider{
{ {
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: map[string]string{ Value: map[string]string{
"foo": "exist", "foo": "exist",
"non-exist": "non-exist", "non-exist": "non-exist",
}, },
}, },
{ {
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: map[string]string{ Value: map[string]string{
"app": "nginx", "app": "nginx",
}, },
}, },
{ {
Operator: "remove", Operator: policyv1alpha1.OverriderOpRemove,
Value: map[string]string{ Value: map[string]string{
"bar": "bar", "bar": "bar",
}, },
@ -159,20 +159,20 @@ var _ = ginkgo.Describe("[OverridePolicy] apply overriders testing", func() {
}, policyv1alpha1.Overriders{ }, policyv1alpha1.Overriders{
AnnotationsOverrider: []policyv1alpha1.LabelAnnotationOverrider{ AnnotationsOverrider: []policyv1alpha1.LabelAnnotationOverrider{
{ {
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: map[string]string{ Value: map[string]string{
"foo": "exist", "foo": "exist",
"non-exist": "non-exist", "non-exist": "non-exist",
}, },
}, },
{ {
Operator: "add", Operator: policyv1alpha1.OverriderOpAdd,
Value: map[string]string{ Value: map[string]string{
"app": "nginx", "app": "nginx",
}, },
}, },
{ {
Operator: "remove", Operator: policyv1alpha1.OverriderOpRemove,
Value: map[string]string{ Value: map[string]string{
"bar": "bar", "bar": "bar",
}, },
@ -241,17 +241,17 @@ var _ = ginkgo.Describe("[OverridePolicy] apply overriders testing", func() {
ImageOverrider: []policyv1alpha1.ImageOverrider{ ImageOverrider: []policyv1alpha1.ImageOverrider{
{ {
Component: "Registry", Component: "Registry",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "fictional.registry.us", Value: "fictional.registry.us",
}, },
{ {
Component: "Repository", Component: "Repository",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "busybox", Value: "busybox",
}, },
{ {
Component: "Tag", Component: "Tag",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "1.0", Value: "1.0",
}, },
}, },
@ -319,17 +319,17 @@ var _ = ginkgo.Describe("[OverridePolicy] apply overriders testing", func() {
ImageOverrider: []policyv1alpha1.ImageOverrider{ ImageOverrider: []policyv1alpha1.ImageOverrider{
{ {
Component: "Registry", Component: "Registry",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "fictional.registry.us", Value: "fictional.registry.us",
}, },
{ {
Component: "Repository", Component: "Repository",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "busybox", Value: "busybox",
}, },
{ {
Component: "Tag", Component: "Tag",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "1.0", Value: "1.0",
}, },
}, },
@ -399,7 +399,7 @@ var _ = ginkgo.Describe("[OverridePolicy] apply overriders testing", func() {
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
}, },
Component: "Registry", Component: "Registry",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "fictional.registry.us", Value: "fictional.registry.us",
}, },
}, },
@ -464,7 +464,7 @@ var _ = framework.SerialDescribe("OverridePolicy with nil resourceSelector testi
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
}, },
Component: "Registry", Component: "Registry",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "fictional.registry.us", Value: "fictional.registry.us",
}, },
}, },
@ -538,17 +538,17 @@ var _ = ginkgo.Describe("[OverrideRules] apply overriders testing", func() {
ImageOverrider: []policyv1alpha1.ImageOverrider{ ImageOverrider: []policyv1alpha1.ImageOverrider{
{ {
Component: "Registry", Component: "Registry",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "fictional.registry.us", Value: "fictional.registry.us",
}, },
{ {
Component: "Repository", Component: "Repository",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "busybox", Value: "busybox",
}, },
{ {
Component: "Tag", Component: "Tag",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "1.0", Value: "1.0",
}, },
}, },
@ -621,17 +621,17 @@ var _ = ginkgo.Describe("[OverrideRules] apply overriders testing", func() {
ImageOverrider: []policyv1alpha1.ImageOverrider{ ImageOverrider: []policyv1alpha1.ImageOverrider{
{ {
Component: "Registry", Component: "Registry",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "fictional.registry.us", Value: "fictional.registry.us",
}, },
{ {
Component: "Repository", Component: "Repository",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "busybox", Value: "busybox",
}, },
{ {
Component: "Tag", Component: "Tag",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "1.0", Value: "1.0",
}, },
}, },
@ -706,7 +706,7 @@ var _ = ginkgo.Describe("[OverrideRules] apply overriders testing", func() {
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
}, },
Component: "Registry", Component: "Registry",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "fictional.registry.us", Value: "fictional.registry.us",
}, },
}, },
@ -777,7 +777,7 @@ var _ = framework.SerialDescribe("OverrideRules with nil resourceSelector testin
Path: "/spec/template/spec/containers/0/image", Path: "/spec/template/spec/containers/0/image",
}, },
Component: "Registry", Component: "Registry",
Operator: "replace", Operator: policyv1alpha1.OverriderOpReplace,
Value: "fictional.registry.us", Value: "fictional.registry.us",
}, },
}, },