Merge of v1.5.1 release changes

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.5.1
+
+* Bug fix - [Ignore namespace for custom eniconfig watch](https://github.com/aws/amazon-vpc-cni-k8s/pull/561) (#561, @mogren)
+
 ## v1.5.0
 
 * Bug fix - [Fix spelling on annotation](https://github.com/aws/amazon-vpc-cni-k8s/pull/482) (#482, @forsberg)

config/v1.5/aws-k8s-cni.yaml

@@ -81,7 +81,7 @@ spec:
       tolerations:
         - operator: Exists
       containers:
-        - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.5.0
+        - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.5.1
           imagePullPolicy: Always
           ports:
             - containerPort: 61678
@@ -102,10 +102,6 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
-            - name: WATCH_NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
           resources:
             requests:
               cpu: 10m

pkg/eniconfig/eniconfig.go

@@ -26,12 +26,9 @@ import (
 
 	"github.com/aws/amazon-vpc-cni-k8s/pkg/apis/crd/v1alpha1"
 
-	corev1 "k8s.io/api/core/v1"
-
-	"github.com/operator-framework/operator-sdk/pkg/util/k8sutil"
-	sdkVersion "github.com/operator-framework/operator-sdk/version"
-
 	log "github.com/cihub/seelog"
+	sdkVersion "github.com/operator-framework/operator-sdk/version"
+	corev1 "k8s.io/api/core/v1"
 )
 
 const (
@@ -154,13 +151,9 @@ func (eniCfg *ENIConfigController) Start() {
 
 	resource := "crd.k8s.amazonaws.com/v1alpha1"
 	kind := "ENIConfig"
-	namespace, err := k8sutil.GetWatchNamespace()
-	if err != nil {
-		log.Errorf("failed to get watch namespace: %v", err)
-	}
 	resyncPeriod := time.Second * 5
-	log.Infof("Watching %s, %s, %s, every %v s", resource, kind, namespace, resyncPeriod.Seconds())
-	sdk.Watch(resource, kind, namespace, resyncPeriod)
+	log.Infof("Watching %s, %s, every %v s", resource, kind, resyncPeriod.Seconds())
+	sdk.Watch(resource, kind, "", resyncPeriod)
 	sdk.Watch("/v1", "Node", corev1.NamespaceAll, resyncPeriod)
 	sdk.Handle(NewHandler(eniCfg))
 	sdk.Run(context.TODO())
@@ -180,7 +173,6 @@ func (eniCfg *ENIConfigController) Getter() *ENIConfigInfo {
 	for name, val := range eniCfg.eni {
 		output.ENI[name] = *val
 	}
-
 	return output
 }