Skip to content

Commit

Permalink
add feature-flag and socat envvars to allowed set (#22185)
Browse files Browse the repository at this point in the history
* add feature-flag and socat envvars to allowed set

* prepend with class
  • Loading branch information
colesnodgrass committed Feb 1, 2023
1 parent 1fe3168 commit 96b70bc
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
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
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

0 comments on commit 96b70bc

Please sign in to comment.