Merge pull request #33120 from nikhiljindal/ingressPanic

Automatic merge from submit-queue federation ingress controller: Fixing a panic by initialising the map before using it Ref https://github.com/kubernetes/kubernetes/issues/32733#issuecomment-248428635 cc @kubernetes/sig-cluster-federation @quinton-hoole

Merge pull request #33120 from nikhiljindal/ingressPanic
fca40dca · Kubernetes Submit Queue · GitHub · 31379c10 · 127c6b2f · fca40dca
Commit fca40dca authored Sep 20, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 20, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

ingress_controller.go ...n/pkg/federation-controller/ingress/ingress_controller.go +6 -0

No files found.
--- a/federation/pkg/federation-controller/ingress/ingress_controller.go
+++ b/federation/pkg/federation-controller/ingress/ingress_controller.go
@@ -548,6 +548,9 @@ func (ic *IngressController) updateClusterIngressUIDToMasters(cluster *federatio
 	}
 	if err == nil {
 		if masterCluster.Name != cluster.Name { // We're not the master, need to get in sync
+			if cluster.ObjectMeta.Annotations == nil {
+				cluster.ObjectMeta.Annotations = map[string]string{}
+			}
 			cluster.ObjectMeta.Annotations[uidAnnotationKey] = masterUID
 			if _, err = ic.federatedApiClient.Federation().Clusters().Update(cluster); err != nil {
 				glog.Errorf("Failed to add master ingress UID annotation (%q = %q) from master cluster %q to cluster %q, will try again later: %v", uidAnnotationKey, masterUID, masterCluster.Name, cluster.Name, err)
@@ -561,6 +564,9 @@ func (ic *IngressController) updateClusterIngressUIDToMasters(cluster *federatio
 	} else {
 		glog.V(2).Infof("No master cluster found to source an ingress UID from for cluster %q.  Attempting to elect new master cluster %q with ingress UID %q = %q", cluster.Name, cluster.Name, uidAnnotationKey, fallbackUID)
 		if fallbackUID != "" {
+			if cluster.ObjectMeta.Annotations == nil {
+				cluster.ObjectMeta.Annotations = map[string]string{}
+			}
 			cluster.ObjectMeta.Annotations[uidAnnotationKey] = fallbackUID
 			if _, err = ic.federatedApiClient.Federation().Clusters().Update(cluster); err != nil {
 				glog.Errorf("Failed to add ingress UID annotation (%q = %q) to cluster %q. No master elected. Will try again later: %v", uidAnnotationKey, fallbackUID, cluster.Name, err)