Upgrading to operator-sdk 0.4.0

Gopkg.toml

@@ -10,41 +10,10 @@ required = [
   "k8s.io/gengo/args",
 ]
 
-[[override]]
-  name = "k8s.io/code-generator"
-  # revision for tag "kubernetes-1.11.2"
-  revision = "6702109cc68eb6fe6350b83e14407c8d7309fd1a"
-
-[[override]]
-  name = "k8s.io/api"
-  # revision for tag "kubernetes-1.11.2"
-  revision = "2d6f90ab1293a1fb871cf149423ebb72aa7423aa"
-
-[[override]]
-  name = "k8s.io/apiextensions-apiserver"
-  # revision for tag "kubernetes-1.11.2"
-  revision = "408db4a50408e2149acbd657bceb2480c13cb0a4"
-
-[[override]]
-  name = "k8s.io/apimachinery"
-  # revision for tag "kubernetes-1.11.2"
-  revision = "103fd098999dc9c0c88536f5c9ad2e5da39373ae"
-
-[[override]]
-  name = "k8s.io/client-go"
-  # revision for tag "kubernetes-1.11.2"
-  revision = "1f13a808da65775f22cbf47862c4e5898d8f4ca1"
-
 [[override]]
   name = "sigs.k8s.io/controller-runtime"
   version = "v0.1.4"
 
-[[constraint]]
-  name = "github.com/operator-framework/operator-sdk"
-  # The version rule is used for a specific release and the master branch for in between releases.
-  #branch = "master" #osdk_branch_annotation
-  version = "=v0.1.1" #osdk_version_annotation
-
 [prune]
   go-tests = true
   non-go = true

manifests/04-operator.yaml

@@ -30,7 +30,9 @@ spec:
           - "-v=1"
           env:
           - name: WATCH_NAMESPACE
-            value: ""
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
           - name: POD_NAME
             valueFrom:
               fieldRef:

pkg/config/config.go

@@ -8,9 +8,10 @@ import (
 )
 
 const (
-	nodeTunedImageDefault string = "registry.svc.ci.openshift.org/openshift/origin-v4.0:cluster-node-tuned"
-	operatorNameDefault   string = "cluster-node-tuning"
-	resyncPeriodDefault   int64  = 600
+	nodeTunedImageDefault    string = "registry.svc.ci.openshift.org/openshift/origin-v4.0:cluster-node-tuned"
+	operatorNameDefault      string = "cluster-node-tuning"
+	operatorNamespaceDefault string = "openshift-cluster-node-tuning-operator"
+	resyncPeriodDefault      int64  = 600
 )
 
 // NodeTunedImage returns the operator's operand/tuned image path.
@@ -35,6 +36,17 @@ func OperatorName() string {
 	return operatorNameDefault
 }
 
+// OperatorName returns the operator namespace.
+func OperatorNamespace() string {
+	operatorNamespace := os.Getenv("WATCH_NAMESPACE")
+
+	if len(operatorNamespace) > 0 {
+		return operatorNamespace
+	}
+
+	return operatorNamespaceDefault
+}
+
 // ResyncPeriod returns the configured or default Reconcile period.
 func ResyncPeriod() int64 {
 	resyncPeriodDuration := resyncPeriodDefault

test/e2e/e2e_test.go

@@ -73,7 +73,7 @@ func waitForTunedCR(t *testing.T, client framework.FrameworkClient, timeout time
 	err := wait.PollImmediate(time.Second, timeout, func() (done bool, err error) {
 		ctx, cancel := testContext()
 		defer cancel()
-		err = client.Get(ctx, types.NamespacedName{Name: "default", Namespace: "openshift-cluster-node-tuning-operator"}, cr)
+		err = client.Get(ctx, types.NamespacedName{Name: "default", Namespace: ntoconfig.OperatorNamespace()}, cr)
 		if err != nil {
 			return false, err
 		}