Skip to content

OWLS-90857 - Create copy of init container env variables for each sever pod to avoid the roll issue #2458

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 5 commits into from
Jul 16, 2021
Merged

OWLS-90857 - Create copy of init container env variables for each sever pod to avoid the roll issue #2458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
60df737
OWLS-90857 - Create copy of init container env variables for each ser…
ankedia Jul 14, 2021
9d0c4a1
Added debug and javadoc.
ankedia Jul 14, 2021
3c520c5
Fix java doc and rename method to clarify the intent.
ankedia Jul 15, 2021
4210f2d
Changed the log level for pod dump message in case of roll and messag…
ankedia Jul 16, 2021
c1cda3c
Changes as per PR review comments.
ankedia Jul 16, 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
2 changes: 1 addition & 1 deletion operator/src/main/java/oracle/kubernetes/operator/helpers/ConfigMapHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ void recordCurrentMap(Packet packet, V1ConfigMap configMap) {

static synchronized Map<String, String> loadScriptsFromClasspath(String domainNamespace) {
Map<String, String> scripts = scriptReader.loadFilesFromClasspath();
LOGGER.fine(MessageKeys.SCRIPT_LOADED, domainNamespace);
LOGGER.finer(MessageKeys.SCRIPT_LOADED, domainNamespace);
return scripts;
}

Expand Down
14 changes: 9 additions & 5 deletions operator/src/main/java/oracle/kubernetes/operator/helpers/PodHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

import io.kubernetes.client.openapi.models.V1DeleteOptions;
import io.kubernetes.client.openapi.models.V1EnvVar;
import io.kubernetes.client.openapi.models.V1EnvVarBuilder;
import io.kubernetes.client.openapi.models.V1ObjectMeta;
import io.kubernetes.client.openapi.models.V1Pod;
import io.kubernetes.client.openapi.models.V1PodCondition;
Expand Down Expand Up @@ -259,17 +260,20 @@ public static Step deletePodStep(String serverName, Step next) {
return new DeletePodStep(serverName, next);
}

static List<V1EnvVar> createCopy(List<V1EnvVar> envVars) {
/**
* Create a copy of the list of V1EnvVar environment variables.
*
* @param envVars list of environment variables to copy
* @return List containing a copy of the original list.
*/
public static List<V1EnvVar> createCopy(List<V1EnvVar> envVars) {
ArrayList<V1EnvVar> copy = new ArrayList<>();
if (envVars != null) {
for (V1EnvVar envVar : envVars) {
// note that a deep copy of valueFrom is not needed here as, unlike with value, the
// new V1EnvVarFrom objects would be created by the doDeepSubstitutions() method in
// StepContextBase class.
copy.add(new V1EnvVar()
.name(envVar.getName())
.value(envVar.getValue())
.valueFrom(envVar.getValueFrom()));
copy.add(new V1EnvVarBuilder(envVar).build());
}
}
return copy;
Expand Down
9 changes: 5 additions & 4 deletions operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import io.kubernetes.client.openapi.models.V1SecretVolumeSource;
import io.kubernetes.client.openapi.models.V1Volume;
import io.kubernetes.client.openapi.models.V1VolumeMount;
import io.kubernetes.client.util.Yaml;
import jakarta.json.Json;
import jakarta.json.JsonPatchBuilder;
import oracle.kubernetes.operator.DomainSourceType;
Expand Down Expand Up @@ -545,11 +546,11 @@ private boolean canUseCurrentPod(V1Pod currentPod) {

boolean useCurrent = hasCorrectPodHash(currentPod) && canUseNewDomainZip(currentPod);

if (!useCurrent && AnnotationHelper.getDebugString(currentPod).length() > 0) {
LOGGER.fine(
if (!useCurrent) {
LOGGER.finer(
MessageKeys.POD_DUMP,
AnnotationHelper.getDebugString(currentPod),
AnnotationHelper.getDebugString(getPodModel()));
Yaml.dump(currentPod),
Yaml.dump(getPodModel()));
}

return useCurrent;
Expand Down
8 changes: 7 additions & 1 deletion operator/src/main/java/oracle/kubernetes/weblogic/domain/model/ServerPod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import io.kubernetes.client.openapi.models.V1Affinity;
import io.kubernetes.client.openapi.models.V1Capabilities;
import io.kubernetes.client.openapi.models.V1Container;
import io.kubernetes.client.openapi.models.V1ContainerBuilder;
import io.kubernetes.client.openapi.models.V1EnvVar;
import io.kubernetes.client.openapi.models.V1HostPathVolumeSource;
import io.kubernetes.client.openapi.models.V1NodeAffinity;
Expand All @@ -43,6 +44,7 @@
import org.apache.commons.lang3.builder.ToStringBuilder;

import static java.util.Collections.emptyList;
import static oracle.kubernetes.operator.helpers.PodHelper.createCopy;

class ServerPod extends KubernetesResource {

Expand Down Expand Up @@ -443,7 +445,7 @@ void fillInFrom(ServerPod serverPod1) {
addIfMissing(var);
}
for (V1Container c : serverPod1.getInitContainers()) {
addInitContainerIfMissing(c);
addInitContainerIfMissing(createWithEnvCopy(c));
}
for (V1Container c : serverPod1.getContainers()) {
addContainerIfMissing(c);
Expand Down Expand Up @@ -492,6 +494,10 @@ private void addAuxiliaryImage(ServerPod serverPod1) {
}
}

private V1Container createWithEnvCopy(V1Container c) {
Copy link
Member

@rjeberhard rjeberhard Jul 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm nervous about this as it will be difficult to remember to keep this in sync if later versions of K8s add more fields to V1Container. Can you use new V1ContainerBuilder(V1Container)? We should probably update the copy of V1EnvVar too.

Copy link
Member Author

@ankedia ankedia Jul 16, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed to use V1ContainerBuilder(V1Container) and V1EnvVarBuild(V1EnvVar) in c1cda3c. Please let me know if I missed something. Thanks.

return new V1ContainerBuilder(c).withEnv(createCopy(c.getEnv())).build();
}

private void addIfMissing(V1Volume var) {
if (!hasVolumeName(var.getName())) {
addAdditionalVolume(var);
Expand Down