Skip to content

Commit 20fb06b

Browse files
perangelperangel
authored
Merge branch 'master' into perangel/abc-3569/find-a-pat-script-should-fail-build
2 parents 8ab315c + b4b79ab commit 20fb06b

File tree

68 files changed

+805
-126
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+805
-126
lines changed

‎.bumpversion.cfg

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.40.21
2+
current_version = 0.40.22
33
commit = False
44
tag = False
55
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?
@@ -42,6 +42,8 @@ serialize =
4242

4343
[bumpversion:file:charts/airbyte/Chart.yaml]
4444

45+
[bumpversion:file:charts/airbyte-connector-builder-server/Chart.yaml]
46+
4547
[bumpversion:file:charts/airbyte/README.md]
4648

4749
[bumpversion:file:docs/operator-guides/upgrading-airbyte.md]

‎.env

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111

1212
### SHARED ###
13-
VERSION=0.40.21
13+
VERSION=0.40.22
1414

1515
# When using the airbyte-db via default docker image
1616
CONFIG_ROOT=/data
@@ -61,6 +61,7 @@ CONNECTOR_BUILDER_API_HOST=airbyte-connector-builder-server:80
6161
WEBAPP_URL=http://localhost:8000/
6262
# Although not present as an env var, required for webapp configuration.
6363
API_URL=/api/v1/
64+
CONNECTOR_BUILDER_API_URL=/connector-builder-api
6465

6566
### JOBS ###
6667
# Relevant to scaling.

‎.github/workflows/publish-helm-charts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
- name: "Helm package"
7171
shell: bash
7272
run: |
73-
declare -a StringArray=("airbyte-bootloader" "airbyte-server" "airbyte-temporal" "airbyte-webapp" "airbyte-pod-sweeper" "airbyte-worker" "airbyte-metrics" "airbyte-cron")
73+
declare -a StringArray=("airbyte-bootloader" "airbyte-server" "airbyte-temporal" "airbyte-webapp" "airbyte-pod-sweeper" "airbyte-worker" "airbyte-metrics" "airbyte-cron" "airbyte-connector-builder-server")
7474
for val in ${StringArray[@]}; do
7575
cd ./airbyte/charts/${val} && helm dep update && cd $GITHUB_WORKSPACE
7676
sed -i -E 's/version: \"[0-9]+\.[0-9]+\.[0-9]+\"/version: \"${{ needs.generate-semantic-version.outputs.next-version }}\"/' ./airbyte/charts/${val}/Chart.yaml

‎airbyte-bootloader/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG JDK_IMAGE=airbyte/airbyte-base-java-image:1.0
22
FROM ${JDK_IMAGE}
33

4-
ARG VERSION=0.40.21
4+
ARG VERSION=0.40.22
55

66
ENV APPLICATION airbyte-bootloader
77
ENV VERSION ${VERSION}

‎airbyte-connector-builder-server/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ RUN pip install --no-cache-dir .
1010

1111
ENTRYPOINT ["uvicorn", "connector_builder.entrypoint:app", "--host", "0.0.0.0", "--port", "80"]
1212

13-
LABEL io.airbyte.version=0.40.21
13+
LABEL io.airbyte.version=0.40.22
1414
LABEL io.airbyte.name=airbyte/connector-builder-server

‎airbyte-connector-builder-server/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
setup(
1616
name="connector-builder-server",
17-
version="0.40.21",
17+
version="0.40.22",
1818
description="",
1919
long_description=README,
2020
author="Airbyte",

‎airbyte-container-orchestrator/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/s
1010
&& chmod +x kubectl && mv kubectl /usr/local/bin/
1111

1212
# Don't change this manually. Bump version expects to make moves based on this string
13-
ARG VERSION=0.40.21
13+
ARG VERSION=0.40.22
1414

1515
ENV APPLICATION airbyte-container-orchestrator
1616
ENV VERSION=${VERSION}

‎airbyte-cron/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG JDK_IMAGE=airbyte/airbyte-base-java-image:1.0
22
FROM ${JDK_IMAGE} AS cron
33

4-
ARG VERSION=0.40.21
4+
ARG VERSION=0.40.22
55

66
ENV APPLICATION airbyte-cron
77
ENV VERSION ${VERSION}

‎airbyte-metrics/reporter/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG JDK_IMAGE=airbyte/airbyte-base-java-image:1.0
22
FROM ${JDK_IMAGE} AS metrics-reporter
33

4-
ARG VERSION=0.40.21
4+
ARG VERSION=0.40.22
55

66
ENV APPLICATION airbyte-metrics-reporter
77
ENV VERSION ${VERSION}

‎airbyte-proxy/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22

33
FROM nginx:latest
44

5-
ARG VERSION=0.40.21
5+
ARG VERSION=0.40.22
66

77
ENV APPLICATION airbyte-proxy
88
ENV VERSION ${VERSION}
99

1010
RUN apt-get update -y && apt-get install -y apache2-utils && rm -rf /var/lib/apt/lists/*
1111

12-
# This variable can be used to update the destintion containers that Nginx proxies to.
12+
# This variable can be used to update the destination containers that Nginx proxies to.
1313
ENV PROXY_PASS_WEB "http://airbyte-webapp:80"
1414
ENV PROXY_PASS_API "http://airbyte-server:8001"
15+
ENV CONNECTOR_BUILDER_SERVER_API "http://airbyte-connector-builder-server:80"
1516

1617
# Nginx config file
1718
WORKDIR /

‎airbyte-proxy/nginx-auth.conf.template

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,25 @@ http {
4242
}
4343
}
4444
}
45+
46+
server {
47+
listen 8003;
48+
49+
location / {
50+
proxy_set_header Host $host;
51+
proxy_set_header X-Real-IP $remote_addr;
52+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
53+
54+
auth_basic "Welcome to Airbyte";
55+
auth_basic_user_file /etc/nginx/.htpasswd;
56+
57+
proxy_pass "${CONNECTOR_BUILDER_SERVER_API}";
58+
59+
error_page 401 /etc/nginx/401.html;
60+
location ~ (401.html)$ {
61+
alias /etc/nginx/$1;
62+
auth_basic off;
63+
}
64+
}
65+
}
4566
}

‎airbyte-proxy/nginx-no-auth.conf.template

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,16 @@ http {
2424
proxy_pass "${PROXY_PASS_API}";
2525
}
2626
}
27+
28+
server {
29+
listen 8003;
30+
31+
location / {
32+
proxy_set_header Host $host;
33+
proxy_set_header X-Real-IP $remote_addr;
34+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
35+
36+
proxy_pass "${CONNECTOR_BUILDER_SERVER_API}";
37+
}
38+
}
2739
}

‎airbyte-proxy/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ else
1616
TEMPLATE_PATH="/etc/nginx/templates/nginx-auth.conf.template"
1717
fi
1818

19-
envsubst '${PROXY_PASS_WEB} ${PROXY_PASS_API} ${PROXY_PASS_RESOLVER}' < $TEMPLATE_PATH > /etc/nginx/nginx.conf
19+
envsubst '${PROXY_PASS_WEB} ${PROXY_PASS_API} ${CONNECTOR_BUILDER_SERVER_API} ${PROXY_PASS_RESOLVER}' < $TEMPLATE_PATH > /etc/nginx/nginx.conf
2020

2121
echo "starting nginx..."
2222
nginx -v

‎airbyte-proxy/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ VERSION="${VERSION:-dev}" # defaults to "dev", otherwise it is set by environmen
1111
echo "testing with proxy container airbyte/proxy:$VERSION"
1212

1313
function start_container () {
14-
CMD="docker run -d -p $PORT:8000 --env BASIC_AUTH_USERNAME=$1 --env BASIC_AUTH_PASSWORD=$2 --env PROXY_PASS_WEB=http://localhost --env PROXY_PASS_API=http://localhost --name $NAME airbyte/proxy:$VERSION"
14+
CMD="docker run -d -p $PORT:8000 --env BASIC_AUTH_USERNAME=$1 --env BASIC_AUTH_PASSWORD=$2 --env PROXY_PASS_WEB=http://localhost --env PROXY_PASS_API=http://localhost --env CONNECTOR_BUILDER_SERVER_API=http://localhost --name $NAME airbyte/proxy:$VERSION"
1515
echo $CMD
1616
eval $CMD
1717
wait_for_docker;

‎airbyte-server/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ${JDK_IMAGE} AS server
33

44
EXPOSE 8000
55

6-
ARG VERSION=0.40.21
6+
ARG VERSION=0.40.22
77

88
ENV APPLICATION airbyte-server
99
ENV VERSION ${VERSION}

‎airbyte-webapp/.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ REACT_APP_FULL_STORY_ORG=13AXQ4
33
REACT_APP_SENTRY_DSN=
44
REACT_APP_INTERCOM_APP_ID=nj1oam7s
55
REACT_APP_OSANO=16A0CTTE7vE8m1Qif/67beec9b-e563-4736-bdb4-4fe4adc39d48
6-
REACT_APP_CONNECTOR_BUILDER_API=/connector-builder-api/

‎airbyte-webapp/nginx/default.conf.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ server {
2525
window.TRACKING_STRATEGY = "$TRACKING_STRATEGY";
2626
window.AIRBYTE_VERSION = "$AIRBYTE_VERSION";
2727
window.API_URL = "$API_URL";
28+
window.CONNECTOR_BUILDER_API_URL = "$CONNECTOR_BUILDER_API_URL";
2829
</script>';
2930
sub_filter_once on;
3031
}

‎airbyte-webapp/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎airbyte-webapp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "airbyte-webapp",
3-
"version": "0.40.21",
3+
"version": "0.40.22",
44
"private": true,
55
"engines": {
66
"node": ">=16.0.0"

‎airbyte-webapp/src/config/configProviders.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const windowConfigProvider: ConfigProvider = async () => {
1111
token: window.SEGMENT_TOKEN,
1212
},
1313
apiUrl: window.API_URL,
14+
connectorBuilderApiUrl: window.CONNECTOR_BUILDER_API_URL,
1415
version: window.AIRBYTE_VERSION,
1516
// cloud only start
1617
// TODO: remove when infra team supports proper webapp building
@@ -22,7 +23,6 @@ const windowConfigProvider: ConfigProvider = async () => {
2223
const envConfigProvider: ConfigProvider = async () => {
2324
return {
2425
apiUrl: process.env.REACT_APP_API_URL,
25-
connectorBuilderUrl: process.env.REACT_APP_CONNECTOR_BUILDER_API,
2626
integrationUrl: process.env.REACT_APP_INTEGRATION_DOCS_URLS,
2727
segment: {
2828
token: process.env.REACT_APP_SEGMENT_TOKEN,

‎airbyte-webapp/src/config/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ declare global {
33
TRACKING_STRATEGY?: string;
44
AIRBYTE_VERSION?: string;
55
API_URL?: string;
6+
CONNECTOR_BUILDER_API_URL?: string;
67
CLOUD?: string;
78
REACT_APP_DATADOG_APPLICATION_ID: string;
89
REACT_APP_DATADOG_CLIENT_TOKEN: string;

‎airbyte-workers/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/s
1010
&& chmod +x kubectl && mv kubectl /usr/local/bin/
1111

1212
# Don't change this manually. Bump version expects to make moves based on this string
13-
ARG VERSION=0.40.21
13+
ARG VERSION=0.40.22
1414

1515
ENV APPLICATION airbyte-workers
1616
ENV VERSION ${VERSION}

‎charts/airbyte-bootloader/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: "0.40.46"
18+
version: "0.42.0"
1919

2020

2121
# This is the version number of the application being deployed. This version number should be
2222
# incremented each time you make changes to the application. Versions are not expected to
2323
# follow Semantic Versioning. They should reflect the version the application is using.
2424
# It is recommended to use it with quotes.
25-
appVersion: "0.40.21"
25+
appVersion: "0.40.22"
2626

2727
dependencies:
2828
- name: common

‎charts/airbyte-connector-builder-server/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Charts are downloaded at install time with `helm dep build`.
2+
charts

‎charts/airbyte-connector-builder-server/Chart.lock

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
dependencies:
2+
- name: common
3+
repository: https://charts.bitnami.com/bitnami
4+
version: 1.17.1
5+
digest: sha256:dacc73770a5640c011e067ff8840ddf89631fc19016c8d0a9e5ea160e7da8690
6+
generated: "2022-10-17T18:35:15.123937677Z"

‎charts/airbyte-connector-builder-server/Chart.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
apiVersion: v2
2+
name: connector-builder-server
3+
description: Helm chart to deploy airbyte-connector-builder-server
4+
5+
# A chart can be either an 'application' or a 'library' chart.
6+
#
7+
# Application charts are a collection of templates that can be packaged into versioned archives
8+
# to be deployed.
9+
#
10+
# Library charts provide useful utilities or functions for the chart developer. They're included as
11+
# a dependency of application charts to inject those utilities and functions into the rendering
12+
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
13+
type: application
14+
15+
# This is the chart version. This version number should be incremented each time you make changes
16+
# to the chart and its templates, including the app version.
17+
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18+
version: "0.42.0"
19+
20+
# This is the version number of the application being deployed. This version number should be
21+
# incremented each time you make changes to the application. Versions are not expected to
22+
# follow Semantic Versioning. They should reflect the version the application is using.
23+
# It is recommended to use it with quotes.
24+
appVersion: "0.40.22"
25+
26+
dependencies:
27+
- name: common
28+
repository: https://charts.bitnami.com/bitnami
29+
tags:
30+
- bitnami-common
31+
version: 1.x.x

‎charts/airbyte-connector-builder-server/README.md

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
# server
2+
3+
![Version: 0.39.36](https://img.shields.io/badge/Version-0.39.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.40.4](https://img.shields.io/badge/AppVersion-0.40.4-informational?style=flat-square)
4+
5+
Helm chart to deploy airbyte-server
6+
7+
## Requirements
8+
9+
| Repository | Name | Version |
10+
|------------|------|---------|
11+
| https://charts.bitnami.com/bitnami | common | 1.x.x |
12+
13+
## Values
14+
15+
| Key | Type | Default | Description |
16+
|-----|------|---------|-------------|
17+
| affinity | object | `{}` | |
18+
| containerSecurityContext | object | `{}` | |
19+
| enabled | bool | `true` | |
20+
| env_vars | object | `{}` | |
21+
| extraContainers | list | `[]` | |
22+
| extraEnv | list | `[]` | |
23+
| extraInitContainers | list | `[]` | |
24+
| extraVolumeMounts | list | `[]` | |
25+
| extraVolumes | list | `[]` | |
26+
| global.configMapName | string | `""` | |
27+
| global.credVolumeOverride | string | `""` | |
28+
| global.database.host | string | `"example.com"` | |
29+
| global.database.port | string | `"5432"` | |
30+
| global.database.secretName | string | `""` | |
31+
| global.database.secretValue | string | `""` | |
32+
| global.deploymentMode | string | `"oss"` | |
33+
| global.extraContainers | list | `[]` | |
34+
| global.logs.accessKey.existingSecret | string | `""` | |
35+
| global.logs.accessKey.existingSecretKey | string | `""` | |
36+
| global.logs.accessKey.password | string | `"minio"` | |
37+
| global.logs.externalMinio.enabled | bool | `false` | |
38+
| global.logs.externalMinio.host | string | `"localhost"` | |
39+
| global.logs.externalMinio.port | int | `9000` | |
40+
| global.logs.gcs.bucket | string | `""` | |
41+
| global.logs.gcs.credentials | string | `""` | |
42+
| global.logs.gcs.credentialsJson | string | `""` | |
43+
| global.logs.minio.enabled | bool | `true` | |
44+
| global.logs.s3.bucket | string | `"airbyte-dev-logs"` | |
45+
| global.logs.s3.bucketRegion | string | `""` | |
46+
| global.logs.s3.enabled | bool | `false` | |
47+
| global.logs.secretKey.existingSecret | string | `""` | |
48+
| global.logs.secretKey.existingSecretKey | string | `""` | |
49+
| global.logs.secretKey.password | string | `"minio123"` | |
50+
| global.secretName | string | `""` | |
51+
| global.serviceAccountName | string | `"placeholderServiceAccount"` | |
52+
| image.pullPolicy | string | `"IfNotPresent"` | |
53+
| image.repository | string | `"airbyte/server"` | |
54+
| livenessProbe.enabled | bool | `true` | |
55+
| livenessProbe.failureThreshold | int | `3` | |
56+
| livenessProbe.initialDelaySeconds | int | `30` | |
57+
| livenessProbe.periodSeconds | int | `10` | |
58+
| livenessProbe.successThreshold | int | `1` | |
59+
| livenessProbe.timeoutSeconds | int | `1` | |
60+
| log.level | string | `"INFO"` | |
61+
| nodeSelector | object | `{}` | |
62+
| podAnnotations | object | `{}` | |
63+
| readinessProbe.enabled | bool | `true` | |
64+
| readinessProbe.failureThreshold | int | `3` | |
65+
| readinessProbe.initialDelaySeconds | int | `10` | |
66+
| readinessProbe.periodSeconds | int | `10` | |
67+
| readinessProbe.successThreshold | int | `1` | |
68+
| readinessProbe.timeoutSeconds | int | `1` | |
69+
| replicaCount | int | `1` | |
70+
| resources.limits | object | `{}` | |
71+
| resources.requests | object | `{}` | |
72+
| secrets | object | `{}` | |
73+
| service.annotations | object | `{}` | |
74+
| service.port | int | `8001` | |
75+
| service.type | string | `"ClusterIP"` | |
76+
| tolerations | list | `[]` | |
77+
78+
----------------------------------------------
79+
Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)

0 commit comments

Comments
 (0)