Skip to content

fix: handle deployments without command in patcher #7706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Elvand-Lie wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: handle deployments without command in patcher #7706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions operator/pkg/util/patcher/pather.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,26 +150,28 @@ func (p *Patcher) ForDeployment(deployment *appsv1.Deployment) {
if len(p.extraArgs) != 0 || len(p.featureGates) != 0 {
// It's considered the first container is the karmada component by default.
baseArguments := deployment.Spec.Template.Spec.Containers[0].Command
argsMap := parseArgumentListToMap(baseArguments)
if len(baseArguments) != 0 {
argsMap := parseArgumentListToMap(baseArguments)

overrideArgs := map[string]string{}
overrideArgs := map[string]string{}

// merge featureGates and build to an argument.
if len(p.featureGates) != 0 {
baseFeatureGates := map[string]bool{}
// merge featureGates and build to an argument.
if len(p.featureGates) != 0 {
baseFeatureGates := map[string]bool{}

if argument, ok := argsMap["feature-gates"]; ok {
baseFeatureGates = parseFeatrueGatesArgumentToMap(argument)
if argument, ok := argsMap["feature-gates"]; ok {
baseFeatureGates = parseFeatrueGatesArgumentToMap(argument)
}
overrideArgs["feature-gates"] = buildFeatureGatesArgumentFromMap(baseFeatureGates, p.featureGates)
}
overrideArgs["feature-gates"] = buildFeatureGatesArgumentFromMap(baseFeatureGates, p.featureGates)
}

maps.Copy(overrideArgs, p.extraArgs)
maps.Copy(overrideArgs, p.extraArgs)

// the first argument is most often the binary name
command := []string{baseArguments[0]}
command = append(command, buildArgumentListFromMap(argsMap, overrideArgs)...)
deployment.Spec.Template.Spec.Containers[0].Command = command
// the first argument is most often the binary name
command := []string{baseArguments[0]}
command = append(command, buildArgumentListFromMap(argsMap, overrideArgs)...)
deployment.Spec.Template.Spec.Containers[0].Command = command
}
}
deployment.Spec.Template.Spec.Containers = append(deployment.Spec.Template.Spec.Containers, p.sidecarContainers...)
// Add extra volumes and volume mounts
Expand Down
52 changes: 52 additions & 0 deletions operator/pkg/util/patcher/pather_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,58 @@ func TestPatchForDeployment(t *testing.T) {
},
},
},
{
name: "PatchForDeployment_WithExtraArgsAndEmptyCommand_Patched",
patcher: &Patcher{
extraArgs: map[string]string{
"some-arg": "some-value",
},
},
deployment: &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{
Name: "test-deployment",
Namespace: "test",
},
Spec: appsv1.DeploymentSpec{
Template: corev1.PodTemplateSpec{
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Name: "test-container",
Image: "nginx:latest",
Args: []string{"run", "--existing=1"},
},
Comment on lines +198 to +203
},
},
},
},
},
want: &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{
Name: "test-deployment",
Namespace: "test",
Labels: map[string]string{},
Annotations: map[string]string{},
},
Spec: appsv1.DeploymentSpec{
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{},
Annotations: map[string]string{},
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Name: "test-container",
Image: "nginx:latest",
Args: []string{"run", "--existing=1"},
},
},
},
},
},
},
},
{
name: "PatchForDeployment_WithExtraVolumesAndVolumeMounts_Patched",
patcher: &Patcher{
Expand Down