Skip to content

Commit 898f485

Browse files
breskebybreskeby
authored
Merge branch '8.x' into renovate/8.x-wolfi-versioned
2 parents 67023d6 + 55c91d6 commit 898f485

File tree

365 files changed

+7513
-3099
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

365 files changed

+7513
-3099
lines changed

‎build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleInternalPluginFuncTest.groovy‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,22 @@ abstract class AbstractGradleInternalPluginFuncTest extends AbstractJavaGradleFu
2020
plugins {
2121
id 'elasticsearch.java-toolchain'
2222
}
23+
24+
toolchainManagement {
25+
jvm {
26+
javaRepositories {
27+
repository('bundledOracleOpendJdk') {
28+
resolverClass = org.elasticsearch.gradle.internal.toolchain.OracleOpenJdkToolchainResolver
29+
}
30+
repository('adoptiumJdks') {
31+
resolverClass = org.elasticsearch.gradle.internal.toolchain.AdoptiumJdkToolchainResolver
32+
}
33+
repository('archivedOracleJdks') {
34+
resolverClass = org.elasticsearch.gradle.internal.toolchain.ArchivedOracleJdkToolchainResolver
35+
}
36+
}
37+
}
38+
}
2339
""" + settingsFile.text
2440

2541
buildFile << """

‎build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractRestResourcesFuncTest.groovy‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,27 @@ package org.elasticsearch.gradle.fixtures;
1313
abstract class AbstractRestResourcesFuncTest extends AbstractGradleFuncTest {
1414

1515
def setup() {
16+
settingsFile.text = """
17+
plugins {
18+
id 'elasticsearch.java-toolchain'
19+
}
20+
21+
toolchainManagement {
22+
jvm {
23+
javaRepositories {
24+
repository('bundledOracleOpendJdk') {
25+
resolverClass = org.elasticsearch.gradle.internal.toolchain.OracleOpenJdkToolchainResolver
26+
}
27+
repository('adoptiumJdks') {
28+
resolverClass = org.elasticsearch.gradle.internal.toolchain.AdoptiumJdkToolchainResolver
29+
}
30+
repository('archivedOracleJdks') {
31+
resolverClass = org.elasticsearch.gradle.internal.toolchain.ArchivedOracleJdkToolchainResolver
32+
}
33+
}
34+
}
35+
}
36+
""" + settingsFile.text
1637
subProject(":test:framework") << "apply plugin: 'elasticsearch.java'"
1738
subProject(":test:test-clusters") << "apply plugin: 'elasticsearch.java'"
1839
subProject(":test:yaml-rest-runner") << "apply plugin: 'elasticsearch.java'"

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ public enum DockerBase {
2828
"-wolfi",
2929
"apk"
3030
),
31-
32-
FIPS("docker.elastic.co/wolfi/chainguard-base-fips:sha256-feb7aeb1bbcb331afa089388f2fa1e81997fc24642ca4fa06b7e502ff599a4cf", "-fips", "apk"),
31+
FIPS("docker.elastic.co/wolfi/chainguard-base-fips:sha256-ebfc3f1d7dba992231747a2e05ad1b859843e81b5e676ad342859d7cf9e425a7", "-fips", "apk"),
3332
// spotless:on
3433

3534
// Based on WOLFI above, with more extras. We don't set a base image because

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RestrictedBuildApiService.java‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,7 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
3636
map.put(LegacyRestTestBasePlugin.class, ":qa:remote-clusters");
3737
map.put(LegacyRestTestBasePlugin.class, ":qa:repository-multi-version");
3838
map.put(LegacyRestTestBasePlugin.class, ":qa:rolling-upgrade-legacy");
39-
map.put(LegacyRestTestBasePlugin.class, ":qa:smoke-test-http");
40-
map.put(LegacyRestTestBasePlugin.class, ":qa:smoke-test-ingest-disabled");
41-
map.put(LegacyRestTestBasePlugin.class, ":qa:smoke-test-ingest-with-all-dependencies");
42-
map.put(LegacyRestTestBasePlugin.class, ":qa:smoke-test-plugins");
43-
map.put(LegacyRestTestBasePlugin.class, ":qa:system-indices");
44-
map.put(LegacyRestTestBasePlugin.class, ":test:external-modules:test-apm-integration");
45-
map.put(LegacyRestTestBasePlugin.class, ":test:external-modules:test-delayed-aggs");
46-
map.put(LegacyRestTestBasePlugin.class, ":test:external-modules:test-die-with-dignity");
47-
map.put(LegacyRestTestBasePlugin.class, ":test:external-modules:test-error-query");
48-
map.put(LegacyRestTestBasePlugin.class, ":test:external-modules:test-latency-simulating-directory");
49-
map.put(LegacyRestTestBasePlugin.class, ":test:yaml-rest-runner");
50-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:core");
5139
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ent-search");
52-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:fleet");
5340
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:logstash");
5441
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:vector-tile");
5542
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:mixed-tier-cluster");
@@ -65,8 +52,6 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
6552
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:smoke-test-plugins-ssl");
6653
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:smoke-test-security-with-mustache");
6754
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:xpack-prefix-rest-compat");
68-
map.put(LegacyRestTestBasePlugin.class, ":modules:ingest-geoip:qa:file-based-update");
69-
map.put(LegacyRestTestBasePlugin.class, ":plugins:discovery-gce:qa:gce");
7055
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:multi-cluster-search-security:legacy-with-basic-license");
7156
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:multi-cluster-search-security:legacy-with-full-license");
7257
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:multi-cluster-search-security:legacy-with-restricted-trust");
@@ -91,7 +76,6 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
9176
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:eql:qa:ccs-rolling-upgrade");
9277
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:eql:qa:correctness");
9378
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:eql:qa:mixed-node");
94-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:fleet:qa:rest");
9579
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:identity-provider:qa:idp-rest-tests");
9680
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ilm:qa:multi-cluster");
9781
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ilm:qa:multi-node");

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/InternalElasticsearchDistributionTypes.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public class InternalElasticsearchDistributionTypes {
2121
public static final ElasticsearchDistributionType DOCKER_IRONBANK = new DockerIronBankElasticsearchDistributionType();
2222
public static final ElasticsearchDistributionType DOCKER_CLOUD_ESS = new DockerCloudEssElasticsearchDistributionType();
2323
public static final ElasticsearchDistributionType DOCKER_WOLFI = new DockerWolfiElasticsearchDistributionType();
24-
public static final ElasticsearchDistributionType DOCKER_FIPS = new DockerFipsElasticsearchDistributionType();
2524

2625
public static List<ElasticsearchDistributionType> ALL_INTERNAL = List.of(
2726
DEB,
@@ -30,7 +29,6 @@ public class InternalElasticsearchDistributionTypes {
3029
DOCKER_UBI,
3130
DOCKER_IRONBANK,
3231
DOCKER_CLOUD_ESS,
33-
DOCKER_WOLFI,
34-
DOCKER_FIPS
32+
DOCKER_WOLFI
3533
);
3634
}

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DEB;
5252
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER;
5353
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_CLOUD_ESS;
54-
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_FIPS;
5554
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_IRONBANK;
5655
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_UBI;
5756
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_WOLFI;
@@ -154,7 +153,6 @@ private static Map<ElasticsearchDistributionType, TaskProvider<?>> lifecycleTask
154153
lifecyleTasks.put(DOCKER_IRONBANK, project.getTasks().register(taskPrefix + ".docker-ironbank"));
155154
lifecyleTasks.put(DOCKER_CLOUD_ESS, project.getTasks().register(taskPrefix + ".docker-cloud-ess"));
156155
lifecyleTasks.put(DOCKER_WOLFI, project.getTasks().register(taskPrefix + ".docker-wolfi"));
157-
lifecyleTasks.put(DOCKER_FIPS, project.getTasks().register(taskPrefix + ".docker-fips"));
158156
lifecyleTasks.put(ARCHIVE, project.getTasks().register(taskPrefix + ".archives"));
159157
lifecyleTasks.put(DEB, project.getTasks().register(taskPrefix + ".packages"));
160158
lifecyleTasks.put(RPM, lifecyleTasks.get(DEB));

‎distribution/docker/fips-docker-aarch64-export/build.gradle‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the "Elastic License
4+
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
5+
* Public License v 1"; you may not use this file except in compliance with, at
6+
* your election, the "Elastic License 2.0", the "GNU Affero General Public
7+
* License v3.0 only", or the "Server Side Public License, v 1".
8+
*/
9+

‎distribution/docker/src/docker/Dockerfile‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -118,45 +118,45 @@ RUN sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' bin/elas
118118
find config -type f -exec chmod 0664 {} +
119119

120120
<% if (docker_base == "fips") { %>
121-
# Add plugins infrastructure
122-
RUN mkdir -p /opt/plugins/archive
123-
RUN chmod -R 0555 /opt/plugins
124-
125-
RUN mkdir -p /fips/libs
126-
COPY fips/libs/*.jar /fips/libs/
127-
128-
COPY filebeat-${version}.tar.gz metricbeat-${version}.tar.gz /tmp/
129-
RUN set -eux ; \\
130-
for beat in filebeat metricbeat ; do \\
131-
if [ ! -s /tmp/\$beat-${version}.tar.gz ]; then \\
132-
echo "/tmp/\$beat-${version}.tar.gz is empty - cannot uncompress" 2>&1 ; \\
133-
exit 1 ; \\
134-
fi ; \\
135-
if ! tar tf /tmp/\$beat-${version}.tar.gz >/dev/null; then \\
136-
echo "/tmp/\$beat-${version}.tar.gz is corrupt - cannot uncompress" 2>&1 ; \\
137-
exit 1 ; \\
138-
fi ; \\
139-
mkdir -p /opt/\$beat ; \\
140-
tar xf /tmp/\$beat-${version}.tar.gz -C /opt/\$beat --strip-components=1 ; \\
141-
done
142-
143-
COPY plugins/*.zip /opt/plugins/archive/
144-
145-
RUN chown 1000:1000 /opt/plugins/archive/*
146-
RUN chmod 0444 /opt/plugins/archive/*
147-
148-
COPY fips/resources/fips_java.security /usr/share/elasticsearch/config/fips_java.security
149-
COPY fips/resources/fips_java.policy /usr/share/elasticsearch/config/fips_java.policy
150-
151-
WORKDIR /usr/share/elasticsearch/config
152-
153-
## Add fips specific JVM options
154-
RUN cat <<EOF > /usr/share/elasticsearch/config/jvm.options.d/fips.options
155-
-Djavax.net.ssl.keyStoreType=BCFKS
156-
-Dorg.bouncycastle.fips.approved_only=true
157-
-Djava.security.properties=config/fips_java.security
158-
-Djava.security.policy=config/fips_java.policy
159-
EOF
121+
# Add plugins infrastructure
122+
RUN mkdir -p /opt/plugins/archive
123+
RUN chmod -R 0555 /opt/plugins
124+
125+
RUN mkdir -p /fips/libs
126+
COPY fips/libs/*.jar /fips/libs/
127+
128+
COPY filebeat-${version}.tar.gz metricbeat-${version}.tar.gz /tmp/
129+
RUN set -eux ; \\
130+
for beat in filebeat metricbeat ; do \\
131+
if [ ! -s /tmp/\$beat-${version}.tar.gz ]; then \\
132+
echo "/tmp/\$beat-${version}.tar.gz is empty - cannot uncompress" 2>&1 ; \\
133+
exit 1 ; \\
134+
fi ; \\
135+
if ! tar tf /tmp/\$beat-${version}.tar.gz >/dev/null; then \\
136+
echo "/tmp/\$beat-${version}.tar.gz is corrupt - cannot uncompress" 2>&1 ; \\
137+
exit 1 ; \\
138+
fi ; \\
139+
mkdir -p /opt/\$beat ; \\
140+
tar xf /tmp/\$beat-${version}.tar.gz -C /opt/\$beat --strip-components=1 ; \\
141+
done
142+
143+
COPY plugins/*.zip /opt/plugins/archive/
144+
145+
RUN chown 1000:1000 /opt/plugins/archive/*
146+
RUN chmod 0444 /opt/plugins/archive/*
147+
148+
COPY fips/resources/fips_java.security /usr/share/elasticsearch/config/fips_java.security
149+
COPY fips/resources/fips_java.policy /usr/share/elasticsearch/config/fips_java.policy
150+
151+
WORKDIR /usr/share/elasticsearch/config
152+
153+
## Add fips specific JVM options
154+
RUN cat <<EOF > /usr/share/elasticsearch/config/jvm.options.d/fips.options
155+
-Djavax.net.ssl.keyStoreType=BCFKS
156+
-Dorg.bouncycastle.fips.approved_only=true
157+
-Djava.security.properties=config/fips_java.security
158+
-Djava.security.policy=config/fips_java.policy
159+
EOF
160160
<% } %>
161161

162162
################################################################################

‎docs/changelog/125389.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 125389
2+
summary: Support indices created in ESv6 and updated in ESV7 using different LuceneCodecs
3+
as archive in current version.
4+
area: Search
5+
type: bug
6+
issues: []

‎docs/changelog/125659.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 125659
2+
summary: Non existing synonyms sets do not fail shard recovery for indices
3+
area: "Analysis"
4+
type: bug
5+
issues:
6+
- 125603

0 commit comments

Comments
 (0)