Skip to content

Commit eb58703

Browse files
[release-1.17] Compare the entire PodTemplateSpec, instead of just its PodSpec (#8560)
Compare the entire PodTemplateSpec, instead of just its PodSpec Signed-off-by: Matthias Wessendorf <[email protected]> Co-authored-by: Matthias Wessendorf <[email protected]>
1 parent d01256f commit eb58703

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

pkg/reconciler/containersource/containersource.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ func (r *Reconciler) reconcileReceiveAdapter(ctx context.Context, source *v1.Con
109109
return nil, fmt.Errorf("getting Deployment: %v", err)
110110
} else if !metav1.IsControlledBy(ra, source) {
111111
return nil, fmt.Errorf("deployment %q is not owned by ContainerSource %q", ra.Name, source.Name)
112-
} else if r.podSpecChanged(&ra.Spec.Template.Spec, &expected.Spec.Template.Spec) {
113-
ra.Spec.Template.Spec = expected.Spec.Template.Spec
112+
} else if r.podTemplateChanged(&ra.Spec.Template, &expected.Spec.Template) {
113+
ra.Spec.Template = expected.Spec.Template
114114
ra, err = r.kubeClientSet.AppsV1().Deployments(expected.Namespace).Update(ctx, ra, metav1.UpdateOptions{})
115115
if err != nil {
116116
return nil, fmt.Errorf("updating Deployment: %v", err)
@@ -159,6 +159,10 @@ func (r *Reconciler) podSpecChanged(have *corev1.PodSpec, want *corev1.PodSpec)
159159
return !equality.Semantic.DeepDerivative(want, have)
160160
}
161161

162+
func (r *Reconciler) podTemplateChanged(have *corev1.PodTemplateSpec, want *corev1.PodTemplateSpec) bool {
163+
return !equality.Semantic.DeepDerivative(want, have)
164+
}
165+
162166
func (r *Reconciler) sinkBindingSpecChanged(have *v1.SinkBindingSpec, want *v1.SinkBindingSpec) bool {
163167
return !equality.Semantic.DeepDerivative(want, have)
164168
}

0 commit comments

Comments
 (0)