Skip to content

Commit 96b70bc

Browse files
add feature-flag and socat envvars to allowed set (#22185)
* add feature-flag and socat envvars to allowed set * prepend with class
1 parent 1fe3168 commit 96b70bc

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

airbyte-commons-temporal/src/main/java/io/airbyte/commons/temporal/sync/OrchestratorConstants.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ public class OrchestratorConstants {
1717

1818
// necessary for s3/minio logging. used in the log4j2 configuration.
1919
private static final String S3_PATH_STYLE_ACCESS = "S3_PATH_STYLE_ACCESS";
20+
private static final String FEATURE_FLAG_CLIENT = "FEATURE_FLAG_CLIENT";
21+
private static final String FEATURE_FLAG_PATH = "FEATURE_FLAG_PATH";
22+
private static final String LAUNCHDARKLY_KEY = "LAUNCHDARKLY_KEY";
2023

2124
// set of env vars necessary for the container orchestrator app to run
2225
public static final Set<String> ENV_VARS_TO_TRANSFER = new ImmutableSet.Builder<String>()
@@ -70,7 +73,12 @@ public class OrchestratorConstants {
7073
EnvVariableFeatureFlags.USE_STREAM_CAPABLE_STATE,
7174
EnvVariableFeatureFlags.AUTO_DETECT_SCHEMA,
7275
EnvVariableFeatureFlags.APPLY_FIELD_SELECTION,
73-
EnvVariableFeatureFlags.FIELD_SELECTION_WORKSPACES))
76+
EnvVariableFeatureFlags.FIELD_SELECTION_WORKSPACES,
77+
FEATURE_FLAG_CLIENT,
78+
FEATURE_FLAG_PATH,
79+
LAUNCHDARKLY_KEY,
80+
EnvConfigs.SOCAT_KUBE_CPU_LIMIT,
81+
EnvConfigs.SOCAT_KUBE_CPU_REQUEST))
7482
.build();
7583

7684
public static final String INIT_FILE_ENV_MAP = "envMap.json";

airbyte-config/config-models/src/main/java/io/airbyte/config/EnvConfigs.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ public class EnvConfigs implements Configs {
8686
private static final String DEFAULT_SIDECAR_KUBE_CPU_LIMIT = "2.0";
8787
private static final String SIDECAR_KUBE_CPU_LIMIT = "SIDECAR_KUBE_CPU_LIMIT";
8888
public static final String JOB_KUBE_SOCAT_IMAGE = "JOB_KUBE_SOCAT_IMAGE";
89-
private static final String SOCAT_KUBE_CPU_LIMIT = "SOCAT_KUBE_CPU_LIMIT";
90-
private static final String SOCAT_KUBE_CPU_REQUEST = "SOCAT_KUBE_CPU_REQUEST";
89+
public static final String SOCAT_KUBE_CPU_LIMIT = "SOCAT_KUBE_CPU_LIMIT";
90+
public static final String SOCAT_KUBE_CPU_REQUEST = "SOCAT_KUBE_CPU_REQUEST";
9191
public static final String JOB_KUBE_BUSYBOX_IMAGE = "JOB_KUBE_BUSYBOX_IMAGE";
9292
public static final String JOB_KUBE_CURL_IMAGE = "JOB_KUBE_CURL_IMAGE";
9393
public static final String SYNC_JOB_MAX_ATTEMPTS = "SYNC_JOB_MAX_ATTEMPTS";
@@ -758,13 +758,13 @@ public String getJobKubeSidecarContainerImagePullPolicy() {
758758
/**
759759
* Returns the name of the secret to be used when pulling down docker images for jobs. Automatically
760760
* injected in the KubePodProcess class and used in the job pod templates.
761-
*
761+
* <p>
762762
* Can provide multiple strings seperated by comma(,) to indicate pulling from different
763763
* repositories. The empty string is a no-op value.
764764
*/
765765
@Override
766766
public List<String> getJobKubeMainContainerImagePullSecrets() {
767-
String secrets = getEnvOrDefault(JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_SECRET, "");
767+
final String secrets = getEnvOrDefault(JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_SECRET, "");
768768
return Arrays.stream(secrets.split(",")).collect(Collectors.toList());
769769
}
770770

0 commit comments

Comments
 (0)