Merge pull request #1427 from tony-clarke-amdocs/ownerref

Allow specify an owner reference for leader election lock

Author: k8s-ci-robot

extended/src/main/java/io/kubernetes/client/extended/leaderelection/LeaderElectionConfig.java

@@ -12,6 +12,7 @@
 */
 package io.kubernetes.client.extended.leaderelection;
 
+import io.kubernetes.client.openapi.models.V1OwnerReference;
 import java.time.Duration;
 
 public class LeaderElectionConfig {
@@ -24,14 +25,26 @@ public class LeaderElectionConfig {
 
   private Duration retryPeriod;
 
+  private V1OwnerReference ownerReference;
+
   public LeaderElectionConfig() {}
 
   public LeaderElectionConfig(
       Lock lock, Duration leaseDuration, Duration renewDeadline, Duration retryPeriod) {
+    this(lock, leaseDuration, renewDeadline, retryPeriod, null);
+  }
+
+  public LeaderElectionConfig(
+      Lock lock,
+      Duration leaseDuration,
+      Duration renewDeadline,
+      Duration retryPeriod,
+      V1OwnerReference ownerReference) {
     this.lock = lock;
     this.leaseDuration = leaseDuration;
     this.renewDeadline = renewDeadline;
     this.retryPeriod = retryPeriod;
+    this.ownerReference = ownerReference;
   }
 
   public Lock getLock() {
@@ -65,4 +78,12 @@ public Duration getRetryPeriod() {
   public void setRetryPeriod(Duration retryPeriod) {
     this.retryPeriod = retryPeriod;
   }
+
+  public V1OwnerReference getOwnerReference() {
+    return ownerReference;
+  }
+
+  public void setOwnerReference(V1OwnerReference ownerReference) {
+    this.ownerReference = ownerReference;
+  }
 }

extended/src/main/java/io/kubernetes/client/extended/leaderelection/LeaderElectionRecord.java

@@ -12,6 +12,7 @@
 */
 package io.kubernetes.client.extended.leaderelection;
 
+import io.kubernetes.client.openapi.models.V1OwnerReference;
 import java.util.Date;
 
 public class LeaderElectionRecord {
@@ -26,6 +27,8 @@ public class LeaderElectionRecord {
 
   private int leaderTransitions;
 
+  private V1OwnerReference ownerReference;
+
   public LeaderElectionRecord() {}
 
   public LeaderElectionRecord(
@@ -34,11 +37,22 @@ public LeaderElectionRecord(
       Date acquireTime,
       Date renewTime,
       int leaderTransitions) {
+    this(holderIdentity, leaseDurationSeconds, acquireTime, renewTime, leaderTransitions, null);
+  }
+
+  public LeaderElectionRecord(
+      String holderIdentity,
+      int leaseDurationSeconds,
+      Date acquireTime,
+      Date renewTime,
+      int leaderTransitions,
+      V1OwnerReference ownerReference) {
     this.holderIdentity = holderIdentity;
     this.leaseDurationSeconds = leaseDurationSeconds;
     this.acquireTime = acquireTime;
     this.renewTime = renewTime;
     this.leaderTransitions = leaderTransitions;
+    this.ownerReference = ownerReference;
   }
 
   public String getHolderIdentity() {
@@ -81,6 +95,14 @@ public void setLeaderTransitions(int leaderTransitions) {
     this.leaderTransitions = leaderTransitions;
   }
 
+  public V1OwnerReference getOwnerReference() {
+    return ownerReference;
+  }
+
+  public void setOwnerReference(V1OwnerReference ownerReference) {
+    this.ownerReference = ownerReference;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
@@ -95,6 +117,11 @@ public boolean equals(Object o) {
     } else {
       if (!holderIdentity.equals(that.holderIdentity)) return false;
     }
+    if (ownerReference == null) {
+      if (that.ownerReference != null) return false;
+    } else {
+      if (!ownerReference.equals(that.ownerReference)) return false;
+    }
     if (acquireTime == null) {
       if (that.acquireTime != null) return false;
     } else {

extended/src/main/java/io/kubernetes/client/extended/leaderelection/LeaderElector.java

@@ -241,7 +241,8 @@ private boolean tryAcquireOrRenew() {
             Long.valueOf(config.getLeaseDuration().getSeconds()).intValue(),
             now,
             now,
-            0);
+            0,
+            config.getOwnerReference());
 
     // 1. obtain or create the ElectionRecord
     LeaderElectionRecord oldLeaderElectionRecord;

extended/src/main/java/io/kubernetes/client/extended/leaderelection/resourcelock/ConfigMapLock.java

@@ -21,6 +21,7 @@
 import io.kubernetes.client.openapi.models.V1ConfigMap;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import java.net.HttpURLConnection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
@@ -89,6 +90,9 @@ public boolean create(LeaderElectionRecord record) {
           LeaderElectionRecordAnnotationKey,
           coreV1Client.getApiClient().getJSON().serialize(record));
       objectMeta.setAnnotations(annotations);
+      if (record.getOwnerReference() != null) {
+        objectMeta.setOwnerReferences(Collections.singletonList(record.getOwnerReference()));
+      }
       configMap.setMetadata(objectMeta);
       V1ConfigMap createdConfigMap =
           coreV1Client.createNamespacedConfigMap(namespace, configMap, null, null, null);

extended/src/main/java/io/kubernetes/client/extended/leaderelection/resourcelock/EndpointsLock.java

@@ -21,6 +21,7 @@
 import io.kubernetes.client.openapi.models.V1Endpoints;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import java.net.HttpURLConnection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
@@ -89,6 +90,9 @@ public boolean create(LeaderElectionRecord record) {
           LeaderElectionRecordAnnotationKey,
           coreV1Client.getApiClient().getJSON().serialize(record));
       objectMeta.setAnnotations(annotations);
+      if (record.getOwnerReference() != null) {
+        objectMeta.setOwnerReferences(Collections.singletonList(record.getOwnerReference()));
+      }
       endpoints.setMetadata(objectMeta);
       V1Endpoints createdendpoints =
           coreV1Client.createNamespacedEndpoints(namespace, endpoints, null, null, null);

extended/src/main/java/io/kubernetes/client/extended/leaderelection/resourcelock/LeaseLock.java

@@ -22,6 +22,7 @@
 import io.kubernetes.client.openapi.models.V1LeaseSpec;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import java.net.HttpURLConnection;
+import java.util.Collections;
 import java.util.concurrent.atomic.AtomicReference;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
@@ -62,12 +63,16 @@ public LeaderElectionRecord get() throws ApiException {
   @Override
   public boolean create(LeaderElectionRecord record) {
     try {
+      V1ObjectMeta objectMeta = new V1ObjectMeta();
+      objectMeta.setName(name);
+      objectMeta.setNamespace(namespace);
+      if (record.getOwnerReference() != null) {
+        objectMeta.setOwnerReferences(Collections.singletonList(record.getOwnerReference()));
+      }
       V1Lease createdLease =
           coordinationV1Api.createNamespacedLease(
               namespace,
-              new V1Lease()
-                  .metadata(new V1ObjectMeta().namespace(namespace).name(name))
-                  .spec(getLeaseFromRecord(record)),
+              new V1Lease().metadata(objectMeta).spec(getLeaseFromRecord(record)),
               null,
               null,
               null);