Deprecate the ENV MY_POD_NAMESPACE and MY_POD_NAME

And use NamespaceDefault by default
kubeflow · Jan 26, 2018 · 43e99c9 · 43e99c9
1 parent 8caa0c9
commit 43e99c9
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 21 deletions.
diff --git a/cmd/tf_operator/app/server.go b/cmd/tf_operator/app/server.go
@@ -52,11 +52,6 @@ var (
 )
 
 func Run(opt *options.ServerOption) error {
-	namespace := os.Getenv("MY_POD_NAMESPACE")
-	if len(namespace) == 0 {
-		glog.Fatalf("must set env MY_POD_NAMESPACE")
-	}
-
 	glog.Infof("tf_operator Version: %v", version.Version)
 	glog.Infof("Git SHA: %s", version.GitSHA)
 	glog.Infof("Go Version: %s", runtime.Version())
@@ -103,7 +98,7 @@ func Run(opt *options.ServerOption) error {
 
 	rl := &resourcelock.EndpointsLock{
 		EndpointsMeta: metav1.ObjectMeta{
-			Namespace: namespace,
+			Namespace: metav1.NamespaceDefault,
 			Name:      "tf-operator",
 		},
 		Client: leaderElectionClient.CoreV1(),

diff --git a/developer_guide.md b/developer_guide.md
@@ -136,14 +136,8 @@ a K8s cluster. Set your environment:
 
 ```sh
 export KUBECONFIG=$(echo ~/.kube/config)
-export MY_POD_NAMESPACE=default
-export MY_POD_NAME=my-pod
 ```
 
-* MY_POD_NAMESPACE is used because the CRD is namespace scoped and we use the namespace of the controller to
-  set the corresponding namespace for the resource.
-* TODO(jlewi): Do we still need to set MY_POD_NAME? Why?
-
 Now we are ready to run operator locally:
 
 ```sh

diff --git a/tf-job-operator-chart/templates/deployment.yaml b/tf-job-operator-chart/templates/deployment.yaml
@@ -24,15 +24,6 @@ spec:
           {{- end }}
           - -alsologtostderr
           - -v=1
-        env:
-        - name: MY_POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        - name: MY_POD_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
       {{- if .Values.config.configmap }}
         volumeMounts:
           - name: config-volume