Skip to content

Commit c62a005

Browse files
add affinity to domain resource spec (#151)
* add affinity to domain resource spec * rework code per suggestions
1 parent 82917f8 commit c62a005

File tree

1 file changed

+31
-1
lines changed

1 file changed

+31
-1
lines changed

webui/src/js/utils/k8s-domain-resource-generator.js

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,14 @@ define(['models/wkt-project', 'utils/k8s-domain-configmap-generator', 'js-yaml',
247247
}
248248

249249
function getServerPodForCluster(cluster) {
250-
return _getServerPod(getJavaOptionsForCluster(cluster), getUserMemArgsForCluster(cluster), getKubernetesResourcesForCluster(cluster));
250+
const serverPod = _getServerPod(getJavaOptionsForCluster(cluster), getUserMemArgsForCluster(cluster), getKubernetesResourcesForCluster(cluster)) || {};
251+
252+
const affinity = _getAffinityForServerPod(100);
253+
if (affinity) {
254+
serverPod.affinity = affinity;
255+
}
256+
257+
return Object.keys(serverPod).length > 0 ? serverPod : null;
251258
}
252259

253260
function _getServerPod(javaOptions, userMemArgs, resources) {
@@ -262,6 +269,7 @@ define(['models/wkt-project', 'utils/k8s-domain-configmap-generator', 'js-yaml',
262269
if (resources) {
263270
serverPod.resources = resources;
264271
}
272+
265273
return Object.keys(serverPod).length > 0 ? serverPod : null;
266274
}
267275

@@ -353,6 +361,28 @@ define(['models/wkt-project', 'utils/k8s-domain-configmap-generator', 'js-yaml',
353361
return foundValue ? resources : null;
354362
}
355363

364+
function _getAffinityForServerPod(weight) {
365+
return {
366+
podAntiAffinity: {
367+
preferredDuringSchedulingIgnoredDuringExecution: [{
368+
weight: weight,
369+
podAffinityTerm: {
370+
topologyKey: 'kubernetes.io/hostname',
371+
labelSelector: {
372+
matchExpressions: [{
373+
key: 'weblogic.clusterName',
374+
operator: 'In',
375+
values: ['$(CLUSTER_NAME)']
376+
}]
377+
}
378+
}
379+
}]
380+
}
381+
};
382+
}
383+
356384
return K8sDomainResourceGenerator;
357385
}
386+
387+
358388
);

0 commit comments

Comments
 (0)