From 7eab704c000bc2be9fefed0b2f42702c6851f7f8 Mon Sep 17 00:00:00 2001
From: Adam Malcontenti-Wilson <amalcontenti-wilson@zendesk.com>
Date: Fri, 8 Nov 2019 16:37:27 -0800
Subject: [PATCH] Add support for listening on unix socket for introspection
 endpoint

---
 README.md           |  2 ++
 ipamd/introspect.go | 20 ++++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index bf394973c2..ec7f6b932c 100644
--- a/README.md
+++ b/README.md
@@ -305,6 +305,8 @@ Default: `127.0.0.1:61679`
 
 Specifies the bind address for the introspection endpoint.
 
+A Unix Domain Socket can be specified with the `unix:` prefix before the socket path.
+
 ---
 
 `DISABLE_INTROSPECTION`
diff --git a/ipamd/introspect.go b/ipamd/introspect.go
index 7d59fd79ae..0571cbf8f9 100644
--- a/ipamd/introspect.go
+++ b/ipamd/introspect.go
@@ -15,15 +15,18 @@ package ipamd
 
 import (
 	"encoding/json"
+	"net"
 	"net/http"
 	"os"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
 
+	log "github.com/cihub/seelog"
+
 	"github.com/aws/amazon-vpc-cni-k8s/pkg/networkutils"
 	"github.com/aws/amazon-vpc-cni-k8s/pkg/utils/retry"
-	log "github.com/cihub/seelog"
 )
 
 const (
@@ -62,7 +65,20 @@ func (c *IPAMContext) ServeIntrospection() {
 	for {
 		once := sync.Once{}
 		_ = retry.RetryWithBackoff(retry.NewSimpleBackoff(time.Second, time.Minute, 0.2, 2), func() error {
-			err := server.ListenAndServe()
+			var ln net.Listener
+			var err error
+
+			if strings.HasPrefix(server.Addr, "unix:") {
+				socket := strings.TrimPrefix(server.Addr, "unix:")
+				ln, err = net.Listen("unix", socket)
+			} else {
+				ln, err = net.Listen("tcp", server.Addr)
+			}
+
+			if err == nil {
+				err = server.Serve(ln)
+			}
+
 			once.Do(func() {
 				log.Error("Error running http API: ", err)
 			})