Normalize workload-api chart name (#9703)

Author: jdpgrailsdev

charts/airbyte-workload-api-server/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
-name: airbyte-workload-api-server
-description: Helm chart to deploy airbyte-api-server
+name: workload-api
+description: Helm chart to deploy the workload-api service
 
 # A chart can be either an 'application' or a 'library' chart.
 #

charts/airbyte-workload-api-server/templates/_helpers.tpl

@@ -61,7 +61,7 @@ Define db secret
 {{/*
 Define imageTag
 */}}
-{{- define "airbyte-workload-api-server.imageTag" -}}
+{{- define "workload-api.imageTag" -}}
 {{- if .Values.image.tag }}
     {{- printf "%s" .Values.image.tag }}
 {{- else if ((.Values.global.image).tag) }}

charts/airbyte-workload-api-server/templates/deployment.yaml

@@ -51,8 +51,8 @@ spec:
       {{- toYaml .Values.extraInitContainers | nindent 6 }}
       {{- end }}
       containers:
-      - name: airbyte-workload-api-server
-        image: {{ printf "%s:%s" .Values.image.repository (include "airbyte-workload-api-server.imageTag" .) }}
+      - name: airbyte-workload-api-server-container
+        image: {{ printf "%s:%s" .Values.image.repository (include "workload-api.imageTag" .) }}
         imagePullPolicy: "{{ .Values.image.pullPolicy }}"
         env:
         - name: INTERNAL_API_HOST

charts/airbyte/Chart.lock

@@ -38,7 +38,7 @@ dependencies:
 - name: keycloak-setup
   repository: https://airbytehq.github.io/helm-charts/
   version: 0.49.18
-- name: airbyte-workload-api-server
+- name: workload-api
   repository: https://airbytehq.github.io/helm-charts/
   version: 0.49.18
 digest: sha256:b1982812acde11dfccd7e149d40d33af6fbb3bba6de528ecef648735e5643462

charts/airbyte/Chart.yaml

@@ -77,7 +77,3 @@ dependencies:
     name: keycloak-setup
     repository: https://airbytehq.github.io/helm-charts/
     version: 0.49.18
-  - condition: airbyte-workload-api-server.enabled
-    name: airbyte-workload-api-server
-    repository: https://airbytehq.github.io/helm-charts/
-    version: 0.49.18

charts/airbyte/Chart.yaml.local

@@ -67,6 +67,14 @@ dependencies:
     name: worker
     repository: "file://../airbyte-worker"
     version: "*"
+  - condition: workload-api.enabled
+    name: workload-api
+    repository: "file://../airbyte-workload-api-server"
+    version: "*"
+  - condition: workload-launcher.enabled
+    name: workload-launcher
+    repository: "file://../airbyte-workload-launcher"
+    version: "*"
   - condition: pod-sweeper.enabled
     name: pod-sweeper
     repository: "file://../airbyte-pod-sweeper"
@@ -83,7 +91,3 @@ dependencies:
     name: connector-builder-server
     repository: "file://../airbyte-connector-builder-server"
     version: "*"
-  - condition: airbyte-workload-api-server.enabled
-    name: airbyte-workload-api-server
-    repository: "file://../airbyte-workload-api-server"
-    version: "*"

charts/airbyte/Chart.yaml.test

@@ -57,6 +57,14 @@ dependencies:
     name: worker
     repository: "file://../airbyte-worker"
     version: "*"
+  - condition: workload-api.enabled
+    name: workload-api
+    repository: "file://../airbyte-workload-api-server"
+    version: "*"
+  - condition: workload-launcher.enabled
+    name: workload-launcher
+    repository: "file://../airbyte-workload-launcher"
+    version: "*"
   - condition: pod-sweeper.enabled
     name: pod-sweeper
     repository: "file://../airbyte-pod-sweeper"
@@ -81,7 +89,3 @@ dependencies:
     name: keycloak-setup
     repository: "file://../airbyte-keycloak-setup"
     version: "*"
-  - condition: airbyte-workload-api-server.enabled
-    name: airbyte-workload-api-server
-    repository: "file://../airbyte-workload-api-server"
-    version: "*"

charts/airbyte/values.yaml

@@ -1821,26 +1821,26 @@ keycloak:
 keycloak-setup:
   enabled: false
 
-airbyte-workload-api-server:
+workload-api:
   enabled: false
-  ##  airbyte-api-server.replicaCount Number of airbyte-api-server replicas
+  ##  workload-api.replicaCount Number of airbyte-api-server replicas
   replicaCount: 1
 
-  ##  airbyte-api-server.image.repository The repository to use for the airbyte airbyte-api-server image.
-  ##  airbyte-api-server.image.pullPolicy the pull policy to use for the airbyte airbyte-api-server image
-  ##  airbyte-api-server.image.tag The airbyte airbyte-api-server image tag. Defaults to the chart's AppVersion
+  ##  workload-api.image.repository The repository to use for the airbyte-workload-api-server image.
+  ##  workload-api.image.pullPolicy the pull policy to use for the airbyte-workload-api-server image
+  ##  workload-api.image.tag The airbyte-workload-api-server image tag. Defaults to the chart's AppVersion
   image:
     repository: airbyte/airbyte-workload-api-server
     pullPolicy: IfNotPresent
 
   ## Configure extra options for the server containers' liveness and readiness probes
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes
-  ##  server.livenessProbe.enabled Enable livenessProbe on the server
-  ##  server.livenessProbe.initialDelaySeconds Initial delay seconds for livenessProbe
-  ##  server.livenessProbe.periodSeconds Period seconds for livenessProbe
-  ##  server.livenessProbe.timeoutSeconds Timeout seconds for livenessProbe
-  ##  server.livenessProbe.failureThreshold Failure threshold for livenessProbe
-  ##  server.livenessProbe.successThreshold Success threshold for livenessProbe
+  ##  workload-api.livenessProbe.enabled Enable livenessProbe on the server
+  ##  workload-api.livenessProbe.initialDelaySeconds Initial delay seconds for livenessProbe
+  ##  workload-api.livenessProbe.periodSeconds Period seconds for livenessProbe
+  ##  workload-api.livenessProbe.timeoutSeconds Timeout seconds for livenessProbe
+  ##  workload-api.livenessProbe.failureThreshold Failure threshold for livenessProbe
+  ##  workload-api.livenessProbe.successThreshold Success threshold for livenessProbe
   ##
   livenessProbe:
     enabled: true
@@ -1850,12 +1850,12 @@ airbyte-workload-api-server:
     failureThreshold: 3
     successThreshold: 1
 
-  ##  server.readinessProbe.enabled Enable readinessProbe on the server
-  ##  server.readinessProbe.initialDelaySeconds Initial delay seconds for readinessProbe
-  ##  server.readinessProbe.periodSeconds Period seconds for readinessProbe
-  ##  server.readinessProbe.timeoutSeconds Timeout seconds for readinessProbe
-  ##  server.readinessProbe.failureThreshold Failure threshold for readinessProbe
-  ##  server.readinessProbe.successThreshold Success threshold for readinessProbe
+  ##  workload-api.readinessProbe.enabled Enable readinessProbe on the server
+  ##  workload-api.readinessProbe.initialDelaySeconds Initial delay seconds for readinessProbe
+  ##  workload-api.readinessProbe.periodSeconds Period seconds for readinessProbe
+  ##  workload-api.readinessProbe.timeoutSeconds Timeout seconds for readinessProbe
+  ##  workload-api.readinessProbe.failureThreshold Failure threshold for readinessProbe
+  ##  workload-api.readinessProbe.successThreshold Success threshold for readinessProbe
   ##
   readinessProbe:
     enabled: true
@@ -1865,14 +1865,14 @@ airbyte-workload-api-server:
     failureThreshold: 3
     successThreshold: 1
 
-  ## airbyte-api-server resource requests and limits
+  ## airbyte-workload-api-server resource requests and limits
   ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
   ## We usually recommend not to specify default resources and to leave this as a conscious
   ## choice for the user. This also increases chances charts run on environments with little
   ## resources, such as Minikube. If you do want to specify resources, uncomment the following
   ## lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  ##  airbyte-api-server.resources.limits [object] The resources limits for the airbyte-api-server container
-  ##  airbyte-api-server.resources.requests [object] The requested resources for the airbyte-api-server container
+  ##  workload-api.resources.limits [object] The resources limits for the airbyte-workload-api-server container
+  ##  workload-api.resources.requests [object] The requested resources for the airbyte-workload-api-server container
   resources:
     ## Example:
     ## limits:
@@ -1886,7 +1886,7 @@ airbyte-workload-api-server:
     requests: {}
 
 
-  ##  airbyte-api-server.log.level The log level to log at.
+  ##  airbyte-workload-api-server.log.level The log level to log at.
   log:
     level: "INFO"
 
@@ -1895,13 +1895,13 @@ airbyte-workload-api-server:
   service:
     port: 80
 
-  ## Configure the ingress resource that allows you to access the Airbyte API.
+  ## Configure the ingress resource that allows you to access the Airbyte Workload API.
   ## ref: http://kubernetes.io/docs/user-guide/ingress/
-  ##  webapp.ingress.enabled Set to true to enable ingress record generation
-  ##  webapp.ingress.className Specifies ingressClassName for clusters >= 1.18+
-  ##  webapp.ingress.annotations [object] Ingress annotations done as key:value pairs
-  ##  webapp.ingress.hosts The list of hostnames to be covered with this ingress record.
-  ##  webapp.ingress.tls [array] Custom ingress TLS configuration
+  ##  workload-api.ingress.enabled Set to true to enable ingress record generation
+  ##  workload-api.ingress.className Specifies ingressClassName for clusters >= 1.18+
+  ##  workload-api.ingress.annotations [object] Ingress annotations done as key:value pairs
+  ##  workload-api.ingress.hosts The list of hostnames to be covered with this ingress record.
+  ##  workload-api.ingress.tls [array] Custom ingress TLS configuration
   ingress:
     enabled: false
     className: ""