[camel-k] branch master updated: Fix operator leader election

[lburgazzoli]

This is an automated email from the ASF dual-hosted git repository.

lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git


The following commit(s) were added to refs/heads/master by this push:
     new 3d1705e  Fix operator leader election
3d1705e is described below

commit 3d1705e64dc5025d135065f95a7061b3bdb725eb
Author: Antonin Stefanutti <anto...@stefanutti.fr>
AuthorDate: Wed Feb 13 14:57:07 2019 +0100

    Fix operator leader election
---
 cmd/manager/main.go                        | 6 +++++-
 deploy/operator-deployment-kubernetes.yaml | 4 ++++
 deploy/operator-deployment-openshift.yaml  | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index 19aed31..d22aef8 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -75,7 +75,11 @@ func main() {
        }
 
        // Become the leader before proceeding
-       leader.Become(context.TODO(), "camel-k-lock") // nolint: errcheck
+       err = leader.Become(context.TODO(), "camel-k-lock")
+       if err != nil {
+               log.Error(err, "")
+               os.Exit(1)
+       }
 
        r := ready.NewFileReady()
        err = r.Set()
diff --git a/deploy/operator-deployment-kubernetes.yaml 
b/deploy/operator-deployment-kubernetes.yaml
index 4e17f11..b451773 100644
--- a/deploy/operator-deployment-kubernetes.yaml
+++ b/deploy/operator-deployment-kubernetes.yaml
@@ -35,6 +35,10 @@ spec:
                   fieldPath: metadata.namespace
             - name: OPERATOR_NAME
               value: "camel-k"
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
           volumeMounts:
           - mountPath: /workspace
             name: camel-k-builder
diff --git a/deploy/operator-deployment-openshift.yaml 
b/deploy/operator-deployment-openshift.yaml
index 4920d03..b7711a4 100644
--- a/deploy/operator-deployment-openshift.yaml
+++ b/deploy/operator-deployment-openshift.yaml
@@ -35,3 +35,7 @@ spec:
                   fieldPath: metadata.namespace
             - name: OPERATOR_NAME
               value: "camel-k"
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name