Kube QOL Improvements. (airbytehq#4968)

* Use cluster ip when possible. * Removed noisy logging.
Jimao · Jul 27, 2021 · 23dc777 · 23dc777
1 parent 344e326
commit 23dc777
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 20 deletions.
diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/process/KubePodProcess.java b/airbyte-workers/src/main/java/io/airbyte/workers/process/KubePodProcess.java
@@ -542,21 +542,8 @@ private void close() {
     Exceptions.swallow(this.stderrServerSocket::close);
     Exceptions.swallow(this.executorService::shutdownNow);
 
-    var stdoutPortReleased = KubePortManagerSingleton.offer(stdoutLocalPort);
-    if (!stdoutPortReleased) {
-      LOGGER.warn(
-          "Error while releasing port {} from pod {}. This can cause the scheduler to run out of ports. Ignore this error if running Kubernetes on docker for desktop.",
-          stdoutLocalPort,
-          podDefinition.getMetadata().getName());
-    }
-
-    var stderrPortReleased = KubePortManagerSingleton.offer(stderrLocalPort);
-    if (!stderrPortReleased) {
-      LOGGER.warn(
-          "Error while releasing port {} from pod {}. This can cause the scheduler to run out of ports. Ignore this error if running Kubernetes on docker for desktop",
-          stderrLocalPort,
-          podDefinition.getMetadata().getName());
-    }
+    KubePortManagerSingleton.offer(stdoutLocalPort);
+    KubePortManagerSingleton.offer(stderrLocalPort);
 
     LOGGER.debug("Closed {}", podDefinition.getMetadata().getName());
   }

diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/process/KubePortManagerSingleton.java b/airbyte-workers/src/main/java/io/airbyte/workers/process/KubePortManagerSingleton.java
@@ -53,12 +53,10 @@ public static Integer take() throws InterruptedException {
     return workerPorts.poll(10, TimeUnit.MINUTES);
   }
 
-  public static boolean offer(Integer port) {
+  public static void offer(Integer port) {
     if (!workerPorts.contains(port)) {
       workerPorts.add(port);
-      return true;
     }
-    return false;
   }
 
   public static int getNumAvailablePorts() {

diff --git a/kube/resources/db.yaml b/kube/resources/db.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: airbyte-db-svc
 spec:
-  type: NodePort
+  type: ClusterIP
   ports:
     - port: 5432
       protocol: TCP

diff --git a/kube/resources/temporal.yaml b/kube/resources/temporal.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: airbyte-temporal-svc
 spec:
-  type: NodePort
+  type: ClusterIP
   ports:
     - port: 7233
       protocol: TCP