Skip to content

Commit b6992d6

Browse files
committed
Add resources to copy-container
1 parent 102d739 commit b6992d6

File tree

2 files changed

+31
-0
lines changed

2 files changed

+31
-0
lines changed

kubernetes/charts/weblogic-operator/templates/_operator-dep.tpl

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,23 @@ spec:
6363
image: {{ .image | quote }}
6464
imagePullPolicy: "IfNotPresent"
6565
command: ["/bin/sh", "-c", "cp /deployment/* /deployment_copy && cp /probes/* /probes_copy"]
66+
resources:
67+
requests:
68+
cpu: {{ .cpuRequests | default "100m" }}
69+
memory: {{ .memoryRequests | default "10Mi" }}
70+
limits:
71+
cpu: {{ .cpuLimits | default "100m" }}
72+
memory: {{ .memoryLimits | default "10Mi" }}
73+
securityContext:
74+
{{- if or (hasKey . "runAsUser") (ne ( .kubernetesPlatform | default "Generic" ) "OpenShift") }}
75+
runAsUser: {{ .runAsUser | default 1000 }}
76+
{{- end }}
77+
runAsNonRoot: true
78+
privileged: false
79+
allowPrivilegeEscalation: false
80+
readOnlyRootFilesystem: true
81+
capabilities:
82+
drop: ["ALL"]
6683
volumeMounts:
6784
- name: "deployment-volume"
6885
mountPath: "/deployment_copy"

kubernetes/src/test/java/oracle/kubernetes/operator/create/CreateOperatorGeneratedFilesTestBase.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,20 @@ protected V1Deployment getExpectedWeblogicOperatorDeployment() {
238238
newVolumeMount().name("deployment-volume").mountPath("/deployment_copy"))
239239
.addVolumeMountsItem(
240240
newVolumeMount().name("probes-volume").mountPath("/probes_copy"))
241+
.resources(
242+
new V1ResourceRequirements()
243+
.putRequestsItem("cpu", Quantity.fromString("100m"))
244+
.putRequestsItem(
245+
"memory", Quantity.fromString("10Mi"))
246+
.putLimitsItem("cpu", Quantity.fromString("100m"))
247+
.putLimitsItem(
248+
"memory", Quantity.fromString("10Mi")))
249+
.securityContext(
250+
new V1SecurityContext().runAsUser(1000L)
251+
.runAsNonRoot(true)
252+
.readOnlyRootFilesystem(true)
253+
.privileged(false).allowPrivilegeEscalation(false)
254+
.capabilities(new V1Capabilities().addDropItem("ALL")))
241255
)
242256
.addContainersItem(
243257
newContainer()

0 commit comments

Comments
 (0)