Skip to content

Owls 87956 - Generate shorter volume name when override secret name is too long #2257

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 8 commits into from
Mar 12, 2021
Merged

Owls 87956 - Generate shorter volume name when override secret name is too long #2257

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
49c2acb
OWLS-87956 - Generate shorter volume name when override secret name i…
ankedia Mar 10, 2021
3f53a3a
Minor changes
ankedia Mar 10, 2021
e641782
Introduce constant for default mode.
ankedia Mar 10, 2021
0fb1663
Minor refactoring.
ankedia Mar 11, 2021
f634779
Address PR review comments to use a new volume naming scheme with che…
ankedia Mar 11, 2021
63810e3
Use different suffix for generated volume names for secret and config…
ankedia Mar 11, 2021
73984f2
Minor change.
ankedia Mar 11, 2021
c1ccff8
Remove unnecessary method.
ankedia Mar 12, 2021
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
Prev Previous commit
Remove unnecessary method.
  • Loading branch information
@ankedia
ankedia committed Mar 12, 2021
commit c1ccff836e2535ee2130170a5fd2ead094b068f5
10 changes: 3 additions & 7 deletions operator/src/main/java/oracle/kubernetes/operator/helpers/JobStepContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,20 +370,20 @@ protected V1Container createPrimaryContainer(TuningParameters tuningParameters)

if (getConfigOverrides() != null && getConfigOverrides().length() > 0) {
container.addVolumeMountsItem(
readOnlyVolumeMount(getVolumeMountName(getConfigOverrides(), CONFIGMAP_TYPE), OVERRIDES_CM_MOUNT_PATH));
readOnlyVolumeMount(getVolumeName(getConfigOverrides(), CONFIGMAP_TYPE), OVERRIDES_CM_MOUNT_PATH));
}

List<String> configOverrideSecrets = getConfigOverrideSecrets();
for (String secretName : configOverrideSecrets) {
container.addVolumeMountsItem(
readOnlyVolumeMount(
getVolumeMountName(secretName, SECRET_TYPE), OVERRIDE_SECRETS_MOUNT_PATH + '/' + secretName));
getVolumeName(secretName, SECRET_TYPE), OVERRIDE_SECRETS_MOUNT_PATH + '/' + secretName));
}

if (isSourceWdt()) {
if (getWdtConfigMap() != null) {
container.addVolumeMountsItem(
readOnlyVolumeMount(getVolumeMountName(getWdtConfigMap(), CONFIGMAP_TYPE), WDTCONFIGMAP_MOUNT_PATH));
readOnlyVolumeMount(getVolumeName(getWdtConfigMap(), CONFIGMAP_TYPE), WDTCONFIGMAP_MOUNT_PATH));
}
container.addVolumeMountsItem(
readOnlyVolumeMount(RUNTIME_ENCRYPTION_SECRET_VOLUME,
Expand All @@ -398,10 +398,6 @@ private String getVolumeName(String resourceName, String type) {
return getName(resourceName, type);
}

private String getVolumeMountName(String resourceName, String type) {
return getName(resourceName, type);
}

private String getName(String resourceName, String type) {
return resourceName.length() > (MAX_ALLOWED_VOLUME_NAME_LENGTH - VOLUME_NAME_SUFFIX.length())
? getShortName(resourceName, type)
Expand Down