Merge branch 'liferay:master' into LPD-55983

Author: RoselaineMarquesMontero

build-test-batch.xml

@@ -8058,6 +8058,34 @@ ${output.content}</echo>
 		</run-batch-test>
 	</target>
 
+	<target name="playwright-js-smoke-tomcat101-db2115">
+		<run-playwright-js-test database.type="db2" />
+	</target>
+
+	<target name="playwright-js-smoke-tomcat101-hypersonic20">
+		<run-playwright-js-test database.type="hypersonic" />
+	</target>
+
+	<target name="playwright-js-smoke-tomcat101-mariadb106">
+		<run-playwright-js-test database.type="mariadb" />
+	</target>
+
+	<target name="playwright-js-smoke-tomcat101-mysql84">
+		<run-playwright-js-test database.type="mysql" />
+	</target>
+
+	<target name="playwright-js-smoke-tomcat101-oracle193">
+		<run-playwright-js-test database.type="oracle" />
+	</target>
+
+	<target name="playwright-js-smoke-tomcat101-postgresql163">
+		<run-playwright-js-test database.type="postgresql" />
+	</target>
+
+	<target name="playwright-js-smoke-tomcat101-sqlserver2022">
+		<run-playwright-js-test database.type="sqlserver" />
+	</target>
+
 	<target name="playwright-js-tomcat101-mysql57">
 		<run-playwright-js-test database.type="mysql" />
 	</target>

build-test.xml

@@ -52,6 +52,12 @@
 
 	<macrodef name="apply-portal-ext-properties">
 		<sequential>
+			<condition property="add.passwords.encryption.algorithm">
+				<not>
+					<contains string="${custom.properties}" substring="passwords.encryption.algorithm=" />
+				</not>
+			</condition>
+
 			<if>
 				<contains string="${app.server.portal.dir}" substring="liferay-portal.war" />
 				<then>
@@ -83,6 +89,15 @@
 
 module.framework.properties.osgi.console=11312</echo>
 
+					<if>
+						<isset property="add.passwords.encryption.algorithm" />
+						<then>
+							<echo append="true" file="${tstamp.value}/WEB-INF/classes/portal-ext.properties">
+
+passwords.encryption.algorithm=NONE</echo>
+						</then>
+					</if>
+
 					<print-file file.name="${tstamp.value}/WEB-INF/classes/portal-ext.properties" />
 
 					<delete file="${test.build.liferay.portal.zip.file.name}" />
@@ -119,6 +134,15 @@ module.framework.properties.osgi.console=11312</echo>
 
 module.framework.properties.osgi.console=11312</echo>
 
+					<if>
+						<isset property="add.passwords.encryption.algorithm" />
+						<then>
+							<echo append="true" file="${app.server.classes.portal.dir}/portal-ext.properties">
+
+passwords.encryption.algorithm=NONE</echo>
+						</then>
+					</if>
+
 					<print-file file.name="${app.server.classes.portal.dir}/portal-ext.properties" />
 				</else>
 			</if>
@@ -12155,7 +12179,7 @@ ${update.properties}</echo>
 <Configuration strict="true">
 	<Loggers>
 		<Logger level="ERROR" name="com.liferay.portal.search.elasticsearch7.internal.ElasticsearchSearchEngine" />
-		<Logger level="INFO" name="com.liferay.portal.search.elasticsearch7.internal.index.CompanyIndexFactory" />
+		<Logger level="INFO" name="com.liferay.portal.search.elasticsearch7.internal.index.IndexFactory" />
 		<Logger level="ERROR" name="com.liferay.portal.search.elasticsearch7.internal.sidecar.SidecarManager" />
 	</Loggers>
 </Configuration>]]></echo>

build.properties

@@ -315,10 +315,7 @@
     #    dxp/apps/sharepoint-soap,\
     #    util/portal-tools-db-partition-migration-validator,\
     #    util/portal-tools-db-schema-importer,\
-    #    util/portal-tools-db-upgrade-client,\
-    #    util/portal-tools-rest-builder-test-api,\
-    #    util/portal-tools-rest-builder-test-client,\
-    #    util/portal-tools-rest-builder-test-impl
+    #    util/portal-tools-db-upgrade-client
 
     #
     # Set the module directories to include that will use the Jakarta

build.xml

@@ -20,7 +20,7 @@
 						includes=".liferay-home"
 					/>
 					<fileset
-						dir="${liferay.home}/data/elasticsearch"
+						dir="${liferay.home}/data/elasticsearch7"
 					/>
 					<fileset
 						dir="${liferay.home}/data/hypersonic"

cloud/helm/default/Chart.yaml

@@ -5,4 +5,4 @@ description:
 icon: https://www-cdn.liferay.com/documents/d/guest/liferay-logo
 name: liferay-default
 type: application
-version: 0.0.7
+version: 0.0.8

cloud/helm/default/templates/_statefulset.tpl

@@ -174,10 +174,15 @@ metadata:
     name: {{ include "liferay.name" .root }}{{ $suffix }}
     namespace: {{ include "liferay.namespace" .root }}
 spec:
-    {{- with .statefulset.service.ports }}
+    {{- if or .statefulset.service.ports .statefulset.customServicePorts }}
     ports:
+    {{- with .statefulset.service.ports }}
         {{- toYaml . | nindent 8 }}
     {{- end }}
+    {{- range $k, $v := .statefulset.customServicePorts }}
+        {{- toYaml $v | nindent 8 }}
+    {{- end }}
+    {{- end }}
     selector:
         app: {{ include "liferay.name" .root }}{{ $suffix }}
         {{- include "liferay.selectorLabels" .root | nindent 8 }}

cloud/helm/default/values.yaml

@@ -23,6 +23,7 @@ customLabels:
     origin: liferay-cloud
 customPorts: {}
 customPullSecrets: {}
+customServicePorts: {}
 customVolumeClaimTemplates: {}
 customVolumeMounts: {}
 customVolumes: {}
@@ -63,21 +64,24 @@ initContainers:
                     -   bash
                     -   -c
                     -   |
+                            rm -fr /temp/liferay/liferay.pid 2>/dev/null
+
+                            mkdir -p /temp/liferay
+
+                            touch /temp/liferay/liferay.pid
+
                             if [ ! -d /temp/liferay/data ] || [ -z "$(ls -A /temp/liferay/data)" ]
                             then
                                 mkdir -p /temp/liferay/data
 
                                 cp -frv /opt/liferay/data/* /temp/liferay/data
                             fi
 
-                            if [ -d /opt/liferay/deploy ] && [ -z "$(ls -A /temp/liferay/deploy/*license* 2>/dev/null)" ]
+                            if [ ! -d /temp/liferay/glowroot ] || [ -z "$(ls -A /temp/liferay/glowroot)" ]
                             then
-                                if [ ! -d /temp/liferay/data/license ] || [ -z "$(ls -A /temp/liferay/data/license/*.li)" ]
-                                then
-                                    mkdir -p /temp/liferay/deploy
+                                mkdir -p /temp/liferay/glowroot
 
-                                    cp -fv /opt/liferay/deploy/* /temp/liferay/deploy
-                                fi
+                                cp -frv /opt/liferay/glowroot/* /temp/liferay/glowroot
                             fi
 
                             if [ ! -f /temp/tomcat/conf/server.xml ]
@@ -110,6 +114,16 @@ initContainers:
 
                                 sed -i '/<Engine/r'<(echo "${SERVER_XML_CLUSTER}") /temp/tomcat/conf/server.xml
                             fi
+
+                            if [ -d /opt/liferay/deploy ] && [ -z "$(ls -A /temp/liferay/deploy/*license* 2>/dev/null)" ]
+                            then
+                                if [ ! -d /temp/liferay/data/license ] || [ -z "$(ls -A /temp/liferay/data/license/*.li)" ]
+                                then
+                                    mkdir -p /temp/liferay/deploy
+
+                                    cp -fv /opt/liferay/deploy/* /temp/liferay/deploy
+                                fi
+                            fi
                 image: {{ printf "%s:%s" .image.repository (.image.tag | toString) }}
                 imagePullPolicy: {{ .image.pullPolicy }}
                 name: liferay-prepopulate-data
@@ -156,6 +170,9 @@ portalBundleDenyList: []
 portalComponentDenyList: []
 portalProperties:
 ports:
+    -   containerPort: 4000
+        name: glowroot
+        protocol: TCP
     -   containerPort: 7800
         name: cluster
         protocol: TCP
@@ -233,6 +250,9 @@ volumeMounts:
     -   mountPath: /opt/liferay/deploy
         name: liferay-persistent-volume
         subPath: liferay/deploy
+    -   mountPath: /opt/liferay/glowroot
+        name: liferay-persistent-volume
+        subPath: liferay/glowroot
     -   mountPath: /opt/liferay/liferay.pid
         name: liferay-persistent-volume
         subPath: liferay/liferay.pid
@@ -284,6 +304,9 @@ volumeMounts:
     -   mountPath: /opt/liferay/work
         name: liferay-persistent-volume
         subPath: liferay/work
+    -   mountPath: /tmp
+        name: liferay-persistent-volume
+        subPath: system/tmp
     -   mountPath: /usr/local/liferay/scripts/pre-configure/000_jdk_java_options.sh
         name: liferay-configmap
         subPath: 000_jdk_java_options.sh

cloud/operator/Dockerfile

@@ -0,0 +1,17 @@
+FROM golang:1.24 AS builder
+
+WORKDIR /workspace
+
+COPY resources .
+
+RUN go mod download && \
+	go mod verify && \
+	CGO_ENABLED=0 go build -a -ldflags="-s -w" -o manager main.go
+
+FROM gcr.io/distroless/static:nonroot
+
+ENTRYPOINT ["/manager"]
+
+COPY --from=builder /workspace/manager /
+
+USER 65532:65532

cloud/operator/resources/go.mod

@@ -0,0 +1,66 @@
+module github.com/liferay/liferay-portal/cloud/operator
+
+go 1.24.4
+
+require (
+	github.com/caarlos0/env/v11 v11.3.1
+	k8s.io/api v0.33.1
+	k8s.io/apimachinery v0.33.1
+	k8s.io/client-go v0.33.1
+	sigs.k8s.io/controller-runtime v0.21.0
+)
+
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/zapr v1.3.0 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/google/btree v1.1.3 // indirect
+	github.com/google/gnostic-models v0.6.9 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.22.0 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.62.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/net v0.38.0 // indirect
+	golang.org/x/oauth2 v0.27.0 // indirect
+	golang.org/x/sync v0.12.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/term v0.30.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
+	golang.org/x/time v0.9.0 // indirect
+	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/apiextensions-apiserver v0.33.0 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
+	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
+	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
+)