From eda89bc0994b924c89a07063af197666de978aa7 Mon Sep 17 00:00:00 2001 From: Gaganpreet Kaberwal Date: Tue, 3 Sep 2024 16:13:32 -0400 Subject: [PATCH 01/17] downgrading version and updating to prod values --- charts/airbyte/Chart.lock | 30 ++++----- charts/airbyte/Chart.yaml | 28 ++++---- charts/airbyte/values.yaml | 131 ++++++++++++++++++++----------------- 3 files changed, 100 insertions(+), 89 deletions(-) diff --git a/charts/airbyte/Chart.lock b/charts/airbyte/Chart.lock index 72257e1a43b..b9bc726d0ad 100644 --- a/charts/airbyte/Chart.lock +++ b/charts/airbyte/Chart.lock @@ -4,42 +4,42 @@ dependencies: version: 1.17.1 - name: airbyte-bootloader repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: temporal repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: webapp repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: server repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: worker repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: workload-api-server repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: workload-launcher repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: pod-sweeper repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: metrics repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: cron repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: connector-builder-server repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: keycloak repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: keycloak-setup repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 -digest: sha256:9a4f93e942a4acd24b49d262a244f55c87958e0bea85c9e5beb7bba685bfaa63 -generated: "2024-08-30T21:37:23.590490603Z" + version: 0.453.2 +digest: sha256:9ee8a91b0b74c9c7fe8988a561c8f7f1725589abb28076673e1e746d4dd17d1e +generated: "2024-08-20T18:25:57.389626785Z" diff --git a/charts/airbyte/Chart.yaml b/charts/airbyte/Chart.yaml index b94ca74d2a2..c934f881d04 100644 --- a/charts/airbyte/Chart.yaml +++ b/charts/airbyte/Chart.yaml @@ -19,7 +19,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.524.0 +version: 0.453.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to @@ -36,52 +36,52 @@ dependencies: - condition: airbyte-bootloader.enabled name: airbyte-bootloader repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: temporal.enabled name: temporal repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: webapp.enabled name: webapp repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: server.enabled name: server repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: worker.enabled name: worker repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: workload-api-server.enabled name: workload-api-server repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: workload-launcher.enabled name: workload-launcher repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: pod-sweeper.enabled name: pod-sweeper repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: metrics.enabled name: metrics repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: cron.enabled name: cron repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: connector-builder-server.enabled name: connector-builder-server repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: keycloak.enabled name: keycloak repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: keycloak-setup.enabled name: keycloak-setup repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml index f7adbd00f3e..0d7db76e1c0 100644 --- a/charts/airbyte/values.yaml +++ b/charts/airbyte/values.yaml @@ -17,6 +17,7 @@ global: secretName: "airbyte-config-secrets" # -- The key within `licenseKeySecretName` where the Airbyte license key is stored licenseKeySecretKey: "license-key" + workloadsOptIn: false # -- The URL where Airbyte will be reached; This should match your Ingress host airbyteUrl: "" @@ -56,57 +57,46 @@ global: # clientSecretSecretKey: "client-secret" # -- Environment variables - env_vars: {} + env_vars: + SIDECAR_KUBE_CPU_LIMIT: "4" # -- Database configuration database: - type: "internal" # "external" + type: "external" # "external" # -- Secret name where database credentials are stored - secretName: "" # e.g. "airbyte-config-secrets" + secretName: "airbyte-config-secrets" # e.g. "airbyte-config-secrets" # -- The database host - host: "" + host: "172.201.1.13" # -- The database port - port: "" + port: "5432" # -- The database name - database: "" + database: "airbyte-prod" # -- The database user - user: "" + user: "airbyte" # -- The key within `secretName` where the user is stored #userSecretKey: "" # e.g. "database-user" # -- The database password - password: "" - # -- The key within `secretName` where the password is stored - #passwordSecretKey: "" # e.g."database-password" + # password: "" + # -- The key within `secretName` where password is stored + passwordSecretKey: "database-password" # e.g."database-password" storage: - # -- The storage backend type. Supports s3, gcs, minio (default) - type: minio # default storage used - # -- Secret name where storage provider credentials are stored - #storageSecretName: "airbyte-config-secrets" - - # S3 - #bucket: ## S3 bucket names that you've created. We recommend storing the following all in one bucket. - # log: airbyte-bucket - # state: airbyte-bucket - # workloadOutput: airbyte-bucket - #s3: - # region: "" ## e.g. us-east-1 - # authenticationType: credentials ## Use "credentials" or "instanceProfile" - - # GCS - #bucket: ## GCS bucket names that you've created. We recommend storing the following all in one bucket. - # log: airbyte-bucket - # state: airbyte-bucket - # workloadOutput: airbyte-bucket - #gcs: - # projectId: - # credentialsJson: /secrets/gcs-log-creds/gcp.json + type: "gcs" + storageSecretName: airbyte-gcs-storage-secrets + bucket: ## GCS bucket names that you've created. We recommend storing the following all in one bucket. + log: mejuri-prod-airbyte-storage + state: mejuri-prod-airbyte-storage + workloadOutput: mejuri-prod-airbyte-storage + gcs: + projectId: mejuri-prod + credentialsPath: /secrets/gcs-log-creds/gcp.json + credentialsJson: {} metrics: # -- The metric client to configure globally. Supports "otel" @@ -121,17 +111,17 @@ global: jobs: resources: ## Example: - ## requests: - ## memory: 256Mi - ## cpu: 250m + requests: + cpu: 2 + memory: 6Gi # -- Job resource requests - requests: {} + # requests: {} ## Example: - ## limits: - ## cpu: 200m - ## memory: 1Gi + limits: + cpu: 4 + memory: 12Gi # -- Job resource limits - limits: {} + # limits: {} kube: ## JOB_KUBE_ANNOTATIONS @@ -147,12 +137,17 @@ global: ## JOB_KUBE_NODE_SELECTORS ## pod node selector of the sync job and the default pod node selector fallback for others jobs # -- Node labels for pod assignment - nodeSelector: {} + nodeSelector: + cloud.google.com/gke-nodepool: airbyte-jobs-nodepool-prod ## JOB_KUBE_TOLERATIONS # -- Node tolerations for pod assignment # Any boolean values should be quoted to ensure the value is passed through as a string. - tolerations: [] + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "jobs" + effect: "NoSchedule" ## JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_SECRET # -- image pull secret to use for job pod @@ -306,14 +301,14 @@ webapp: className: "" # -- Ingress annotations done as key:value pairs annotations: {} - # kubernetes.io/ingress.class: nginx + # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" # -- The list of hostnames to be covered with this ingress record. hosts: [] - # - host: chart-example.local - # paths: - # - path: / - # pathType: ImplementationSpecific + # - host: airbyte.gcp.mejuri.com + # paths: + # - path: / + # pathType: ImplementationSpecific # -- Custom ingress TLS configuration tls: [] # - secretName: chart-example-tls @@ -625,7 +620,7 @@ server: log: # -- The log level to log at - level: "INFO" + level: "DEBUG" ## Examples (when using `server.containerSecurityContext.readOnlyRootFilesystem=true`): ## extraVolumeMounts: @@ -785,19 +780,27 @@ worker: ## cpu: 200m ## memory: 1Gi #! -- The resources limits for the worker container - limits: {} + limits: + memory: 8Gi ## Examples: ## requests: ## memory: 256Mi ## cpu: 250m # -- The requested resources for the worker container - requests: {} + requests: + memory: 2Gi + cpu: 2 # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: {} + nodeSelector: + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for worker pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -805,7 +808,7 @@ worker: log: #! -- The log level to log at. - level: "INFO" + level: "DEBUG" ## Example: ## @@ -813,7 +816,15 @@ worker: ## - name: JOB_KUBE_TOLERATIONS ## value: "key=airbyte-server,operator=Equals,value=true,effect=NoSchedule" # -- Additional env vars for worker pods - extraEnv: [] + extraEnv: + - name: MAX_SYNC_WORKERS + value: "20" + - name: REPLICATION_ORCHESTRATOR_CPU_LIMIT + value: "4" + - name: REPLICATION_ORCHESTRATOR_MEMORY_LIMIT + value: "12Gi" + - name: SOCAT_KUBE_CPU_LIMIT + value: "2" ## Examples (when using `worker.containerSecurityContext.readOnlyRootFilesystem=true`): ## extraVolumeMounts: @@ -832,7 +843,7 @@ worker: extraContainers: [] hpa: - enabled: false + enabled: true debug: enabled: false @@ -944,7 +955,7 @@ workload-launcher: log: # -- The log level to log at - level: "INFO" + level: "DEBUG" ## Example: ## @@ -1373,7 +1384,7 @@ temporal: # PostgreSQL chart configuration, see https://github.com/bitnami/charts/blob/master/bitnami/postgresql/values.yaml postgresql: # -- Switch to enable or disable the PostgreSQL helm chart - enabled: true + enabled: false ## image.repository Repository for airbyte-db statefulset image: @@ -1559,7 +1570,7 @@ cron: log: # -- The log level to log at. - level: "INFO" + level: "DEBUG" ## Examples (when using `cron.containerSecurityContext.readOnlyRootFilesystem=true`): ## extraVolumeMounts: @@ -1720,7 +1731,7 @@ connector-builder-server: log: # -- The log level to log at. - level: "INFO" + level: "DEBUG" env_vars: {} service: @@ -1921,7 +1932,7 @@ workload-api-server: log: # -- The log level at which to log - level: "INFO" + level: "DEBUG" # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: {} From 8de9ffe53ac352e36dd350d85f5170c4e1c8c948 Mon Sep 17 00:00:00 2001 From: Gaganpreet Kaberwal Date: Wed, 4 Sep 2024 09:49:11 -0400 Subject: [PATCH 02/17] update sql instance ip --- charts/airbyte/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml index 0d7db76e1c0..fb117d34c84 100644 --- a/charts/airbyte/values.yaml +++ b/charts/airbyte/values.yaml @@ -68,7 +68,7 @@ global: secretName: "airbyte-config-secrets" # e.g. "airbyte-config-secrets" # -- The database host - host: "172.201.1.13" + host: "172.201.1.10" # -- The database port port: "5432" From 0a69eeed60e6c417bb778bad1ef66d73f17b20c2 Mon Sep 17 00:00:00 2001 From: Gaganpreet Kaberwal Date: Wed, 4 Sep 2024 15:25:14 -0400 Subject: [PATCH 03/17] update node selector and remove jobs tolerations --- charts/airbyte/values.yaml | 44 ++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml index fb117d34c84..9841b640e21 100644 --- a/charts/airbyte/values.yaml +++ b/charts/airbyte/values.yaml @@ -143,11 +143,7 @@ global: ## JOB_KUBE_TOLERATIONS # -- Node tolerations for pod assignment # Any boolean values should be quoted to ensure the value is passed through as a string. - tolerations: - - key: "airbyte-prod" - operator: "Equal" - value: "jobs" - effect: "NoSchedule" + tolerations: [] ## JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_SECRET # -- image pull secret to use for job pod @@ -283,7 +279,8 @@ webapp: requests: {} # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: {} + nodeSelector: + cloud.google.com/gke-nodepool: mejuri-nodepool-prod # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] @@ -499,7 +496,8 @@ pod-sweeper: requests: {} # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: {} + nodeSelector: + cloud.google.com/gke-nodepool: mejuri-nodepool-prod # -- Tolerations for pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] @@ -609,7 +607,8 @@ server: requests: {} # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: {} + nodeSelector: + cloud.google.com/gke-nodepool: mejuri-nodepool-prod # -- Tolerations for server pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] @@ -944,7 +943,8 @@ workload-launcher: requests: {} # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: {} + nodeSelector: + cloud.google.com/gke-nodepool: mejuri-nodepool-prod # -- Tolerations for workload launcher pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] @@ -982,7 +982,7 @@ workload-launcher: extraContainers: [] hpa: - enabled: false + enabled: true debug: enabled: false @@ -1066,7 +1066,8 @@ metrics: requests: {} # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: {} + nodeSelector: + cloud.google.com/gke-nodepool: mejuri-nodepool-prod # -- Tolerations for metrics-reporter pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] @@ -1120,7 +1121,8 @@ airbyte-bootloader: podLabels: {} # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: {} + nodeSelector: + cloud.google.com/gke-nodepool: mejuri-nodepool-prod # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] @@ -1322,7 +1324,8 @@ temporal: enabled: false # -- Node labels for temporal pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: {} + nodeSelector: + cloud.google.com/gke-nodepool: mejuri-nodepool-prod # -- Tolerations for temporal pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] @@ -1559,7 +1562,8 @@ cron: requests: {} # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: {} + nodeSelector: + cloud.google.com/gke-nodepool: mejuri-nodepool-prod # -- Tolerations for cron pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] @@ -1738,7 +1742,8 @@ connector-builder-server: port: 80 # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: {} + nodeSelector: + cloud.google.com/gke-nodepool: mejuri-nodepool-prod # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] @@ -1792,7 +1797,8 @@ keycloak: type: RuntimeDefault # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: {} + nodeSelector: + cloud.google.com/gke-nodepool: mejuri-nodepool-prod # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] @@ -1935,7 +1941,8 @@ workload-api-server: level: "DEBUG" # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: {} + nodeSelector: + cloud.google.com/gke-nodepool: mejuri-nodepool-prod # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] @@ -2054,7 +2061,8 @@ featureflag-server: level: "INFO" # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: {} + nodeSelector: + cloud.google.com/gke-nodepool: mejuri-nodepool-prod # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] From 685be1938c696c6ca358fc0473a4948ca3212268 Mon Sep 17 00:00:00 2001 From: Gaganpreet Kaberwal Date: Wed, 4 Sep 2024 16:29:11 -0400 Subject: [PATCH 04/17] change log level to info --- charts/airbyte/values.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml index 9841b640e21..206f080ca89 100644 --- a/charts/airbyte/values.yaml +++ b/charts/airbyte/values.yaml @@ -619,7 +619,7 @@ server: log: # -- The log level to log at - level: "DEBUG" + level: "INFO" ## Examples (when using `server.containerSecurityContext.readOnlyRootFilesystem=true`): ## extraVolumeMounts: @@ -807,7 +807,7 @@ worker: log: #! -- The log level to log at. - level: "DEBUG" + level: "INFO" ## Example: ## @@ -955,7 +955,7 @@ workload-launcher: log: # -- The log level to log at - level: "DEBUG" + level: "INFO" ## Example: ## @@ -1574,7 +1574,7 @@ cron: log: # -- The log level to log at. - level: "DEBUG" + level: "INFO" ## Examples (when using `cron.containerSecurityContext.readOnlyRootFilesystem=true`): ## extraVolumeMounts: @@ -1735,7 +1735,7 @@ connector-builder-server: log: # -- The log level to log at. - level: "DEBUG" + level: "INFO" env_vars: {} service: @@ -1938,7 +1938,7 @@ workload-api-server: log: # -- The log level at which to log - level: "DEBUG" + level: "INFO" # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: From 837ff810e8c790b1fc67b559d43c5cb672e45986 Mon Sep 17 00:00:00 2001 From: Gaganpreet Kaberwal Date: Wed, 4 Sep 2024 18:53:19 -0400 Subject: [PATCH 05/17] add airbyte url --- charts/airbyte/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml index 206f080ca89..5c72c624569 100644 --- a/charts/airbyte/values.yaml +++ b/charts/airbyte/values.yaml @@ -20,7 +20,7 @@ global: workloadsOptIn: false # -- The URL where Airbyte will be reached; This should match your Ingress host - airbyteUrl: "" + airbyteUrl: "https://airbyte.gcp.mejuri.com" # -- Auth configuration auth: From 39a466f0c57c21531fdebdb06005d5697717ea44 Mon Sep 17 00:00:00 2001 From: Gaganpreet Kaberwal Date: Thu, 5 Sep 2024 14:11:31 -0400 Subject: [PATCH 06/17] move all main pods to workers nodepool --- charts/airbyte/values.yaml | 134 ++++++++++++++++++++++++++----------- 1 file changed, 94 insertions(+), 40 deletions(-) diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml index 5c72c624569..5d5b0225629 100644 --- a/charts/airbyte/values.yaml +++ b/charts/airbyte/values.yaml @@ -20,7 +20,7 @@ global: workloadsOptIn: false # -- The URL where Airbyte will be reached; This should match your Ingress host - airbyteUrl: "https://airbyte.gcp.mejuri.com" + airbyteUrl: "" # -- Auth configuration auth: @@ -280,10 +280,14 @@ webapp: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for webapp pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -497,10 +501,14 @@ pod-sweeper: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for pod assignment, see https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity affinity: {} @@ -608,10 +616,14 @@ server: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for server pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for server pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -944,10 +956,14 @@ workload-launcher: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for workload launcher pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # Affinity and anti-affinity for workload launcher pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1067,10 +1083,14 @@ metrics: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for metrics-reporter pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for metrics-reporter pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1122,10 +1142,14 @@ airbyte-bootloader: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" ## Bootloader resource requests and limits ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ @@ -1323,12 +1347,16 @@ temporal: # -- Enable readinessProbe on the temporal enabled: false - # -- Node labels for temporal pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ + # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for temporal pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for temporal pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1425,10 +1453,15 @@ postgresql: # -- The order in which the hooks are executed. If weight is lower, it has higher priority helm.sh/hook-weight: "-1" # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: {} + nodeSelector: + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for postgresql pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for postgresql pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1563,10 +1596,14 @@ cron: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for cron pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for cron pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1743,10 +1780,14 @@ connector-builder-server: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for webapp pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1847,10 +1888,15 @@ keycloak-setup: type: RuntimeDefault # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: {} + nodeSelector: + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for webapp pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1942,10 +1988,14 @@ workload-api-server: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for webapp pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -2062,10 +2112,14 @@ featureflag-server: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for webapp pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity From 60f49d80c45218c9d12d1e0f278fadaa2af27a08 Mon Sep 17 00:00:00 2001 From: Gaganpreet Kaberwal Date: Thu, 5 Sep 2024 14:54:11 -0400 Subject: [PATCH 07/17] bug fix for config map --- charts/airbyte/templates/env-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/airbyte/templates/env-configmap.yaml b/charts/airbyte/templates/env-configmap.yaml index fcf19127963..47901069f83 100644 --- a/charts/airbyte/templates/env-configmap.yaml +++ b/charts/airbyte/templates/env-configmap.yaml @@ -34,7 +34,7 @@ data: {{- include "airbyte.database.configVars" . | nindent 2 }} KEYCLOAK_DATABASE_URL: {{ include "airbyte.keycloak.database.url" . | quote }} GOOGLE_APPLICATION_CREDENTIALS: {{ include "airbyte.gcpLogCredentialsPath" . | quote }} - INTERNAL_API_HOST: http://{{ .Release.Name }}-airbyte-server-svc:{{ .Values.server.service.port }} + INTERNAL_API_HOST: {{ .Release.Name }}-airbyte-server-svc:{{ .Values.server.service.port }} {{- if eq (index .Values "workload-api-server" "enabled") true }} # Temporary conditional for OSS deploys. Eventually, the workload-api will be present in OSS deploys and the else # block can be removed From cd70e36e2c53fd99155383109e451a34145f6aad Mon Sep 17 00:00:00 2001 From: Gaganpreet Kaberwal Date: Thu, 5 Sep 2024 15:44:12 -0400 Subject: [PATCH 08/17] add url --- charts/airbyte/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml index 5d5b0225629..1107ae41f44 100644 --- a/charts/airbyte/values.yaml +++ b/charts/airbyte/values.yaml @@ -20,7 +20,7 @@ global: workloadsOptIn: false # -- The URL where Airbyte will be reached; This should match your Ingress host - airbyteUrl: "" + airbyteUrl: "https://airbyte.gcp.mejuri.com" # -- Auth configuration auth: From 5e1d6d039efcb26a2590773d466a8e7f524cd465 Mon Sep 17 00:00:00 2001 From: Gaganpreet Kaberwal Date: Thu, 5 Sep 2024 21:43:09 -0400 Subject: [PATCH 09/17] update chart to latest version --- charts/airbyte/Chart.lock | 30 +++++++++++++++--------------- charts/airbyte/Chart.yaml | 32 ++++++++++++++++++-------------- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/charts/airbyte/Chart.lock b/charts/airbyte/Chart.lock index b9bc726d0ad..72257e1a43b 100644 --- a/charts/airbyte/Chart.lock +++ b/charts/airbyte/Chart.lock @@ -4,42 +4,42 @@ dependencies: version: 1.17.1 - name: airbyte-bootloader repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - name: temporal repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - name: webapp repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - name: server repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - name: worker repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - name: workload-api-server repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - name: workload-launcher repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - name: pod-sweeper repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - name: metrics repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - name: cron repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - name: connector-builder-server repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - name: keycloak repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - name: keycloak-setup repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 -digest: sha256:9ee8a91b0b74c9c7fe8988a561c8f7f1725589abb28076673e1e746d4dd17d1e -generated: "2024-08-20T18:25:57.389626785Z" + version: 0.524.0 +digest: sha256:9a4f93e942a4acd24b49d262a244f55c87958e0bea85c9e5beb7bba685bfaa63 +generated: "2024-08-30T21:37:23.590490603Z" diff --git a/charts/airbyte/Chart.yaml b/charts/airbyte/Chart.yaml index c934f881d04..70dc0e6b4f5 100644 --- a/charts/airbyte/Chart.yaml +++ b/charts/airbyte/Chart.yaml @@ -19,7 +19,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.453.2 +version: 0.524.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to @@ -36,52 +36,56 @@ dependencies: - condition: airbyte-bootloader.enabled name: airbyte-bootloader repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - condition: temporal.enabled name: temporal repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 + - condition: temporal-ui.enabled + name: temporal-ui + repository: https://airbytehq.github.io/helm-charts/ + version: 0.1.0 - condition: webapp.enabled name: webapp repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - condition: server.enabled name: server repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - condition: worker.enabled name: worker repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - condition: workload-api-server.enabled name: workload-api-server repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - condition: workload-launcher.enabled name: workload-launcher repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - condition: pod-sweeper.enabled name: pod-sweeper repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - condition: metrics.enabled name: metrics repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - condition: cron.enabled name: cron repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - condition: connector-builder-server.enabled name: connector-builder-server repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - condition: keycloak.enabled name: keycloak repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 - condition: keycloak-setup.enabled name: keycloak-setup repository: https://airbytehq.github.io/helm-charts/ - version: 0.453.2 + version: 0.524.0 From 7dadd694f66141dbfcd31d6ed38243f81d4d8fa1 Mon Sep 17 00:00:00 2001 From: Gaganpreet Kaberwal Date: Thu, 5 Sep 2024 22:11:26 -0400 Subject: [PATCH 10/17] fix --- charts/airbyte/Chart.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/charts/airbyte/Chart.yaml b/charts/airbyte/Chart.yaml index 70dc0e6b4f5..b94ca74d2a2 100644 --- a/charts/airbyte/Chart.yaml +++ b/charts/airbyte/Chart.yaml @@ -41,10 +41,6 @@ dependencies: name: temporal repository: https://airbytehq.github.io/helm-charts/ version: 0.524.0 - - condition: temporal-ui.enabled - name: temporal-ui - repository: https://airbytehq.github.io/helm-charts/ - version: 0.1.0 - condition: webapp.enabled name: webapp repository: https://airbytehq.github.io/helm-charts/ From 55bc04c3c7d0c555ed21c3b6599686e814d3318d Mon Sep 17 00:00:00 2001 From: Gaganpreet Kaberwal Date: Thu, 5 Sep 2024 22:22:29 -0400 Subject: [PATCH 11/17] update internal api host name again --- charts/airbyte/templates/env-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/airbyte/templates/env-configmap.yaml b/charts/airbyte/templates/env-configmap.yaml index 47901069f83..fcf19127963 100644 --- a/charts/airbyte/templates/env-configmap.yaml +++ b/charts/airbyte/templates/env-configmap.yaml @@ -34,7 +34,7 @@ data: {{- include "airbyte.database.configVars" . | nindent 2 }} KEYCLOAK_DATABASE_URL: {{ include "airbyte.keycloak.database.url" . | quote }} GOOGLE_APPLICATION_CREDENTIALS: {{ include "airbyte.gcpLogCredentialsPath" . | quote }} - INTERNAL_API_HOST: {{ .Release.Name }}-airbyte-server-svc:{{ .Values.server.service.port }} + INTERNAL_API_HOST: http://{{ .Release.Name }}-airbyte-server-svc:{{ .Values.server.service.port }} {{- if eq (index .Values "workload-api-server" "enabled") true }} # Temporary conditional for OSS deploys. Eventually, the workload-api will be present in OSS deploys and the else # block can be removed From 60b763cb4ddce474063eda9dd8103a8b45214769 Mon Sep 17 00:00:00 2001 From: Gaganpreet Kaberwal Date: Thu, 5 Sep 2024 22:48:56 -0400 Subject: [PATCH 12/17] add internal api host again --- charts/airbyte/templates/env-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/airbyte/templates/env-configmap.yaml b/charts/airbyte/templates/env-configmap.yaml index fcf19127963..47901069f83 100644 --- a/charts/airbyte/templates/env-configmap.yaml +++ b/charts/airbyte/templates/env-configmap.yaml @@ -34,7 +34,7 @@ data: {{- include "airbyte.database.configVars" . | nindent 2 }} KEYCLOAK_DATABASE_URL: {{ include "airbyte.keycloak.database.url" . | quote }} GOOGLE_APPLICATION_CREDENTIALS: {{ include "airbyte.gcpLogCredentialsPath" . | quote }} - INTERNAL_API_HOST: http://{{ .Release.Name }}-airbyte-server-svc:{{ .Values.server.service.port }} + INTERNAL_API_HOST: {{ .Release.Name }}-airbyte-server-svc:{{ .Values.server.service.port }} {{- if eq (index .Values "workload-api-server" "enabled") true }} # Temporary conditional for OSS deploys. Eventually, the workload-api will be present in OSS deploys and the else # block can be removed From c0e8ce1032e1b57bb3176d7cc3eec56f1c116fa0 Mon Sep 17 00:00:00 2001 From: Gaganpreet Kaberwal Date: Fri, 6 Sep 2024 10:09:10 -0400 Subject: [PATCH 13/17] reverting --- charts/airbyte/templates/env-configmap.yaml | 2 +- charts/airbyte/values.yaml | 132 ++++++-------------- 2 files changed, 40 insertions(+), 94 deletions(-) diff --git a/charts/airbyte/templates/env-configmap.yaml b/charts/airbyte/templates/env-configmap.yaml index 47901069f83..fcf19127963 100644 --- a/charts/airbyte/templates/env-configmap.yaml +++ b/charts/airbyte/templates/env-configmap.yaml @@ -34,7 +34,7 @@ data: {{- include "airbyte.database.configVars" . | nindent 2 }} KEYCLOAK_DATABASE_URL: {{ include "airbyte.keycloak.database.url" . | quote }} GOOGLE_APPLICATION_CREDENTIALS: {{ include "airbyte.gcpLogCredentialsPath" . | quote }} - INTERNAL_API_HOST: {{ .Release.Name }}-airbyte-server-svc:{{ .Values.server.service.port }} + INTERNAL_API_HOST: http://{{ .Release.Name }}-airbyte-server-svc:{{ .Values.server.service.port }} {{- if eq (index .Values "workload-api-server" "enabled") true }} # Temporary conditional for OSS deploys. Eventually, the workload-api will be present in OSS deploys and the else # block can be removed diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml index 1107ae41f44..5c72c624569 100644 --- a/charts/airbyte/values.yaml +++ b/charts/airbyte/values.yaml @@ -280,14 +280,10 @@ webapp: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod + cloud.google.com/gke-nodepool: mejuri-nodepool-prod - # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: - - key: "airbyte-prod" - operator: "Equal" - value: "workers" - effect: "NoSchedule" + # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: [] # -- Affinity and anti-affinity for webapp pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -501,14 +497,10 @@ pod-sweeper: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod + cloud.google.com/gke-nodepool: mejuri-nodepool-prod - # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: - - key: "airbyte-prod" - operator: "Equal" - value: "workers" - effect: "NoSchedule" + # -- Tolerations for pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: [] # -- Affinity and anti-affinity for pod assignment, see https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity affinity: {} @@ -616,14 +608,10 @@ server: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod + cloud.google.com/gke-nodepool: mejuri-nodepool-prod - # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: - - key: "airbyte-prod" - operator: "Equal" - value: "workers" - effect: "NoSchedule" + # -- Tolerations for server pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: [] # -- Affinity and anti-affinity for server pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -956,14 +944,10 @@ workload-launcher: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod + cloud.google.com/gke-nodepool: mejuri-nodepool-prod - # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: - - key: "airbyte-prod" - operator: "Equal" - value: "workers" - effect: "NoSchedule" + # -- Tolerations for workload launcher pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: [] # Affinity and anti-affinity for workload launcher pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1083,14 +1067,10 @@ metrics: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod + cloud.google.com/gke-nodepool: mejuri-nodepool-prod - # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: - - key: "airbyte-prod" - operator: "Equal" - value: "workers" - effect: "NoSchedule" + # -- Tolerations for metrics-reporter pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: [] # -- Affinity and anti-affinity for metrics-reporter pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1142,14 +1122,10 @@ airbyte-bootloader: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod + cloud.google.com/gke-nodepool: mejuri-nodepool-prod # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: - - key: "airbyte-prod" - operator: "Equal" - value: "workers" - effect: "NoSchedule" + tolerations: [] ## Bootloader resource requests and limits ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ @@ -1347,16 +1323,12 @@ temporal: # -- Enable readinessProbe on the temporal enabled: false - # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ + # -- Node labels for temporal pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod + cloud.google.com/gke-nodepool: mejuri-nodepool-prod - # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: - - key: "airbyte-prod" - operator: "Equal" - value: "workers" - effect: "NoSchedule" + # -- Tolerations for temporal pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: [] # -- Affinity and anti-affinity for temporal pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1453,15 +1425,10 @@ postgresql: # -- The order in which the hooks are executed. If weight is lower, it has higher priority helm.sh/hook-weight: "-1" # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: - cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod + nodeSelector: {} - # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: - - key: "airbyte-prod" - operator: "Equal" - value: "workers" - effect: "NoSchedule" + # -- Tolerations for postgresql pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: [] # -- Affinity and anti-affinity for postgresql pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1596,14 +1563,10 @@ cron: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod + cloud.google.com/gke-nodepool: mejuri-nodepool-prod - # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: - - key: "airbyte-prod" - operator: "Equal" - value: "workers" - effect: "NoSchedule" + # -- Tolerations for cron pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: [] # -- Affinity and anti-affinity for cron pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1780,14 +1743,10 @@ connector-builder-server: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod + cloud.google.com/gke-nodepool: mejuri-nodepool-prod - # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: - - key: "airbyte-prod" - operator: "Equal" - value: "workers" - effect: "NoSchedule" + # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: [] # -- Affinity and anti-affinity for webapp pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1888,15 +1847,10 @@ keycloak-setup: type: RuntimeDefault # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: - cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod + nodeSelector: {} - # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: - - key: "airbyte-prod" - operator: "Equal" - value: "workers" - effect: "NoSchedule" + # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: [] # -- Affinity and anti-affinity for webapp pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1988,14 +1942,10 @@ workload-api-server: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod + cloud.google.com/gke-nodepool: mejuri-nodepool-prod - # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: - - key: "airbyte-prod" - operator: "Equal" - value: "workers" - effect: "NoSchedule" + # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: [] # -- Affinity and anti-affinity for webapp pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -2112,14 +2062,10 @@ featureflag-server: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod + cloud.google.com/gke-nodepool: mejuri-nodepool-prod - # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: - - key: "airbyte-prod" - operator: "Equal" - value: "workers" - effect: "NoSchedule" + # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: [] # -- Affinity and anti-affinity for webapp pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity From c7630a6e21d8e6206ee41e9796a1e2899f882045 Mon Sep 17 00:00:00 2001 From: Gaganpreet Kaberwal Date: Fri, 6 Sep 2024 10:23:54 -0400 Subject: [PATCH 14/17] test --- charts/airbyte/templates/env-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/airbyte/templates/env-configmap.yaml b/charts/airbyte/templates/env-configmap.yaml index fcf19127963..47901069f83 100644 --- a/charts/airbyte/templates/env-configmap.yaml +++ b/charts/airbyte/templates/env-configmap.yaml @@ -34,7 +34,7 @@ data: {{- include "airbyte.database.configVars" . | nindent 2 }} KEYCLOAK_DATABASE_URL: {{ include "airbyte.keycloak.database.url" . | quote }} GOOGLE_APPLICATION_CREDENTIALS: {{ include "airbyte.gcpLogCredentialsPath" . | quote }} - INTERNAL_API_HOST: http://{{ .Release.Name }}-airbyte-server-svc:{{ .Values.server.service.port }} + INTERNAL_API_HOST: {{ .Release.Name }}-airbyte-server-svc:{{ .Values.server.service.port }} {{- if eq (index .Values "workload-api-server" "enabled") true }} # Temporary conditional for OSS deploys. Eventually, the workload-api will be present in OSS deploys and the else # block can be removed From 050bd5edcb2e46a933ea32a0682e4d1d76b93faf Mon Sep 17 00:00:00 2001 From: Gaganpreet Kaberwal Date: Fri, 6 Sep 2024 10:31:19 -0400 Subject: [PATCH 15/17] test --- charts/airbyte/templates/env-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/airbyte/templates/env-configmap.yaml b/charts/airbyte/templates/env-configmap.yaml index 47901069f83..fcf19127963 100644 --- a/charts/airbyte/templates/env-configmap.yaml +++ b/charts/airbyte/templates/env-configmap.yaml @@ -34,7 +34,7 @@ data: {{- include "airbyte.database.configVars" . | nindent 2 }} KEYCLOAK_DATABASE_URL: {{ include "airbyte.keycloak.database.url" . | quote }} GOOGLE_APPLICATION_CREDENTIALS: {{ include "airbyte.gcpLogCredentialsPath" . | quote }} - INTERNAL_API_HOST: {{ .Release.Name }}-airbyte-server-svc:{{ .Values.server.service.port }} + INTERNAL_API_HOST: http://{{ .Release.Name }}-airbyte-server-svc:{{ .Values.server.service.port }} {{- if eq (index .Values "workload-api-server" "enabled") true }} # Temporary conditional for OSS deploys. Eventually, the workload-api will be present in OSS deploys and the else # block can be removed From 821aee218d68836bd51c30d8fcd4018392946859 Mon Sep 17 00:00:00 2001 From: Gaganpreet Kaberwal Date: Fri, 6 Sep 2024 10:52:12 -0400 Subject: [PATCH 16/17] test --- charts/airbyte/values.yaml | 134 ++++++++++++++++++++++++++----------- 1 file changed, 94 insertions(+), 40 deletions(-) diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml index 5c72c624569..5d5b0225629 100644 --- a/charts/airbyte/values.yaml +++ b/charts/airbyte/values.yaml @@ -20,7 +20,7 @@ global: workloadsOptIn: false # -- The URL where Airbyte will be reached; This should match your Ingress host - airbyteUrl: "https://airbyte.gcp.mejuri.com" + airbyteUrl: "" # -- Auth configuration auth: @@ -280,10 +280,14 @@ webapp: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for webapp pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -497,10 +501,14 @@ pod-sweeper: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for pod assignment, see https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity affinity: {} @@ -608,10 +616,14 @@ server: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for server pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for server pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -944,10 +956,14 @@ workload-launcher: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for workload launcher pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # Affinity and anti-affinity for workload launcher pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1067,10 +1083,14 @@ metrics: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for metrics-reporter pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for metrics-reporter pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1122,10 +1142,14 @@ airbyte-bootloader: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" ## Bootloader resource requests and limits ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ @@ -1323,12 +1347,16 @@ temporal: # -- Enable readinessProbe on the temporal enabled: false - # -- Node labels for temporal pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ + # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for temporal pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for temporal pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1425,10 +1453,15 @@ postgresql: # -- The order in which the hooks are executed. If weight is lower, it has higher priority helm.sh/hook-weight: "-1" # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: {} + nodeSelector: + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for postgresql pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for postgresql pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1563,10 +1596,14 @@ cron: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for cron pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for cron pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1743,10 +1780,14 @@ connector-builder-server: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for webapp pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1847,10 +1888,15 @@ keycloak-setup: type: RuntimeDefault # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: {} + nodeSelector: + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for webapp pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -1942,10 +1988,14 @@ workload-api-server: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for webapp pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity @@ -2062,10 +2112,14 @@ featureflag-server: # -- Node labels for pod assignment, see https://kubernetes.io/docs/user-guide/node-selection/ nodeSelector: - cloud.google.com/gke-nodepool: mejuri-nodepool-prod + cloud.google.com/gke-nodepool: airbyte-workers-nodepool-prod - # -- Tolerations for webapp pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [] + # -- Tolerations for worker pod assignment, see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: + - key: "airbyte-prod" + operator: "Equal" + value: "workers" + effect: "NoSchedule" # -- Affinity and anti-affinity for webapp pod assignment, see # https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity From 4440f0683e17fa06922fc64e8b36e5d85a421f60 Mon Sep 17 00:00:00 2001 From: Gaganpreet Kaberwal Date: Fri, 6 Sep 2024 12:50:32 -0400 Subject: [PATCH 17/17] downgrade chart version --- charts/airbyte/Chart.lock | 30 +++++++++++++++--------------- charts/airbyte/Chart.yaml | 31 ++++++++++++++----------------- 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/charts/airbyte/Chart.lock b/charts/airbyte/Chart.lock index 72257e1a43b..b9bc726d0ad 100644 --- a/charts/airbyte/Chart.lock +++ b/charts/airbyte/Chart.lock @@ -4,42 +4,42 @@ dependencies: version: 1.17.1 - name: airbyte-bootloader repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: temporal repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: webapp repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: server repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: worker repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: workload-api-server repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: workload-launcher repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: pod-sweeper repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: metrics repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: cron repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: connector-builder-server repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: keycloak repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - name: keycloak-setup repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 -digest: sha256:9a4f93e942a4acd24b49d262a244f55c87958e0bea85c9e5beb7bba685bfaa63 -generated: "2024-08-30T21:37:23.590490603Z" + version: 0.453.2 +digest: sha256:9ee8a91b0b74c9c7fe8988a561c8f7f1725589abb28076673e1e746d4dd17d1e +generated: "2024-08-20T18:25:57.389626785Z" diff --git a/charts/airbyte/Chart.yaml b/charts/airbyte/Chart.yaml index b94ca74d2a2..5f33e2fa6b1 100644 --- a/charts/airbyte/Chart.yaml +++ b/charts/airbyte/Chart.yaml @@ -1,6 +1,3 @@ -### This Chart.yaml file is used for local testing purposes -### If you want to test the chart before creating PR, rename this file into Chart.yaml and test the deployment - apiVersion: v2 name: airbyte description: Helm chart to deploy airbyte @@ -19,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.524.0 +version: 0.453.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to @@ -36,52 +33,52 @@ dependencies: - condition: airbyte-bootloader.enabled name: airbyte-bootloader repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: temporal.enabled name: temporal repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: webapp.enabled name: webapp repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: server.enabled name: server repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: worker.enabled name: worker repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: workload-api-server.enabled name: workload-api-server repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: workload-launcher.enabled name: workload-launcher repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: pod-sweeper.enabled name: pod-sweeper repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: metrics.enabled name: metrics repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: cron.enabled name: cron repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: connector-builder-server.enabled name: connector-builder-server repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: keycloak.enabled name: keycloak repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2 - condition: keycloak-setup.enabled name: keycloak-setup repository: https://airbytehq.github.io/helm-charts/ - version: 0.524.0 + version: 0.453.2