Skip to content

Fix nil pointer dereference in PatchDeployment #3899

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
sebrandon1 wants to merge 1 commit into
base: master
Choose a base branch
from
+458 −3
Open

Fix nil pointer dereference in PatchDeployment #3899

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
6 changes: 3 additions & 3 deletions pkg/lib/operatorclient/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,16 @@ func (c *Client) UpdateDeployment(dep *appsv1.Deployment) (*appsv1.Deployment, b
//
// Returns the latest Deployment and true if it was updated, or an error.
func (c *Client) PatchDeployment(original, modified *appsv1.Deployment) (*appsv1.Deployment, bool, error) {
if modified == nil {
return nil, false, errors.New("modified cannot be nil")
}
namespace, name := modified.Namespace, modified.Name
klog.V(4).Infof("[PATCH Deployment]: %s:%s", namespace, name)

current, err := c.AppsV1().Deployments(namespace).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil {
return nil, false, err
}
if modified == nil {
return nil, false, errors.New("modified cannot be nil")
}
if original == nil {
original = current // Emulate 2-way merge.
}
Expand Down
Loading