Skip to content
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

add feature-flag and socat envvars to allowed set #22185

Merged
merged 2 commits into from
Feb 1, 2023
Merged

add feature-flag and socat envvars to allowed set #22185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25a8ea1
add feature-flag and socat envvars to allowed set
colesnodgrass Feb 1, 2023
74575aa
prepend with class
colesnodgrass Feb 1, 2023
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
10 changes: 9 additions & 1 deletion ...ommons-temporal/src/main/java/io/airbyte/commons/temporal/sync/OrchestratorConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ public class OrchestratorConstants {

// necessary for s3/minio logging. used in the log4j2 configuration.
private static final String S3_PATH_STYLE_ACCESS = "S3_PATH_STYLE_ACCESS";
private static final String FEATURE_FLAG_CLIENT = "FEATURE_FLAG_CLIENT";
private static final String FEATURE_FLAG_PATH = "FEATURE_FLAG_PATH";
private static final String LAUNCHDARKLY_KEY = "LAUNCHDARKLY_KEY";

// set of env vars necessary for the container orchestrator app to run
public static final Set<String> ENV_VARS_TO_TRANSFER = new ImmutableSet.Builder<String>()
Expand Down Expand Up @@ -70,7 +73,12 @@ public class OrchestratorConstants {
EnvVariableFeatureFlags.USE_STREAM_CAPABLE_STATE,
EnvVariableFeatureFlags.AUTO_DETECT_SCHEMA,
EnvVariableFeatureFlags.APPLY_FIELD_SELECTION,
EnvVariableFeatureFlags.FIELD_SELECTION_WORKSPACES))
EnvVariableFeatureFlags.FIELD_SELECTION_WORKSPACES,
FEATURE_FLAG_CLIENT,
FEATURE_FLAG_PATH,
LAUNCHDARKLY_KEY,
EnvConfigs.SOCAT_KUBE_CPU_LIMIT,
EnvConfigs.SOCAT_KUBE_CPU_REQUEST))
.build();

public static final String INIT_FILE_ENV_MAP = "envMap.json";
Expand Down
8 changes: 4 additions & 4 deletions airbyte-config/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 @@ -86,8 +86,8 @@ public class EnvConfigs implements Configs {
private static final String DEFAULT_SIDECAR_KUBE_CPU_LIMIT = "2.0";
private static final String SIDECAR_KUBE_CPU_LIMIT = "SIDECAR_KUBE_CPU_LIMIT";
public static final String JOB_KUBE_SOCAT_IMAGE = "JOB_KUBE_SOCAT_IMAGE";
private static final String SOCAT_KUBE_CPU_LIMIT = "SOCAT_KUBE_CPU_LIMIT";
private static final String SOCAT_KUBE_CPU_REQUEST = "SOCAT_KUBE_CPU_REQUEST";
public static final String SOCAT_KUBE_CPU_LIMIT = "SOCAT_KUBE_CPU_LIMIT";
public static final String SOCAT_KUBE_CPU_REQUEST = "SOCAT_KUBE_CPU_REQUEST";
public static final String JOB_KUBE_BUSYBOX_IMAGE = "JOB_KUBE_BUSYBOX_IMAGE";
public static final String JOB_KUBE_CURL_IMAGE = "JOB_KUBE_CURL_IMAGE";
public static final String SYNC_JOB_MAX_ATTEMPTS = "SYNC_JOB_MAX_ATTEMPTS";
Expand Down Expand Up @@ -758,13 +758,13 @@ public String getJobKubeSidecarContainerImagePullPolicy() {
/**
* Returns the name of the secret to be used when pulling down docker images for jobs. Automatically
* injected in the KubePodProcess class and used in the job pod templates.
*
* <p>
* Can provide multiple strings seperated by comma(,) to indicate pulling from different
* repositories. The empty string is a no-op value.
*/
@Override
public List<String> getJobKubeMainContainerImagePullSecrets() {
String secrets = getEnvOrDefault(JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_SECRET, "");
final String secrets = getEnvOrDefault(JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_SECRET, "");
return Arrays.stream(secrets.split(",")).collect(Collectors.toList());
}

Expand Down