Skip to content

Commit beeeadb

Browse files
rjeberhardrjeberhard
committed
Merge remote-tracking branch 'origin/main' into release/4.0
2 parents 057f08b + 4326461 commit beeeadb

File tree

17 files changed

+243
-85
lines changed

17 files changed

+243
-85
lines changed

‎Dockerfile‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
# Copyright (c) 2017, 2023, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33
#
4-
# HOW TO BUILD THIS IMAGE
4+
# HOW TO BUILD AND PUSH THIS IMAGE
55
# -----------------------
66
# Run:
7-
# $ ./buildDockerImage.sh [-t <image-name>]
7+
# $ ./buildAndPushImage.sh -t <image-name>
88
#
99
# -------------------------
1010
FROM ghcr.io/oracle/oraclelinux:9-slim AS jre-build
1111

12-
ENV JAVA_URL="https://download.java.net/java/GA/jdk19.0.2/fdb695a9d9064ad6b064dc6df578380c/7/GPL/openjdk-19.0.2_linux-x64_bin.tar.gz"
12+
ENV JAVA_URL_X64="https://download.java.net/java/GA/jdk19.0.2/fdb695a9d9064ad6b064dc6df578380c/7/GPL/openjdk-19.0.2_linux-x64_bin.tar.gz"
13+
ENV JAVA_URL_AARCH64="https://download.java.net/java/GA/jdk19.0.2/fdb695a9d9064ad6b064dc6df578380c/7/GPL/openjdk-19.0.2_linux-aarch64_bin.tar.gz"
1314

1415
RUN set -eux; \
1516
microdnf -y install gzip tar; \
17+
MACHINE_TYPE=`uname -m`; \
18+
if [ ${MACHINE_TYPE} == 'x86_64' ]; then \
19+
JAVA_URL=$JAVA_URL_X64; \
20+
else \
21+
JAVA_URL=$JAVA_URL_AARCH64; \
22+
fi; \
1623
curl -fL -o /jdk.tar.gz "$JAVA_URL"; \
1724
mkdir -p /jdk; \
1825
tar --extract --file /jdk.tar.gz --directory /jdk --strip-components 1; \

‎buildDockerImage.sh‎ renamed to ‎buildAndPushImage.sh‎

Lines changed: 36 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44

55
usage() {
6-
cat << EOF
6+
cat >&2 << EOF
77
8-
Usage: buildDockerImage.sh [-t tag]
9-
Builds a container image for the Oracle WebLogic Kubernetes Operator.
8+
Usage: buildAndPushImage.sh -t tag
9+
Builds and pushes a container image for the Oracle WebLogic Kubernetes Operator.
1010
1111
Parameters:
1212
-t: image name and tag in 'name:tag' format
1313
14-
Copyright (c) 2020, 2022, Oracle and/or its affiliates.
14+
Copyright (c) 2020, 2023, Oracle and/or its affiliates.
1515
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
1616
1717
EOF
18-
exit 0
1918
}
2019

2120
# WebLogic Kubernetes Operator Image Name
@@ -28,12 +27,15 @@ while getopts "t:" optname; do
2827
name="$OPTARG"
2928
;;
3029
\? )
31-
usage
30+
usage; exit 0
3231
;;
3332
esac
3433
done
3534

36-
IMAGE_NAME=${name:-ghcr.io/oracle/weblogic-kubernetes-operator:4.0.5}
35+
if [ ! "$name" ]; then
36+
echo "-t must be provided"
37+
usage; exit 1
38+
fi
3739
SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
3840

3941
# Proxy settings
@@ -59,14 +61,34 @@ if [ "$PROXY_SETTINGS" != "" ]; then
5961
fi
6062

6163
# ################## #
62-
# BUILDING THE IMAGE #
64+
# BUILDING AND PUSHING THE IMAGE #
6365
# ################## #
64-
echo "Building image '$IMAGE_NAME' ..."
66+
echo "Building image '$name' ..."
6567

66-
# BUILD THE IMAGE (replace all environment variables)
68+
# BUILD AND PUSH THE IMAGE (replace all environment variables)
6769
BUILD_START=$(date '+%s')
68-
${WLSIMG_BUILDER:-docker} build $PROXY_SETTINGS -t $IMAGE_NAME -f $SCRIPTPATH/Dockerfile $SCRIPTPATH || {
69-
echo "There was an error building the image."
70+
${WLSIMG_BUILDER:-docker} build $PROXY_SETTINGS --pull --platform linux/amd64 --tag $name-amd64 -f $SCRIPTPATH/Dockerfile $SCRIPTPATH || {
71+
echo "There was an error building the amd64 image."
72+
exit 1
73+
}
74+
${WLSIMG_BUILDER:-docker} push $PROXY_SETTINGS $name-amd64 || {
75+
echo "There was an error pushing the amd64 image."
76+
exit 1
77+
}
78+
${WLSIMG_BUILDER:-docker} build $PROXY_SETTINGS --pull --platform linux/arm64 --tag $name-aarch64 -f $SCRIPTPATH/Dockerfile $SCRIPTPATH || {
79+
echo "There was an error building the aarch64 image."
80+
exit 1
81+
}
82+
${WLSIMG_BUILDER:-docker} push $PROXY_SETTINGS $name-aarch64 || {
83+
echo "There was an error pushing the aarch64 image."
84+
exit 1
85+
}
86+
${WLSIMG_BUILDER:-docker} manifest create $PROXY_SETTINGS $name --amend $name-amd64 --amend $name-aarch64 || {
87+
echo "There was an error building the manifest."
88+
exit 1
89+
}
90+
${WLSIMG_BUILDER:-docker} manifest push $PROXY_SETTINGS $name || {
91+
echo "There was an error pushing the manifest."
7092
exit 1
7193
}
7294
BUILD_END=$(date '+%s')
@@ -78,9 +100,9 @@ if [ $? -eq 0 ]; then
78100
cat << EOF
79101
WebLogic Kubernetes Operator Image is ready:
80102
81-
--> $IMAGE_NAME
103+
--> $name
82104
83-
Build completed in $BUILD_ELAPSED seconds.
105+
Build and push completed in $BUILD_ELAPSED seconds.
84106
85107
EOF
86108
else

‎common/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@
6060
<artifactId>junit-jupiter</artifactId>
6161
<scope>test</scope>
6262
</dependency>
63+
<dependency>
64+
<groupId>org.slf4j</groupId>
65+
<artifactId>slf4j-api</artifactId>
66+
<version>${slf4j-version}</version>
67+
<scope>test</scope>
68+
</dependency>
6369
<dependency>
6470
<groupId>ch.qos.logback</groupId>
6571
<artifactId>logback-classic</artifactId>

‎documentation/4.0/content/developerguide/building.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ This will compile the source files, build JAR files containing the compiled clas
1818

1919
Contributions must conform to [coding and formatting standards]({{< relref "/developerguide/coding-standards.md" >}}).
2020

21-
#### Building the operator container image
21+
#### Building and pushing the operator container image
2222

2323
These commands should be executed in the project root directory:
2424

2525
```shell
26-
$ ./buildDockerImage.sh -t weblogic-kubernetes-operator:some-tag
26+
$ ./buildAndPushImage.sh -t weblogic-kubernetes-operator:some-tag
2727
```
2828

2929
Replace `<version>` with the version of the project found in the `pom.xml` file in the project root directory.

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItConfigDistributionStrategy.java‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import java.io.FileOutputStream;
88
import java.io.IOException;
99
import java.net.http.HttpResponse;
10-
import java.nio.charset.StandardCharsets;
1110
import java.nio.file.Files;
1211
import java.nio.file.Path;
1312
import java.nio.file.Paths;
@@ -65,6 +64,7 @@
6564
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
6665
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
6766
import static oracle.weblogic.kubernetes.TestConstants.OKD;
67+
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_12213;
6868
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
6969
import static oracle.weblogic.kubernetes.actions.ActionConstants.APP_DIR;
7070
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
@@ -95,6 +95,7 @@
9595
import static oracle.weblogic.kubernetes.utils.DeployUtil.deployUsingWlst;
9696
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
9797
import static oracle.weblogic.kubernetes.utils.ExecCommand.exec;
98+
import static oracle.weblogic.kubernetes.utils.FileUtils.replaceStringInFile;
9899
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
99100
import static oracle.weblogic.kubernetes.utils.JobUtils.createDomainJob;
100101
import static oracle.weblogic.kubernetes.utils.JobUtils.getIntrospectJobName;
@@ -561,10 +562,13 @@ void testOnRestartOverride() {
561562
//copy the template datasource file for override after replacing JDBC_URL with new datasource url
562563
Path srcDsOverrideFile = Paths.get(RESOURCE_DIR, "configfiles/configoverridesset1/jdbc-JdbcTestDataSource-1.xml");
563564
Path dstDsOverrideFile = Paths.get(WORK_DIR, "jdbc-JdbcTestDataSource-1.xml");
564-
String tempString = assertDoesNotThrow(()
565-
-> Files.readString(srcDsOverrideFile).replaceAll("JDBC_URL", dsUrl2));
566-
assertDoesNotThrow(()
567-
-> Files.write(dstDsOverrideFile, tempString.getBytes(StandardCharsets.UTF_8)));
565+
assertDoesNotThrow(() -> {
566+
Files.copy(srcDsOverrideFile, dstDsOverrideFile, StandardCopyOption.REPLACE_EXISTING);
567+
replaceStringInFile(dstDsOverrideFile.toString(), "JDBC_URL", dsUrl2);
568+
if (WEBLOGIC_12213) {
569+
replaceStringInFile(dstDsOverrideFile.toString(), "com.mysql.cj.jdbc.Driver", "com.mysql.jdbc.Driver");
570+
}
571+
});
568572

569573
List<Path> overrideFiles = new ArrayList<>();
570574
overrideFiles.add(dstDsOverrideFile);
@@ -1083,6 +1087,9 @@ private void createJdbcDataSource(String dsName, String user, String password,
10831087
logger.info("hostAndPort = {0} ", hostAndPort);
10841088
String jdbcDsUrl = "jdbc:mysql://" + hostAndPort;
10851089

1090+
// based on WebLogic image, change the mysql driver to
1091+
// 12.2.1.3 - com.mysql.jdbc.Driver
1092+
// 12.2.1.4 and above - com.mysql.cj.jdbc.Driver
10861093
// create a temporary WebLogic domain property file
10871094
File domainPropertiesFile = File.createTempFile("domain", "properties");
10881095
Properties p = new Properties();
@@ -1092,7 +1099,11 @@ private void createJdbcDataSource(String dsName, String user, String password,
10921099
p.setProperty("admin_password", ADMIN_PASSWORD_DEFAULT);
10931100
p.setProperty("dsName", dsName);
10941101
p.setProperty("dsUrl", jdbcDsUrl);
1095-
p.setProperty("dsDriver", "com.mysql.cj.jdbc.Driver");
1102+
if (WEBLOGIC_12213) {
1103+
p.setProperty("dsDriver", "com.mysql.jdbc.Driver");
1104+
} else {
1105+
p.setProperty("dsDriver", "com.mysql.cj.jdbc.Driver");
1106+
}
10961107
p.setProperty("dsUser", user);
10971108
p.setProperty("dsPassword", password);
10981109
p.setProperty("dsTarget", clusterName);

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioMiiDomain.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,14 @@ void testIstioModelInImageDomain() {
213213
managedServerPrefix + i, domainNamespace);
214214
checkPodReadyAndServiceExists(managedServerPrefix + i, domainUid, domainNamespace);
215215
}
216+
217+
218+
// delete the mTLS mode
219+
ExecResult result = assertDoesNotThrow(() -> ExecCommand.exec(KUBERNETES_CLI + " delete -f "
220+
+ Paths.get(WORK_DIR, "istio-tls-mode.yaml").toString(), true));
221+
assertEquals(0, result.exitValue(), "Got expected exit value");
222+
logger.info(result.stdout());
223+
logger.info(result.stderr());
216224

217225
String clusterService = domainUid + "-cluster-" + clusterName + "." + domainNamespace + ".svc.cluster.local";
218226

@@ -243,17 +251,6 @@ void testIstioModelInImageDomain() {
243251
int istioIngressPort = getIstioHttpIngressPort();
244252
logger.info("Istio Ingress Port is {0}", istioIngressPort);
245253

246-
String curlCmd = "curl -j -sk --show-error --noproxy '*' "
247-
+ " -H 'Host: " + domainNamespace + ".org'"
248-
+ " --url http://" + K8S_NODEPORT_HOST + ":" + istioIngressPort + "/console/login/LoginForm.jsp";
249-
ExecResult result;
250-
logger.info("curl command {0}", curlCmd);
251-
result = assertDoesNotThrow(() -> exec(curlCmd, true));
252-
assertEquals(0, result.exitValue(), "Got expected exit value");
253-
result = assertDoesNotThrow(() -> ExecCommand.exec(KUBERNETES_CLI + " delete -f "
254-
+ Paths.get(WORK_DIR, "istio-tls-mode.yaml").toString(), true));
255-
assertEquals(0, result.exitValue(), "Got expected exit value");
256-
257254
// We can not verify Rest Management console thru Adminstration NodePort
258255
// in istio, as we can not enable Adminstration NodePort
259256
if (!WEBLOGIC_SLIM) {
@@ -379,14 +376,17 @@ private DomainResource createDomainResource(String domainUid, String domNamespac
379376
}
380377

381378
private static void enableStrictMode(String namespace) {
382-
assertDoesNotThrow(() -> copyFile(Paths.get(RESOURCE_DIR, "istio", "istio-tls-mode.yaml").toFile(),
383-
Paths.get(WORK_DIR, "istio-tls-mode.yaml").toFile()));
384-
assertDoesNotThrow(() -> replaceStringInFile(Paths.get(WORK_DIR, "istio-tls-mode.yaml").toString(),
385-
"NAMESPACE", namespace));
386-
387-
ExecResult result = assertDoesNotThrow(() -> ExecCommand.exec(KUBERNETES_CLI + " apply -f "
388-
+ Paths.get(WORK_DIR, "istio-tls-mode.yaml").toString(), true));
389-
logger.info(result.stdout());
390-
logger.info(result.stderr());
379+
Path srcFile = Paths.get(RESOURCE_DIR, "istio", "istio-tls-mode.yaml");
380+
Path dstFile = Paths.get(WORK_DIR, "istio-tls-mode.yaml");
381+
logger.info("Enabling STRICT mTLS mode in istio in namesapce {0}", namespace);
382+
assertDoesNotThrow(() -> {
383+
copyFile(srcFile.toFile(), dstFile.toFile());
384+
replaceStringInFile(dstFile.toString(), "NAMESPACE", namespace);
385+
ExecResult result = ExecCommand.exec(KUBERNETES_CLI + " apply -f "
386+
+ Paths.get(WORK_DIR, "istio-tls-mode.yaml").toString(), true);
387+
assertEquals(0, result.exitValue(), "Failed to enable mTLS strict mode");
388+
logger.info(result.stdout());
389+
logger.info(result.stderr());
390+
});
391391
}
392392
}

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOpenshiftIstioMiiDomain.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ private DomainResource createDomainResource(String domainUid, String domNamespac
295295
.webLogicCredentialsSecret(new V1LocalObjectReference()
296296
.name(adminSecretName))
297297
.includeServerOutInPodLog(true)
298-
.serverStartPolicy("IF_NEEDED")
298+
.serverStartPolicy("IfNeeded")
299299
.serverPod(new ServerPod()
300300
.putAnnotationsItem("sidecar.istio.io/inject", "true")
301301
.addEnvItem(new V1EnvVar()

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ public interface TestConstants {
5050
"../kubernetes/charts/weblogic-operator";
5151
public static final String IMAGE_NAME_OPERATOR =
5252
getNonEmptySystemProperty("wko.it.image.name.operator", "oracle/weblogic-kubernetes-operator");
53-
public static final String OPERATOR_IMAGE_BUILD_SCRIPT =
54-
"../buildDockerImage.sh";
5553
public static final String OPERATOR_SERVICE_NAME = "internal-weblogic-operator-svc";
5654
public static final String OPERATOR_GITHUB_CHART_REPO_URL =
5755
"https://oracle.github.io/weblogic-kubernetes-operator/charts";
@@ -291,8 +289,31 @@ public interface TestConstants {
291289
public static final String PROMETHEUS_REPO_NAME = "prometheus-community";
292290
public static final String PROMETHEUS_REPO_URL = "https://prometheus-community.github.io/helm-charts";
293291

292+
public static final String PROMETHEUS_IMAGE_NAME = TEST_IMAGES_REPO
293+
+ "/weblogick8s/test-images/prometheus/prometheus";
294+
public static final String PROMETHEUS_IMAGE_TAG = "v2.39.1";
295+
296+
public static final String PROMETHEUS_ALERT_MANAGER_IMAGE_NAME = TEST_IMAGES_REPO
297+
+ "/weblogick8s/test-images/prometheus/alertmanager";
298+
public static final String PROMETHEUS_ALERT_MANAGER_IMAGE_TAG = "v0.24.0";
299+
300+
public static final String PROMETHEUS_CONFIG_MAP_RELOAD_IMAGE_NAME = TEST_IMAGES_REPO
301+
+ "/weblogick8s/test-images/jimmidyson/configmap-reload";
302+
public static final String PROMETHEUS_CONFIG_MAP_RELOAD_IMAGE_TAG = "v0.5.0";
303+
304+
public static final String PROMETHEUS_PUSHGATEWAY_IMAGE_NAME = TEST_IMAGES_REPO
305+
+ "/weblogick8s/test-images/prometheus/pushgateway";
306+
public static final String PROMETHEUS_PUSHGATEWAY_IMAGE_TAG = "v1.4.3";
307+
308+
public static final String PROMETHEUS_NODE_EXPORTER_IMAGE_NAME = TEST_IMAGES_REPO
309+
+ "/weblogick8s/test-images/prometheus/node-exporter";
310+
public static final String PROMETHEUS_NODE_EXPORTER_IMAGE_TAG = "v1.3.1";
311+
294312
public static final String GRAFANA_REPO_NAME = "grafana";
295313
public static final String GRAFANA_REPO_URL = "https://grafana.github.io/helm-charts";
314+
public static final String GRAFANA_IMAGE_NAME = TEST_IMAGES_REPO
315+
+ "/weblogick8s/test-images/grafana/grafana";
316+
public static final String GRAFANA_IMAGE_TAG = "9.3.0";
296317

297318
// credentials
298319
public static final String ADMIN_USERNAME_DEFAULT = "weblogic";

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Operator.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.weblogic.kubernetes.actions.impl;
@@ -9,13 +9,13 @@
99
import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
1010
import oracle.weblogic.kubernetes.actions.impl.primitive.Helm;
1111
import oracle.weblogic.kubernetes.actions.impl.primitive.HelmParams;
12+
import oracle.weblogic.kubernetes.actions.impl.primitive.Image;
1213

1314
import static oracle.weblogic.kubernetes.TestConstants.BUILD_ID;
1415
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_REPO;
1516
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_NAME_OPERATOR;
1617
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_TAG_OPERATOR;
1718
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_TAG_OPERATOR_FOR_JENKINS;
18-
import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_IMAGE_BUILD_SCRIPT;
1919
import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_RELEASE_NAME;
2020
import static oracle.weblogic.kubernetes.actions.impl.primitive.Kubernetes.getContainerImage;
2121
import static oracle.weblogic.kubernetes.actions.impl.primitive.Kubernetes.patchDeployment;
@@ -94,11 +94,7 @@ public static String getImageName() {
9494
* @return true on success
9595
*/
9696
public static boolean buildImage(String image) {
97-
String command = String.format("%s -t %s", OPERATOR_IMAGE_BUILD_SCRIPT, image);
98-
return Command
99-
.withParams(new CommandParams()
100-
.command(command))
101-
.execute();
97+
return Image.createImage("..", image, "");
10298
}
10399

104100
/**

0 commit comments

Comments
 (0)