diff --git a/airbyte-bootloader/Dockerfile b/airbyte-bootloader/Dockerfile index a56c186400580..c3a1e96da4a92 100644 --- a/airbyte-bootloader/Dockerfile +++ b/airbyte-bootloader/Dockerfile @@ -7,4 +7,4 @@ WORKDIR /app ADD bin/${APPLICATION}-0.33.11-alpha.tar /app -ENTRYPOINT ["/bin/bash", "-c", "${APPLICATION}-0.33.3-alpha/bin/${APPLICATION}"] +ENTRYPOINT ["/bin/bash", "-c", "${APPLICATION}-0.33.11-alpha/bin/${APPLICATION}"] diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml index f9f121952d519..94071dfe55956 100644 --- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml @@ -3508,7 +3508,7 @@ supportsNormalization: false supportsDBT: false supported_destination_sync_modes: [] -- dockerImage: "airbyte/source-mailchimp:0.2.8" +- dockerImage: "airbyte/source-mailchimp:0.2.9" spec: documentationUrl: "https://docs.airbyte.io/integrations/sources/mailchimp" connectionSpecification: diff --git a/kube/overlays/dev-integration-test/kustomization.yaml b/kube/overlays/dev-integration-test/kustomization.yaml index e0fc89332827b..8862c110d0931 100644 --- a/kube/overlays/dev-integration-test/kustomization.yaml +++ b/kube/overlays/dev-integration-test/kustomization.yaml @@ -29,5 +29,4 @@ secretGenerator: env: .secrets patchesStrategicMerge: - - pod-antiaffinity.yaml - parallelize-worker.yaml diff --git a/kube/overlays/dev-integration-test/pod-antiaffinity.yaml b/kube/overlays/dev-integration-test/pod-antiaffinity.yaml deleted file mode 100644 index 943718318fd01..0000000000000 --- a/kube/overlays/dev-integration-test/pod-antiaffinity.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# adds anti-affinity between the server and scheduler to make sure we aren't -# accidentally using anything shared that requires a single node for both pods -apiVersion: apps/v1 -kind: Deployment -metadata: - name: airbyte-scheduler -spec: - template: - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: airbyte - operator: In - values: - - server - topologyKey: kubernetes.io/hostname diff --git a/tools/bin/acceptance_test_kube.sh b/tools/bin/acceptance_test_kube.sh index 7eb6f9a9a4ed9..08cce16bcb792 100755 --- a/tools/bin/acceptance_test_kube.sh +++ b/tools/bin/acceptance_test_kube.sh @@ -25,19 +25,6 @@ echo "Waiting for server and scheduler to be ready..." kubectl wait --for=condition=Available deployment/airbyte-server --timeout=300s || (kubectl describe pods && exit 1) kubectl wait --for=condition=Available deployment/airbyte-scheduler --timeout=300s || (kubectl describe pods && exit 1) -echo "Checking if scheduler and server are being scheduled on separate nodes..." -if [ -n "$IS_MINIKUBE" ]; then - SCHEDULER_NODE=$(kubectl get pod -o=custom-columns=NAME:.metadata.name,NODE:.spec.nodeName | grep scheduler | awk '{print $2}') - SERVER_NODE=$(kubectl get pod -o=custom-columns=NAME:.metadata.name,NODE:.spec.nodeName | grep server | awk '{print $2}') - - if [ "$SCHEDULER_NODE" = "$SERVER_NODE" ]; then - echo "Scheduler and server were scheduled on the same node! This should not be the case for testing!" - exit 1 - else - echo "Scheduler and server were scheduled on different nodes." - fi -fi - echo "Listing nodes scheduled for pods..." kubectl describe pods | grep "Name\|Node"