Resolve knative service diff to prevent dup revision (kubeflow#1484)

magdalenakuhn17 · Mar 20, 2021 · fc82f52 · fc82f52
1 parent d5f62f1
commit fc82f52
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/pkg/apis/serving/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/serving/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/controller/v1beta1/inferenceservice/reconcilers/knative/ksvc_reconciler.go b/pkg/controller/v1beta1/inferenceservice/reconcilers/knative/ksvc_reconciler.go
@@ -168,6 +168,13 @@ func (r *KsvcReconciler) Reconcile() (*knservingv1.ServiceStatus, error) {
 	}
 
 	// Reconcile differences and update
+	// knative mutator defaults the enableServiceLinks to false which would generate a diff despite no changes on desired knative service
+	// https://github.com/knative/serving/blob/main/pkg/apis/serving/v1/revision_defaults.go#L134
+	if desired.Spec.ConfigurationSpec.Template.Spec.EnableServiceLinks == nil &&
+		existing.Spec.ConfigurationSpec.Template.Spec.EnableServiceLinks != nil &&
+		*existing.Spec.ConfigurationSpec.Template.Spec.EnableServiceLinks == false {
+		desired.Spec.ConfigurationSpec.Template.Spec.EnableServiceLinks = proto.Bool(false)
+	}
 	diff, err := kmp.SafeDiff(desired.Spec.ConfigurationSpec, existing.Spec.ConfigurationSpec)
 	if err != nil {
 		return &existing.Status, errors.Wrapf(err, "failed to diff knative service configuration spec")