chore: Consolidate system CA bundle logic into launcher_v2.go #12382
Conversation
Signed-off-by: agoins <[email protected]>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
| inputParameter(paramRetryBackOffMaxDuration)) | ||
| } | ||
| // Update pod metadata if it defined in the Kubernetes Spec | ||
| if k8sExecCfg.GetPodMetadata() != nil { |
There was a problem hiding this comment.
Unrelated to your PR, but could you change the condition around ConfigureCustomCABundle to match the other instances?
if common.GetCaBundleSecretName() != "" && (c.mlPipelineTLSEnabled || common.GetMetadataTLSEnabled()) {
ConfigureCustomCABundle(executor)
}
| } | ||
| caBundleCfgMapName := os.Getenv("EXECUTOR_CABUNDLE_CONFIGMAP_NAME") | ||
| caBundleCfgMapKey := os.Getenv("EXECUTOR_CABUNDLE_CONFIGMAP_KEY") | ||
| caBundleMountPath := os.Getenv("EXECUTOR_CABUNDLE_MOUNTPATH") |
There was a problem hiding this comment.
I was thinking more along the lines of if common.GetCaBundleSecretName() == "" && caBundleCfgMapName != "" && caBundleCfgMapKey != "" { then mount the ConfigMap at the same location that we do for GetCaBundleSecretName() and keep the launcher logic the same. So in other words, GetCaBundleSecretName takes priority and then we fall back to EXECUTOR_CABUNDLE_CONFIGMAP_NAME.
There was a problem hiding this comment.
Got it - so leave the logic in launcher_v2 untouched, and modify only the container.go logic?
2 participants
Description of your changes:
Resolves #12381
Checklist: