Changes to accomodate merge from head of the tree

Azure · Jul 11, 2019 · e0ea111 · e0ea111
1 parent b83764d
commit e0ea111
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/pkg/k8s/client.go b/pkg/k8s/client.go
@@ -88,7 +88,7 @@ func (c *KubeClient) GetPodInfo(podip string) (podns, poddname, deployment strin
 		return "", "", "", fmt.Errorf("podip is empty")
 	}
 
-	podList, err := c.getPodListRetry(podip, getPodListRetries, getPodListSleepTimeMilliseconds)
+	podList, err := c.getPodListWithTries(podip, getPodListRetries, getPodListSleepTimeMilliseconds)
 
 	if err != nil {
 		return "", "", "", err

diff --git a/pkg/nmi/server/server.go b/pkg/nmi/server/server.go
@@ -243,10 +243,6 @@ func (s *Server) msiHandler(logger *log.Entry, w http.ResponseWriter, r *http.Re
 	micRegEx := regexp.MustCompile(`^mic-*`)
 	micMatch := micRegEx.MatchString(deployment)
 
-	// Request id and request resource extraction are common steps required for
-	// requests from mic as well as other applications.
-	rqClientID, rqResource := parseRequestClientIDAndResource(r)
-
 	// If its mic, then just directly get the token and pass back.
 	if micMatch {
 		var token *adal.Token