Merge pull request kubernetes-sigs#3010 from vincepri/bug-alpha2-annotatione

🐛 [0.2] Exclude conversion-data annotation when MD reconciles

Author: k8s-ci-robot

controllers/mdutil/util.go

@@ -34,6 +34,7 @@ import (
 	"k8s.io/klog"
 	"k8s.io/utils/integer"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha2"
+	"sigs.k8s.io/cluster-api/util/conversion"
 )
 
 const (
@@ -156,6 +157,13 @@ var annotationsToSkip = map[string]bool{
 	RevisionHistoryAnnotation:      true,
 	DesiredReplicasAnnotation:      true,
 	MaxReplicasAnnotation:          true,
+
+	// Exclude the conversion annotation, to avoid infinite loops between the conversion webhook
+	// and the MachineDeployment controller syncing the annotations between a MachineDeployment
+	// and its linked MachineSets.
+	//
+	// See https://github.com/kubernetes-sigs/cluster-api/pull/3010#issue-413767831 for more details.
+	conversion.DataAnnotation: true,
 }
 
 // skipCopyAnnotation returns true if we should skip copying the annotation with the given annotation key

util/conversion/conversion.go

@@ -0,0 +1,21 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package conversion
+
+const (
+	DataAnnotation = "cluster.x-k8s.io/conversion-data"
+)