Skip to content

Update various platform images to be M1 compatible. #13411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2022
Merged

Update various platform images to be M1 compatible. #13411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions airbyte-config/models/src/main/java/io/airbyte/config/EnvConfigs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,9 @@ public class EnvConfigs implements Configs {
private static final String DEFAULT_JOB_KUBE_SIDECAR_CONTAINER_IMAGE_PULL_POLICY = "IfNotPresent";
private static final String SECRET_STORE_GCP_PROJECT_ID = "SECRET_STORE_GCP_PROJECT_ID";
private static final String SECRET_STORE_GCP_CREDENTIALS = "SECRET_STORE_GCP_CREDENTIALS";
private static final String DEFAULT_JOB_KUBE_SOCAT_IMAGE = "alpine/socat:1.7.4.1-r1";
private static final String DEFAULT_JOB_KUBE_SOCAT_IMAGE = "alpine/socat:1.7.4.3-r0";
private static final String DEFAULT_JOB_KUBE_BUSYBOX_IMAGE = "busybox:1.28";
private static final String DEFAULT_JOB_KUBE_CURL_IMAGE = "curlimages/curl:7.77.0";
private static final String DEFAULT_JOB_KUBE_CURL_IMAGE = "curlimages/curl:7.83.1";
private static final long DEFAULT_MINIMUM_WORKSPACE_RETENTION_DAYS = 1;
private static final long DEFAULT_MAXIMUM_WORKSPACE_RETENTION_DAYS = 60;
private static final long DEFAULT_MAXIMUM_WORKSPACE_SIZE_MB = 5000;
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/io/airbyte/db/instance/configs/migrations/V0_39_1_001__CreateStreamReset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Airbyte, Inc., all rights reserved.
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these are format changes.

*/

package io.airbyte.db.instance.configs.migrations;
Expand Down
9 changes: 5 additions & 4 deletions airbyte-oauth/src/main/java/io/airbyte/oauth/flows/HubspotOAuthFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,11 @@ protected String formatConsentUrl(final UUID definitionId,
throws IOException {
try {
/*
Not all accounts have access to all scopes so we're requesting them as optional.
Hubspot still expects scopes to be defined, so the contacts scope is left as required
as it is accessible by any marketing or CRM account according to https://legacydocs.hubspot.com/docs/methods/oauth2/initiate-oauth-integration#scopes
*/
* Not all accounts have access to all scopes so we're requesting them as optional. Hubspot still
* expects scopes to be defined, so the contacts scope is left as required as it is accessible by
* any marketing or CRM account according to
* https://legacydocs.hubspot.com/docs/methods/oauth2/initiate-oauth-integration#scopes
*/
return new URIBuilder(AUTHORIZE_URL)
.addParameter("client_id", clientId)
.addParameter("redirect_uri", redirectUrl)
Expand Down