Skip to content

Commit b4d9b4c

Browse files
committed
Merge branch 'owls-109299' into 'main'
change to prevent helm convert file size to scientific notation See merge request weblogic-cloud/weblogic-kubernetes-operator!4255
2 parents 0864c23 + afe00e5 commit b4d9b4c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ spec:
8686
- name: "JAVA_LOGGING_LEVEL"
8787
value: {{ .javaLoggingLevel | quote }}
8888
- name: "JAVA_LOGGING_MAXSIZE"
89-
value: {{ .javaLoggingFileSizeLimit | default 20000000 | quote }}
89+
value: {{ int64 .javaLoggingFileSizeLimit | default 20000000 | quote }}
9090
- name: "JAVA_LOGGING_COUNT"
9191
value: {{ .javaLoggingFileCount | default 10 | quote }}
9292
{{- if .remoteDebugNodePortEnabled }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ protected V1Deployment getExpectedWeblogicOperatorDeployment() {
262262
.addEnvItem(
263263
newEnvVar()
264264
.name("JAVA_LOGGING_MAXSIZE")
265-
.value("2e+07"))
265+
.value("20000000"))
266266
.addEnvItem(
267267
newEnvVar()
268268
.name("JAVA_LOGGING_COUNT")

0 commit comments

Comments
 (0)