chore: delete deprecated worker v1 helm and infra code. (#13984)

tryangul · tryangul · commit 1129cefd248c · 2024-09-17T15:57:10.000-07:00
diff --git a/airbyte-commons-with-dependencies/src/main/java/io/airbyte/commons/workers/config/WorkerConfigsProvider.java b/airbyte-commons-with-dependencies/src/main/java/io/airbyte/commons/workers/config/WorkerConfigsProvider.java
@@ -157,8 +157,7 @@ record WorkerConfigsDefaults(
                                @Value("${airbyte.worker.isolated.kube.node-selectors}") String isolatedNodeSelectors,
                                @Value("${airbyte.worker.isolated.kube.use-custom-node-selector}") boolean useCustomNodeSelector,
                                @Value("${airbyte.worker.job.kube.main.container.image-pull-secret}") List<String> mainContainerImagePullSecret,
-                               @Value("${airbyte.worker.job.kube.main.container.image-pull-policy}") String mainContainerImagePullPolicy,
-                               @Value("${airbyte.worker.job.kube.sidecar.container.image-pull-policy}") String sidecarContainerImagePullPolicy) {
+                               @Value("${airbyte.worker.job.kube.main.container.image-pull-policy}") String mainContainerImagePullPolicy) {
 
   }
 
diff --git a/airbyte-commons-with-dependencies/src/test/resources/application-config-test.yaml b/airbyte-commons-with-dependencies/src/test/resources/application-config-test.yaml
@@ -46,9 +46,6 @@ airbyte:
           container:
             image-pull-policy: ${UNUSED_VALUE:}
             image-pull-secret: ${UNUSED_VALUE:}
-        sidecar:
-          container:
-            image-pull-policy: ${UNUSED_VALUE:}
         tolerations: ${UNUSED_VALUE:}
     isolated:
       kube:
diff --git a/airbyte-commons-worker/src/main/kotlin/io/airbyte/workers/sync/OrchestratorConstants.kt b/airbyte-commons-worker/src/main/kotlin/io/airbyte/workers/sync/OrchestratorConstants.kt
@@ -61,7 +61,6 @@ object OrchestratorConstants {
           EnvVar.JOB_KUBE_NAMESPACE,
           EnvVar.JOB_KUBE_NODE_SELECTORS,
           EnvVar.JOB_KUBE_SERVICEACCOUNT,
-          EnvVar.JOB_KUBE_SIDECAR_CONTAINER_IMAGE_PULL_POLICY,
           EnvVar.JOB_KUBE_TOLERATIONS,
           EnvVar.JOB_MAIN_CONTAINER_CPU_LIMIT,
           EnvVar.JOB_MAIN_CONTAINER_CPU_REQUEST,
diff --git a/airbyte-commons/src/main/kotlin/io/airbyte/commons/envvar/EnvVar.kt b/airbyte-commons/src/main/kotlin/io/airbyte/commons/envvar/EnvVar.kt
@@ -56,7 +56,6 @@ enum class EnvVar {
   JOB_KUBE_NAMESPACE,
   JOB_KUBE_NODE_SELECTORS,
   JOB_KUBE_SERVICEACCOUNT,
-  JOB_KUBE_SIDECAR_CONTAINER_IMAGE_PULL_POLICY,
   JOB_KUBE_TOLERATIONS,
   JOB_MAIN_CONTAINER_CPU_LIMIT,
   JOB_MAIN_CONTAINER_CPU_REQUEST,
diff --git a/airbyte-server/src/main/resources/application.yml b/airbyte-server/src/main/resources/application.yml
@@ -287,9 +287,6 @@ airbyte:
           container:
             image-pull-policy: ${JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_POLICY:IfNotPresent}
             image-pull-secret: ${JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_SECRET:}
-        sidecar:
-          container:
-            image-pull-policy: ${JOB_KUBE_SIDECAR_CONTAINER_IMAGE_PULL_POLICY:IfNotPresent}
         tolerations: ${JOB_KUBE_TOLERATIONS:}
     isolated:
       kube:
diff --git a/charts/airbyte-worker/README.md b/charts/airbyte-worker/README.md
@@ -37,7 +37,6 @@ Helm chart to deploy airbyte-worker
 | global.jobs.kube.annotations | object | `{}` |  |
 | global.jobs.kube.images.busybox | string | `""` |  |
 | global.jobs.kube.images.curl | string | `""` |  |
-| global.jobs.kube.images.socat | string | `""` |  |
 | global.jobs.kube.labels | object | `{}` |  |
 | global.jobs.kube.main_container_image_pull_secret | string | `""` |  |
 | global.jobs.kube.nodeSelector | object | `{}` |  |
diff --git a/charts/airbyte-worker/templates/deployment.yaml b/charts/airbyte-worker/templates/deployment.yaml
@@ -176,13 +176,6 @@ spec:
               name: {{ .Release.Name }}-airbyte-env
               key: JOB_KUBE_BUSYBOX_IMAGE
         {{- end }}
-        {{- if $.Values.global.jobs.kube.images.socat }}
-        - name: JOB_KUBE_SOCAT_IMAGE
-          valueFrom:
-            configMapKeyRef:
-              name: {{ .Release.Name }}-airbyte-env
-              key: JOB_KUBE_SOCAT_IMAGE
-        {{- end }}
         {{- if $.Values.global.jobs.kube.images.curl }}
         - name: JOB_KUBE_CURL_IMAGE
           valueFrom:
diff --git a/charts/airbyte-worker/values.yaml b/charts/airbyte-worker/values.yaml
@@ -69,10 +69,6 @@ global:
         ## busybox image used by the job pod
         ##   jobs.kube.images.busybox [string] busybox image used by the job pod
         busybox: ""
-        ## JOB_KUBE_SOCAT_IMAGE
-        ## socat image used by the job pod
-        ##   jobs.kube.images.socat [string] socat image used by the job pod
-        socat: ""
         ## JOB_KUBE_CURL_IMAGE
         ## curl image used by the job pod
         ##   jobs.kube.images.curl [string] curl image used by the job pod
diff --git a/charts/airbyte-workload-launcher/README.md b/charts/airbyte-workload-launcher/README.md
@@ -36,7 +36,6 @@ Helm chart to deploy airbyte-workload-launcher
 | global.jobs.kube.annotations | object | `{}` |  |
 | global.jobs.kube.images.busybox | string | `""` |  |
 | global.jobs.kube.images.curl | string | `""` |  |
-| global.jobs.kube.images.socat | string | `""` |  |
 | global.jobs.kube.labels | object | `{}` |  |
 | global.jobs.kube.main_container_image_pull_secret | string | `""` |  |
 | global.jobs.kube.nodeSelector | object | `{}` |  |
diff --git a/charts/airbyte-workload-launcher/templates/deployment.yaml b/charts/airbyte-workload-launcher/templates/deployment.yaml
@@ -197,13 +197,6 @@ spec:
               name: {{ .Release.Name }}-airbyte-env
               key: JOB_KUBE_BUSYBOX_IMAGE
         {{- end }}
-        {{- if $.Values.global.jobs.kube.images.socat }}
-        - name: JOB_KUBE_SOCAT_IMAGE
-          valueFrom:
-            configMapKeyRef:
-              name: {{ .Release.Name }}-airbyte-env
-              key: JOB_KUBE_SOCAT_IMAGE
-        {{- end }}
         {{- if $.Values.global.jobs.kube.images.curl }}
         - name: JOB_KUBE_CURL_IMAGE
           valueFrom:
diff --git a/charts/airbyte-workload-launcher/values.yaml b/charts/airbyte-workload-launcher/values.yaml
@@ -70,10 +70,6 @@ global:
         ## busybox image used by the job pod
         ##   jobs.kube.images.busybox [string] busybox image used by the job pod
         busybox: ""
-        ## JOB_KUBE_SOCAT_IMAGE
-        ## socat image used by the job pod
-        ##   jobs.kube.images.socat [string] socat image used by the job pod
-        socat: ""
         ## JOB_KUBE_CURL_IMAGE
         ## curl image used by the job pod
         ##   jobs.kube.images.curl [string] curl image used by the job pod
diff --git a/charts/airbyte/README.md b/charts/airbyte/README.md
@@ -156,7 +156,6 @@ Helm chart to deploy airbyte
 | global.jobs.kube.annotations | object | `{}` | key/value annotations applied to kube jobs                                                                                                                              |
 | global.jobs.kube.images.busybox | string | `""` | busybox image used by the job pod                                                                                                                                       |
 | global.jobs.kube.images.curl | string | `""` | curl image used by the job pod                                                                                                                                          |
-| global.jobs.kube.images.socat | string | `""` | socat image used by the job pod                                                                                                                                         |
 | global.jobs.kube.labels | object | `{}` | key/value labels applied to kube jobs                                                                                                                                   |
 | global.jobs.kube.main_container_image_pull_secret | string | `""` | image pull secret to use for job pod                                                                                                                                    |
 | global.jobs.kube.nodeSelector | object | `{}` | Node labels for pod assignment                                                                                                                                          |
diff --git a/charts/airbyte/templates/env-configmap.yaml b/charts/airbyte/templates/env-configmap.yaml
@@ -94,10 +94,6 @@ data:
   JOB_KUBE_BUSYBOX_IMAGE: {{ $.Values.global.jobs.kube.images.busybox | quote }}
   {{- end }}
 
-  {{- if $.Values.global.jobs.kube.images.socat }}
-  JOB_KUBE_SOCAT_IMAGE: {{ $.Values.global.jobs.kube.images.socat | quote }}
-  {{- end }}
-
   {{- if $.Values.global.jobs.kube.images.curl }}
   JOB_KUBE_CURL_IMAGE: {{ $.Values.global.jobs.kube.images.curl | quote }}
   {{- end }}
diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml
@@ -172,9 +172,6 @@ global:
         ## JOB_KUBE_BUSYBOX_IMAGE
         # -- busybox image used by the job pod
         busybox: ""
-        ## JOB_KUBE_SOCAT_IMAGE
-        # -- socat image used by the job pod
-        socat: ""
         ## JOB_KUBE_CURL_IMAGE
         # -- curl image used by the job pod
         curl: ""
diff --git a/charts/airbyte/values.yaml.test b/charts/airbyte/values.yaml.test
@@ -134,10 +134,6 @@ global:
         ## busybox image used by the job pod
         ##   jobs.kube.images.busybox [string] busybox image used by the job pod
         busybox: ""
-        ## JOB_KUBE_SOCAT_IMAGE
-        ## socat image used by the job pod
-        ##   jobs.kube.images.socat [string] socat image used by the job pod
-        socat: ""
         ## JOB_KUBE_CURL_IMAGE
         ## curl image used by the job pod
         ##   jobs.kube.images.curl [string] curl image used by the job pod
diff --git a/charts/test_resources/pro/values.yaml b/charts/test_resources/pro/values.yaml
@@ -135,10 +135,6 @@ global:
         ## busybox image used by the job pod
         ##   jobs.kube.images.busybox [string] busybox image used by the job pod
         busybox: ""
-        ## JOB_KUBE_SOCAT_IMAGE
-        ## socat image used by the job pod
-        ##   jobs.kube.images.socat [string] socat image used by the job pod
-        socat: ""
         ## JOB_KUBE_CURL_IMAGE
         ## curl image used by the job pod
         ##   jobs.kube.images.curl [string] curl image used by the job pod
diff --git a/docker/Makefile b/docker/Makefile
@@ -8,7 +8,6 @@ PUBLISH ?= false
 
 BASE_JAVA_IMAGE_VERSION ?= 3.2.3
 BASE_JAVA_IMAGE = airbyte/airbyte-base-java-image:$(BASE_JAVA_IMAGE_VERSION)
-BASE_SOCAT_IMAGE_VERSION ?= 1.8.0.0
 BASE_BUSYBOX_IMAGE_VERSION ?= 1.28
 ALPINE_IMAGE_VERSION ?= 3.18
 
@@ -58,20 +57,6 @@ image.airbyte-base-java-worker-image: ## Build the airbyte/airbyte-base-java-wor
 			-f $(IMAGES_DIR)/airbyte-base-java-worker-image/Dockerfile . ; \
 	fi
 
-image.airbyte-socat: ## Build the airbyte/socat image
-	@if [ "$(PUBLISH)" = "true" ]; then \
-		docker buildx build -t airbyte/socat:$(VERSION) \
-			--build-arg BASE_SOCAT_IMAGE_VERSION=$(BASE_SOCAT_IMAGE_VERSION) \
-			--platform linux/amd64,linux/arm64 \
-			--push \
-			-f $(IMAGES_DIR)/airbyte-socat/Dockerfile . ; \
-	else \
-		docker build \
-			--build-arg BASE_SOCAT_IMAGE_VERSION=$(BASE_SOCAT_IMAGE_VERSION) \
-			-t airbyte/socat:$(VERSION) \
-			-f $(IMAGES_DIR)/airbyte-socat/Dockerfile . ; \
-	fi
-
 image.airbyte-busybox: ## Build the airbyte/busybox image
 	@if [ "$(PUBLISH)" = "true" ]; then \
 		docker buildx build -t airbyte/busybox:$(VERSION) \
diff --git a/docker/airbyte-socat/Dockerfile b/docker/airbyte-socat/Dockerfile

Original file line number	Diff line number	Diff line change
`@@ -157,8 +157,7 @@ record WorkerConfigsDefaults(`
`157`	`157`	`@Value("${airbyte.worker.isolated.kube.node-selectors}") String isolatedNodeSelectors,`
`158`	`158`	`@Value("${airbyte.worker.isolated.kube.use-custom-node-selector}") boolean useCustomNodeSelector,`
`159`	`159`	`@Value("${airbyte.worker.job.kube.main.container.image-pull-secret}") List<String> mainContainerImagePullSecret,`
`160`		`- @Value("${airbyte.worker.job.kube.main.container.image-pull-policy}") String mainContainerImagePullPolicy,`
`161`		`- @Value("${airbyte.worker.job.kube.sidecar.container.image-pull-policy}") String sidecarContainerImagePullPolicy) {`
	`160`	`+ @Value("${airbyte.worker.job.kube.main.container.image-pull-policy}") String mainContainerImagePullPolicy) {`
`162`	`161`
`163`	`162`	`}`
`164`	`163`