Skip to content

OCPBUGS-2592: Fix Deployment hotloops after incorrect SeccompProfile comparison #855

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

Merged
openshift-merge-robot merged 3 commits into from
Oct 27, 2022
Merged

OCPBUGS-2592: Fix Deployment hotloops after incorrect SeccompProfile comparison #855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6065c60
resourceapply: improve diff logging for deployments
petr-muller Oct 19, 2022
934b81d
resourcemerge: fix `SeccompProfile` comparison
petr-muller Oct 19, 2022
60ea731
resourcemerge: treat empty `PodSecurityContext` as nil
petr-muller Oct 20, 2022
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
8 changes: 7 additions & 1 deletion lib/resourceapply/apps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,19 @@ func ApplyDeploymentv1(ctx context.Context, client appsclientv1.DeploymentsGette
return nil, false, nil
}

var original appsv1.Deployment
existing.DeepCopyInto(&original)
modified := pointer.BoolPtr(false)
resourcemerge.EnsureDeployment(modified, existing, *required)
if !*modified {
return existing, false, nil
}
if reconciling {
klog.V(2).Infof("Updating Deployment %s/%s due to diff: %v", required.Namespace, required.Name, cmp.Diff(existing, required))
if diff := cmp.Diff(&original, existing); diff != "" {
klog.V(2).Infof("Updating Deployment %s/%s due to diff: %v", required.Namespace, required.Name, diff)
} else {
klog.V(2).Infof("Updating Deployment %s/%s with empty diff: possible hotloop after wrong comparison", required.Namespace, required.Name)
}
}

actual, err := client.Deployments(required.Namespace).Update(ctx, existing, metav1.UpdateOptions{})
Expand Down
6 changes: 3 additions & 3 deletions lib/resourcemerge/core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ func ensureSeccompProfilePtr(modified *bool, existing **corev1.SeccompProfile, r
}

func ensureSeccompProfile(modified *bool, existing *corev1.SeccompProfile, required corev1.SeccompProfile) {
if equality.Semantic.DeepEqual(existing, required) {
if equality.Semantic.DeepEqual(*existing, required) {
return
}

Expand Down Expand Up @@ -646,13 +646,13 @@ func ensureAffinity(modified *bool, existing *corev1.Affinity, required corev1.A
}

func ensurePodSecurityContextPtr(modified *bool, existing **corev1.PodSecurityContext, required *corev1.PodSecurityContext) {
if *existing == nil && required == nil {
if (*existing == nil || equality.Semantic.DeepEqual(*existing, &corev1.PodSecurityContext{})) && required == nil {
return
}

// Check if we can simply set to required. This can be done if existing is not set or it is set
// but required is not set.
if *existing == nil || (required == nil && *existing != nil) {
if *existing == nil || required == nil {
*modified = true
*existing = required
return
Expand Down
31 changes: 31 additions & 0 deletions lib/resourcemerge/core_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,37 @@ func TestEnsurePodSpec(t *testing.T) {
expected: corev1.PodSpec{
SecurityContext: &corev1.PodSecurityContext{}},
},
{
name: "Existing PodSecurityContext empty, desired nil => do not modify",
existing: corev1.PodSpec{
SecurityContext: &corev1.PodSecurityContext{}},
input: corev1.PodSpec{SecurityContext: nil},
expectedModified: false,
expected: corev1.PodSpec{
SecurityContext: &corev1.PodSecurityContext{}},
},
{
name: "PodSecurityContext no changes",
existing: corev1.PodSpec{
SecurityContext: &corev1.PodSecurityContext{RunAsNonRoot: boolPtr(true),
RunAsUser: int64Ptr(int64(1234)),
RunAsGroup: int64Ptr(int64(4321)),
SeccompProfile: &corev1.SeccompProfile{Type: corev1.SeccompProfileTypeRuntimeDefault}},
},
input: corev1.PodSpec{
SecurityContext: &corev1.PodSecurityContext{RunAsNonRoot: boolPtr(true),
RunAsUser: int64Ptr(int64(1234)),
RunAsGroup: int64Ptr(int64(4321)),
SeccompProfile: &corev1.SeccompProfile{Type: corev1.SeccompProfileTypeRuntimeDefault}},
},
expectedModified: false,
expected: corev1.PodSpec{
SecurityContext: &corev1.PodSecurityContext{RunAsNonRoot: boolPtr(true),
RunAsUser: int64Ptr(int64(1234)),
RunAsGroup: int64Ptr(int64(4321)),
SeccompProfile: &corev1.SeccompProfile{Type: corev1.SeccompProfileTypeRuntimeDefault}},
},
},
{
name: "PodSecurityContext changes",
existing: corev1.PodSpec{
Expand Down