Skip to content

Commit 2a3e921

Browse files
JvD-EricssonJvD-Ericsson
committed
strimzi with allies releases
Signed-off-by: JvD_Ericsson <[email protected]>
1 parent d260e5a commit 2a3e921

File tree

4 files changed

+55
-26
lines changed

4 files changed

+55
-26
lines changed

‎docker-images/artifacts/kafka-thirdparty-libs/4.0.x/pom.xml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<strimzi-oauth.version>0.17.1</strimzi-oauth.version>
2020
<strimzi-metrics-reporter.version>0.2.0</strimzi-metrics-reporter.version>
2121
<prometheus.version>1.3.6</prometheus.version>
22-
<cruise-control.version>2.5.146</cruise-control.version>
22+
<cruise-control.version>3.0.4</cruise-control.version>
2323
<opa-authorizer.version>1.5.1</opa-authorizer.version>
2424
<kafka-quotas-plugin.version>0.4.0</kafka-quotas-plugin.version>
2525
<kafka-kubernetes-config-provider.version>1.2.0</kafka-kubernetes-config-provider.version>
@@ -34,7 +34,7 @@
3434
<repositories>
3535
<repository>
3636
<id>cruise-control</id>
37-
<url>https://linkedin.jfrog.io/artifactory/cruise-control/</url>
37+
<url>https://artifactory.nordix.org/artifactory/allies-mvn/</url>
3838
</repository>
3939
</repositories>
4040

@@ -268,8 +268,17 @@
268268
<groupId>com.fasterxml.jackson.core</groupId>
269269
<artifactId>jackson-databind</artifactId>
270270
</exclusion>
271+
<exclusion>
272+
<groupId>commons-beanutils</groupId>
273+
<artifactId>commons-beanutils</artifactId>
274+
</exclusion>
271275
</exclusions>
272276
</dependency>
277+
<dependency>
278+
<groupId>commons-beanutils</groupId>
279+
<artifactId>commons-beanutils</artifactId>
280+
<version>1.11.0</version>
281+
</dependency>
273282
<!-- Metrics Reporter -->
274283
<dependency>
275284
<groupId>io.strimzi</groupId>

‎docker-images/artifacts/kafka-thirdparty-libs/4.1.x/pom.xml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<strimzi-oauth.version>0.17.1</strimzi-oauth.version>
2020
<strimzi-metrics-reporter.version>0.2.0</strimzi-metrics-reporter.version>
2121
<prometheus.version>1.3.6</prometheus.version>
22-
<cruise-control.version>2.5.146</cruise-control.version>
22+
<cruise-control.version>3.0.4</cruise-control.version>
2323
<opa-authorizer.version>1.5.1</opa-authorizer.version>
2424
<kafka-quotas-plugin.version>0.4.0</kafka-quotas-plugin.version>
2525
<kafka-kubernetes-config-provider.version>1.2.0</kafka-kubernetes-config-provider.version>
@@ -34,7 +34,7 @@
3434
<repositories>
3535
<repository>
3636
<id>cruise-control</id>
37-
<url>https://linkedin.jfrog.io/artifactory/cruise-control/</url>
37+
<url>https://artifactory.nordix.org/artifactory/allies-mvn/</url>
3838
</repository>
3939
</repositories>
4040

@@ -268,8 +268,17 @@
268268
<groupId>com.fasterxml.jackson.core</groupId>
269269
<artifactId>jackson-databind</artifactId>
270270
</exclusion>
271+
<exclusion>
272+
<groupId>commons-beanutils</groupId>
273+
<artifactId>commons-beanutils</artifactId>
274+
</exclusion>
271275
</exclusions>
272276
</dependency>
277+
<dependency>
278+
<groupId>commons-beanutils</groupId>
279+
<artifactId>commons-beanutils</artifactId>
280+
<version>1.11.0</version>
281+
</dependency>
273282
<!-- Metrics Reporter -->
274283
<dependency>
275284
<groupId>io.strimzi</groupId>

‎docker-images/artifacts/kafka-thirdparty-libs/cc/pom.xml‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,33 @@
1616
</licenses>
1717

1818
<properties>
19-
<cruise-control.version>2.5.146</cruise-control.version>
19+
<cruise-control.version>3.0.4</cruise-control.version>
2020
<log4j.version>2.17.2</log4j.version>
2121
</properties>
2222

2323
<repositories>
24-
<repository>
25-
<id>cruise-control</id>
26-
<url>https://linkedin.jfrog.io/artifactory/cruise-control/</url>
27-
</repository>
24+
<repository>
25+
<id>cruise-control</id>
26+
<url>https://artifactory.nordix.org/artifactory/allies-mvn/</url>
27+
</repository>
2828
</repositories>
2929

3030
<dependencies>
3131
<dependency>
3232
<groupId>com.linkedin.cruisecontrol</groupId>
3333
<artifactId>cruise-control</artifactId>
3434
<version>${cruise-control.version}</version>
35+
<exclusions>
36+
<exclusion>
37+
<groupId>commons-beanutils</groupId>
38+
<artifactId>commons-beanutils</artifactId>
39+
</exclusion>
40+
</exclusions>
41+
</dependency>
42+
<dependency>
43+
<groupId>commons-beanutils</groupId>
44+
<artifactId>commons-beanutils</artifactId>
45+
<version>1.11.0</version>
3546
</dependency>
3647
<!-- Support for the new JsonTemplateLayout as appender type -->
3748
<dependency>

‎docker-images/kafka-based/kafka/Dockerfile‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,38 +37,38 @@ RUN mkdir $KAFKA_HOME/plugins
3737
# Add Kafka Exporter
3838
#####
3939
ENV KAFKA_EXPORTER_HOME=/opt/kafka-exporter
40-
ENV KAFKA_EXPORTER_VERSION=1.9.0
41-
ENV KAFKA_EXPORTER_CHECKSUM_AMD64="2bf79378221e7662c054d5dafaa48c0a77b8d6036d31d5fde3aaa1d2049e5619f6f9d21c2e2a0944e38a916fc12fbcb8e200ec5daf4f9019d6a35bc85f79eb39 kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-amd64.tar.gz"
42-
ENV KAFKA_EXPORTER_CHECKSUM_ARM64="d57cd7478f632cd05e8d5296377da59dfe934e154c1c6ccda9f109137c740132e17fc358d4cb29523b0f575a72ac6b7e2bd87b6ecb9363bba86035a8b14df9e4 kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-arm64.tar.gz"
43-
ENV KAFKA_EXPORTER_CHECKSUM_PPC64LE="f39618b082630f314939accb05622471191fd627cf3e7d07bfbafa69cc850f1f4987e64433eb3ec44e7dbb235cc4d3867b06c89a833085dd9a65f3f0bebf18e9 kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-ppc64le.tar.gz"
44-
ENV KAFKA_EXPORTER_CHECKSUM_S390X="58bac418666f525ef255049d3a21f508dbe3c138696b6183c1cef21d4fee747dde2bc6d2cd7c94f3c9a0d0185a42b67b01eb61cad66acb6e4254ba6b46cd259a kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-s390x.tar.gz"
40+
ENV KAFKA_EXPORTER_VERSION=allies-1.9.1
41+
ENV KAFKA_EXPORTER_CHECKSUM_AMD64="6741de0ecfe865c68fc66ac76b2b9e85a83007d8eb0ab1e46a7bf7ccd6ff7362 kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-amd64.tar.gz"
42+
ENV KAFKA_EXPORTER_CHECKSUM_ARM64="b4fbac93f3eb19294b0312be14c938090e7cdd07ef89bb90e02240c5546d2607 kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-arm64.tar.gz"
43+
ENV KAFKA_EXPORTER_CHECKSUM_PPC64LE="04ff854c0dc3c153d13f5bee5c8fbe7a549e436fb14eb8d8d8326a8639d58925 kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-ppc64le.tar.gz"
44+
ENV KAFKA_EXPORTER_CHECKSUM_S390X="3b937b678b6eab1a61612a3c0dfdd6eb38d0d8ab3aa5c78ffaaa41bff55e8d8a kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-s390x.tar.gz"
4545

4646
RUN set -ex; \
4747
if [[ "${TARGETOS}/${TARGETARCH}" = "linux/arm64" ]]; then \
48-
curl -LO https://github.com/danielqsj/kafka_exporter/releases/download/v${KAFKA_EXPORTER_VERSION}/kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-arm64.tar.gz; \
49-
echo $KAFKA_EXPORTER_CHECKSUM_ARM64 > kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-arm64.tar.gz.sha512; \
50-
sha512sum --check kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-arm64.tar.gz.sha512; \
48+
curl -LO https://artifactory.nordix.org/artifactory/allies/kafka_exporter/allies-v1.9.1/.tarballs/kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-arm64.tar.gz; \
49+
echo $KAFKA_EXPORTER_CHECKSUM_ARM64 > kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-arm64.tar.gz.sha256; \
50+
sha256sum --check kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-arm64.tar.gz.sha256; \
5151
mkdir $KAFKA_EXPORTER_HOME; \
5252
tar xvfz kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-arm64.tar.gz -C $KAFKA_EXPORTER_HOME --strip-components=1; \
5353
rm -f kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-arm64.tar.gz*; \
5454
elif [[ "${TARGETOS}/${TARGETARCH}" = "linux/ppc64le" ]]; then \
55-
curl -LO https://github.com/danielqsj/kafka_exporter/releases/download/v${KAFKA_EXPORTER_VERSION}/kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-ppc64le.tar.gz; \
56-
echo $KAFKA_EXPORTER_CHECKSUM_PPC64LE > kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-ppc64le.tar.gz.sha512; \
57-
sha512sum --check kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-ppc64le.tar.gz.sha512; \
55+
curl -LO https://artifactory.nordix.org/artifactory/allies/kafka_exporter/allies-v1.9.1/.tarballs/kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-ppc64le.tar.gz; \
56+
echo $KAFKA_EXPORTER_CHECKSUM_PPC64LE > kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-ppc64le.tar.gz.sha256; \
57+
sha256sum --check kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-ppc64le.tar.gz.sha256; \
5858
mkdir $KAFKA_EXPORTER_HOME; \
5959
tar xvfz kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-ppc64le.tar.gz -C $KAFKA_EXPORTER_HOME --strip-components=1; \
6060
rm -f kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-ppc64le.tar.gz*; \
6161
elif [[ "${TARGETOS}/${TARGETARCH}" = "linux/s390x" ]]; then \
62-
curl -LO https://github.com/danielqsj/kafka_exporter/releases/download/v${KAFKA_EXPORTER_VERSION}/kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-s390x.tar.gz; \
63-
echo $KAFKA_EXPORTER_CHECKSUM_S390X > kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-s390x.tar.gz.sha512; \
64-
sha512sum --check kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-s390x.tar.gz.sha512; \
62+
curl -LO https://artifactory.nordix.org/artifactory/allies/kafka_exporter/allies-v1.9.1/.tarballs/kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-s390x.tar.gz; \
63+
echo $KAFKA_EXPORTER_CHECKSUM_S390X > kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-s390x.tar.gz.sha256; \
64+
sha256sum --check kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-s390x.tar.gz.sha256; \
6565
mkdir $KAFKA_EXPORTER_HOME; \
6666
tar xvfz kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-s390x.tar.gz -C $KAFKA_EXPORTER_HOME --strip-components=1; \
6767
rm -f kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-s390x.tar.gz*; \
6868
else \
69-
curl -LO https://github.com/danielqsj/kafka_exporter/releases/download/v${KAFKA_EXPORTER_VERSION}/kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-amd64.tar.gz; \
70-
echo $KAFKA_EXPORTER_CHECKSUM_AMD64 > kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-amd64.tar.gz.sha512; \
71-
sha512sum --check kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-amd64.tar.gz.sha512; \
69+
curl -LO https://artifactory.nordix.org/artifactory/allies/kafka_exporter/allies-v1.9.1/.tarballs/kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-amd64.tar.gz; \
70+
echo $KAFKA_EXPORTER_CHECKSUM_AMD64 > kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-amd64.tar.gz.sha256; \
71+
sha256sum --check kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-amd64.tar.gz.sha256; \
7272
mkdir $KAFKA_EXPORTER_HOME; \
7373
tar xvfz kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-amd64.tar.gz -C $KAFKA_EXPORTER_HOME --strip-components=1; \
7474
rm -f kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-amd64.tar.gz*; \

0 commit comments

Comments
 (0)