From 8de89d9f74a82fb342be52675887f133bbd2680d Mon Sep 17 00:00:00 2001
From: Ayush Pateria <cs15btech11007@iith.ac.in>
Date: Tue, 6 Feb 2018 01:12:50 +0530
Subject: [PATCH] Fix StatefulSet set selector bug

---
 pkg/controller/history/controller_history.go | 36 +++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/pkg/controller/history/controller_history.go b/pkg/controller/history/controller_history.go
index bf88063ef91..ec6107aac9c 100644
--- a/pkg/controller/history/controller_history.go
+++ b/pkg/controller/history/controller_history.go
@@ -18,6 +18,7 @@ package history
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"hash/fnv"
 	"sort"
@@ -56,7 +57,7 @@ func ControllerRevisionName(prefix string, hash uint32) string {
 }
 
 // NewControllerRevision returns a ControllerRevision with a ControllerRef pointing to parent and indicating that
-// parent is of parentKind. The ControllerRevision has labels matching selector, contains Data equal to data, and
+// parent is of parentKind. The ControllerRevision has labels matching pod, contains Data equal to data, and
 // has a Revision equal to revision. The collisionCount is used when creating the name of the ControllerRevision
 // so the name is likely unique. If the returned error is nil, the returned ControllerRevision is valid. If the
 // returned error is not nil, the returned ControllerRevision is invalid for use.
@@ -66,10 +67,7 @@ func NewControllerRevision(parent metav1.Object,
 	data runtime.RawExtension,
 	revision int64,
 	collisionCount *int32) (*apps.ControllerRevision, error) {
-	labelMap, err := labels.ConvertSelectorToLabelsMap(selector.String())
-	if err != nil {
-		return nil, err
-	}
+	labelMap := getPodLabelsFromData(data)
 	blockOwnerDeletion := true
 	isController := true
 	cr := &apps.ControllerRevision{
@@ -454,3 +452,31 @@ func (fh *fakeHistory) ReleaseControllerRevision(parent metav1.Object, revision
 	}
 	return clone, fh.indexer.Update(clone)
 }
+
+func getPodLabelsFromData(data runtime.RawExtension) map[string]string {
+	var dat map[string]interface{}
+	labelMap := make(map[string]string)
+	if err := json.Unmarshal(data.Raw, &dat); err != nil {
+		return labelMap
+	}
+	spec, ok := dat["spec"].(map[string]interface{})
+	if !ok {
+		return labelMap
+	}
+	template, ok := spec["template"].(map[string]interface{})
+	if !ok {
+		return labelMap
+	}
+	metadata, ok := template["metadata"].(map[string]interface{})
+	if !ok {
+		return labelMap
+	}
+	labels, ok := metadata["labels"].(map[string]interface{})
+	if !ok {
+		return labelMap
+	}
+	for key, value := range labels {
+		labelMap[key] = value.(string)
+	}
+	return labelMap
+}