Skip to content

Commit 42a9115

Browse files
ishikaa-pishikaa-p
authored
Merge pull request #1997 from confluentinc/cherrypick-Ansieng-4487
[pick-changes] | Merge pull request #1970 from confluentinc/Java-21-A…
2 parents 9f97fae + e6ebb56 commit 42a9115

File tree

44 files changed

+396
-396
lines changed

Some content is hidden

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

44 files changed

+396
-396
lines changed

‎molecule/Dockerfile-amazonlinux2023.j2

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ RUN yum -y install rpm \
1111
&& yum install -y systemd \
1212
&& yum clean all
1313

14+
# Install Amazon Corretto 21
15+
RUN yum -y install java-21-amazon-corretto
16+
1417
# Enable systemd
1518
CMD ["/sbin/init"]
1619

‎molecule/Dockerfile-centos8-base.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers
5252
VOLUME ["/sys/fs/cgroup"]
5353
CMD ["/usr/lib/systemd/systemd"]
5454

55-
RUN yum -y install java-11-openjdk \
55+
RUN yum -y install java-17-openjdk \
5656
rsync \
5757
openssl \
5858
procps \

‎molecule/Dockerfile-debian-java8.j2 renamed to ‎molecule/Dockerfile-debian-java21.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN apt-get update && \
1313
apt-transport-https \
1414
gnupg \
1515
software-properties-common \
16-
openjdk-8-jdk \
16+
openjdk-21-jdk \
1717
rsync \
1818
ca-certificates \
1919
openssl \

‎molecule/Dockerfile-debian12.j2

+5-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ RUN apt-get update && \
2121

2222
{% set ARCHITECTURE_SHORTHAND = lookup('env', 'ARCHITECTURE_SHORTHAND') | default ('x64', true) %}
2323

24-
RUN wget https://download.java.net/java/GA/jdk17.0.1/2a2082e5a09d4267845be086888add4f/12/GPL/openjdk-17.0.1_linux-{{ ARCHITECTURE_SHORTHAND }}_bin.tar.gz
25-
RUN tar xvf openjdk-17.0.1_linux-{{ ARCHITECTURE_SHORTHAND }}_bin.tar.gz
26-
RUN sudo mv jdk-17*/ /opt/jdk17
27-
RUN rm -rf openjdk-17.0.1_linux-{{ ARCHITECTURE_SHORTHAND }}_bin.tar.gz
24+
RUN wget https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-{{ ARCHITECTURE_SHORTHAND }}_bin.tar.gz && \
25+
tar xvf openjdk-21.0.2_linux-{{ ARCHITECTURE_SHORTHAND }}_bin.tar.gz && \
26+
sudo mv jdk-21*/ /opt/jdk21 && \
27+
ln -s /opt/jdk21/bin/java /usr/bin/java && \
28+
rm -rf openjdk-21.0.2_linux-{{ ARCHITECTURE_SHORTHAND }}_bin.tar.gz
2829

2930
# Create a systemd service for running in the container
3031
RUN mkdir -p /etc/systemd/system/docker.service.d && \

‎molecule/Dockerfile-rhel-java11.j2 renamed to ‎molecule/Dockerfile-rhel-java21.j2

+3-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers
2727
VOLUME ["/sys/fs/cgroup"]
2828
CMD ["/usr/lib/systemd/systemd"]
2929

30-
RUN yum -y install java-11-openjdk \
30+
RUN yum -y install java-21-openjdk \
3131
rsync \
3232
openssl \
3333
rsyslog \
@@ -39,7 +39,8 @@ RUN yum -y install java-11-openjdk \
3939
unzip \
4040
procps \
4141
procps-ng \
42-
tzdata-java
42+
tzdata-java \
43+
tar
4344

4445
{% set DEFAULT_PACKAGE_VER = lookup('pipe', "awk '/confluent_package_version:/ {print $2}' $MOLECULE_PROJECT_DIRECTORY/roles/variables/defaults/main.yml" ) %}
4546
{% set PACKAGE_VER = lookup('env', 'VERSION') | default(DEFAULT_PACKAGE_VER, true) %}

‎molecule/Dockerfile-ubuntu.j2 renamed to ‎molecule/Dockerfile-ubuntu-java17.j2

File renamed without changes.

‎molecule/Dockerfile-ubuntu-java11.j2 renamed to ‎molecule/Dockerfile-ubuntu-java21.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM {{ item.image }}
22

33
RUN mkdir -p /usr/share/man/man1 && \
44
apt-get update -y && \
5-
apt-get install -y openjdk-11-jdk wget gnupg vim jq && \
5+
apt-get install -y openjdk-21-jdk wget gnupg vim jq && \
66
apt-get install -y dirmngr
77

88
{% set DEFAULT_PACKAGE_VER = lookup('pipe', "awk '/confluent_package_version:/ {print $2}' $MOLECULE_PROJECT_DIRECTORY/roles/variables/defaults/main.yml" ) %}

‎molecule/Dockerfile-ubuntu-java8.j2

-34
This file was deleted.

‎molecule/archive-plain-debian/molecule.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,4 @@ provisioner:
136136
kafka_connect_log_dir: /connect/logs
137137
ksql_log_dir: /ksql/logs/
138138
control_center_log_dir: /c3/logs
139-
custom_java_path: /opt/jdk17 # Use custom java 17
139+
custom_java_path: /opt/jdk21 # Use custom java 21

‎molecule/archive-plain-debian/verify.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
shell: java -version
1212
register: version_output
1313

14-
- name: Assert Java Version is 17
14+
- name: Assert Java Version is 21
1515
assert:
1616
that:
17-
- version_output.stderr_lines[0] | regex_search("17\.0\.")
17+
- version_output.stderr_lines[0] | regex_search("21\.")
1818
fail_msg: "Current Java Version is: {{version_output.stderr_lines[0]}}. Verify again"
1919
quiet: true
2020

‎molecule/archive-zookeeper-tls-rhel-fips/molecule.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -129,18 +129,18 @@ platforms:
129129
privileged: true
130130
networks:
131131
- name: confluent
132-
- name: control-center1
133-
hostname: control-center1.confluent
134-
groups:
135-
- control_center
136-
image: rockylinux:8-minimal
137-
dockerfile: ../Dockerfile-rhel-java17.j2
138-
command: ""
139-
volumes:
140-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
141-
privileged: true
142-
networks:
143-
- name: confluent
132+
# - name: control-center1
133+
# hostname: control-center1.confluent
134+
# groups:
135+
# - control_center
136+
# image: rockylinux:8-minimal
137+
# dockerfile: ../Dockerfile-rhel-java17.j2
138+
# command: ""
139+
# volumes:
140+
# - /sys/fs/cgroup:/sys/fs/cgroup:ro
141+
# privileged: true
142+
# networks:
143+
# - name: confluent
144144
provisioner:
145145
name: ansible
146146
config_options:

‎molecule/broker-scale-up/converge.yml

+24-24
Original file line numberDiff line numberDiff line change
@@ -56,33 +56,33 @@
5656
- broker_cnt.stdout == "3"
5757
when: kraft_mode|bool
5858

59-
- name: Verify New brokers are not there in control-center properties
60-
hosts: control_center
61-
gather_facts: false
62-
tasks:
63-
- name: Check line brokers list - Exact Match should have new brokers as well
64-
import_role:
65-
name: confluent.test
66-
tasks_from: check_property.yml
67-
vars:
68-
file_path: /etc/confluent-control-center/control-center-production.properties
69-
property: bootstrap.servers
70-
expected_value: kafka-broker1:9092,kafka-broker2:9092,kafka-broker3:9092
59+
# - name: Verify New brokers are not there in control-center properties
60+
# hosts: control_center
61+
# gather_facts: false
62+
# tasks:
63+
# - name: Check line brokers list - Exact Match should have new brokers as well
64+
# import_role:
65+
# name: confluent.test
66+
# tasks_from: check_property.yml
67+
# vars:
68+
# file_path: /etc/confluent-control-center/control-center-production.properties
69+
# property: bootstrap.servers
70+
# expected_value: kafka-broker1:9092,kafka-broker2:9092,kafka-broker3:9092
7171

72-
- name: Grep newly added broker names in proeprty file
73-
shell: grep "^{{ property }}" {{ file_path }}
74-
register: bootstrap_servers
75-
vars:
76-
file_path: /etc/confluent-control-center/control-center-production.properties
77-
property: bootstrap.servers
72+
# - name: Grep newly added broker names in proeprty file
73+
# shell: grep "^{{ property }}" {{ file_path }}
74+
# register: bootstrap_servers
75+
# vars:
76+
# file_path: /etc/confluent-control-center/control-center-production.properties
77+
# property: bootstrap.servers
7878

79-
- name: Check broker4 should not be available in bootstrap Server urls
80-
assert:
81-
that: 'not "kafka-broker4" in bootstrap_servers.stdout'
79+
# - name: Check broker4 should not be available in bootstrap Server urls
80+
# assert:
81+
# that: 'not "kafka-broker4" in bootstrap_servers.stdout'
8282

83-
- name: Check broker5 should not be available in bootstrap Server urls
84-
assert:
85-
that: 'not "kafka-broker5" in bootstrap_servers.stdout'
83+
# - name: Check broker5 should not be available in bootstrap Server urls
84+
# assert:
85+
# that: 'not "kafka-broker5" in bootstrap_servers.stdout'
8686

8787
- name: Add new brokers Nodes into in-memory inventory to scale-up
8888
hosts: all

‎molecule/ccloud/prepare.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
- kafka_connect
1919
- kafka_rest
2020
- ksql
21-
- control_center
21+
# - control_center
2222

2323
# There are two schema_registry groups in the inventory file
2424
- name: Change schema_registry group name

‎molecule/ccloud/verify.yml

+35-35
Original file line numberDiff line numberDiff line change
@@ -149,38 +149,38 @@
149149
property: confluent.controlcenter.command.topic.replication
150150
expected_value: "3"
151151

152-
- name: Check Max Message Bytes Property
153-
import_role:
154-
name: confluent.test
155-
tasks_from: check_property.yml
156-
vars:
157-
file_path: /etc/confluent-control-center/control-center-production.properties
158-
property: confluent.metrics.topic.max.message.bytes
159-
expected_value: "8388608"
160-
161-
- name: Check jaas config properly set
162-
import_role:
163-
name: confluent.test
164-
tasks_from: check_property.yml
165-
vars:
166-
file_path: /etc/confluent-control-center/control-center-production.properties
167-
property: confluent.monitoring.interceptor.sasl.jaas.config
168-
expected_value: 'org.apache.kafka.common.security.plain.PlainLoginModule required username="client" password="client-secret";'
169-
170-
- name: Check schema registry url
171-
import_role:
172-
name: confluent.test
173-
tasks_from: check_property.yml
174-
vars:
175-
file_path: /etc/confluent-control-center/control-center-production.properties
176-
property: confluent.controlcenter.schema.registry.url
177-
expected_value: https://ccloud-schema-registry1:8081
178-
179-
- name: Check schema registry creds
180-
import_role:
181-
name: confluent.test
182-
tasks_from: check_property.yml
183-
vars:
184-
file_path: /etc/confluent-control-center/control-center-production.properties
185-
property: confluent.controlcenter.schema.registry.basic.auth.user.info
186-
expected_value: admin:admin-secret
152+
# - name: Check Max Message Bytes Property
153+
# import_role:
154+
# name: confluent.test
155+
# tasks_from: check_property.yml
156+
# vars:
157+
# file_path: /etc/confluent-control-center/control-center-production.properties
158+
# property: confluent.metrics.topic.max.message.bytes
159+
# expected_value: "8388608"
160+
161+
# - name: Check jaas config properly set
162+
# import_role:
163+
# name: confluent.test
164+
# tasks_from: check_property.yml
165+
# vars:
166+
# file_path: /etc/confluent-control-center/control-center-production.properties
167+
# property: confluent.monitoring.interceptor.sasl.jaas.config
168+
# expected_value: 'org.apache.kafka.common.security.plain.PlainLoginModule required username="client" password="client-secret";'
169+
170+
# - name: Check schema registry url
171+
# import_role:
172+
# name: confluent.test
173+
# tasks_from: check_property.yml
174+
# vars:
175+
# file_path: /etc/confluent-control-center/control-center-production.properties
176+
# property: confluent.controlcenter.schema.registry.url
177+
# expected_value: https://ccloud-schema-registry1:8081
178+
179+
# - name: Check schema registry creds
180+
# import_role:
181+
# name: confluent.test
182+
# tasks_from: check_property.yml
183+
# vars:
184+
# file_path: /etc/confluent-control-center/control-center-production.properties
185+
# property: confluent.controlcenter.schema.registry.basic.auth.user.info
186+
# expected_value: admin:admin-secret

‎molecule/certificates.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,12 @@
149149
loop: "{{groups['ksql']}}"
150150
when: groups['ksql'] is defined
151151

152-
- name: Write control_center hostnames for cert creation
153-
lineinfile:
154-
line: "control_center:{{item}}"
155-
path: /var/ssl/private/generation/certificate-hosts
156-
loop: "{{groups['control_center']}}"
157-
when: groups['control_center'] is defined
152+
# - name: Write control_center hostnames for cert creation
153+
# lineinfile:
154+
# line: "control_center:{{item}}"
155+
# path: /var/ssl/private/generation/certificate-hosts
156+
# loop: "{{groups['control_center']}}"
157+
# when: groups['control_center'] is defined
158158

159159
- name: Write ldap hostnames for cert creation
160160
lineinfile:

‎molecule/confluent-kafka-kerberos-customcerts-rhel/molecule.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -149,21 +149,21 @@ platforms:
149149
privileged: true
150150
networks:
151151
- name: confluent
152-
- name: control-center1
153-
hostname: control-center1.confluent
154-
groups:
155-
- control_center
156-
- control_center_migration
157-
image: redhat/ubi9-minimal
158-
dockerfile: ../Dockerfile-rhel-java17.j2
159-
command: ""
160-
volumes:
161-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
162-
privileged: true
163-
published_ports:
164-
- "9021:9021"
165-
networks:
166-
- name: confluent
152+
# - name: control-center1
153+
# hostname: control-center1.confluent
154+
# groups:
155+
# - control_center
156+
# - control_center_migration
157+
# image: redhat/ubi9-minimal
158+
# dockerfile: ../Dockerfile-rhel-java17.j2
159+
# command: ""
160+
# volumes:
161+
# - /sys/fs/cgroup:/sys/fs/cgroup:ro
162+
# privileged: true
163+
# published_ports:
164+
# - "9021:9021"
165+
# networks:
166+
# - name: confluent
167167
# Cluster 2 (Kraft) goups, groupnames will be changed during converge phase
168168
- name: controller1-mig
169169
hostname: controller1-mig.confluent

‎molecule/connect-scale-up/verify.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,11 @@
195195
property: confluent.controlcenter.connect.connect-cluster2.cluster
196196
expected_value: http://kafka-connect2:8083,http://kafka-connect5:8083
197197

198-
- name: Check line connect cluster ssl
199-
import_role:
200-
name: confluent.test
201-
tasks_from: check_property.yml
202-
vars:
203-
file_path: /etc/confluent-control-center/control-center-production.properties
204-
property: confluent.controlcenter.connect.connect-ssl.cluster
205-
expected_value: https://kafka-connect3:8083,https://kafka-connect4:8083
198+
# - name: Check line connect cluster ssl
199+
# import_role:
200+
# name: confluent.test
201+
# tasks_from: check_property.yml
202+
# vars:
203+
# file_path: /etc/confluent-control-center/control-center-production.properties
204+
# property: confluent.controlcenter.connect.connect-ssl.cluster
205+
# expected_value: https://kafka-connect3:8083,https://kafka-connect4:8083

‎molecule/custom-user-plaintext-rhel/molecule.yml

-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ platforms:
8787
volumes:
8888
- /sys/fs/cgroup:/sys/fs/cgroup:ro
8989
privileged: true
90-
# Commenting below to avoid port collision on jenkins server
9190
# Uncomment to view c3 in browser at localhost:9021
9291
# published_ports:
9392
# - "9021:9021"

‎molecule/kerberos-rhel/verify.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
vars:
238238
connect_url_input: "{{ kafka_connect_url }}"
239239
active_connectors_input: "{{ add_non_existent_connector }}"
240-
expected_message: "Connectors added or updated: test-connector-1: no configuration change, test-connector-2: ERROR error while adding new connector configuration (HTTP Error 500: Internal Server Error)."
240+
expected_message: "Connectors added or updated: test-connector-1: no configuration change, test-connector-2: ERROR error while adding new connector configuration (HTTP Error 500: Server Error)."
241241

242242
- import_role:
243243
name: confluent.test

‎molecule/mini-setup-oauth-mtls/molecule.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ platforms:
122122
privileged: true
123123
networks:
124124
- name: confluent
125-
# Cluster 2 (Kraft) goups, groupnames will be changed during converge phase
125+
# # Cluster 2 (Kraft) goups, groupnames will be changed during converge phase
126126
- name: controller1-mig
127127
hostname: controller1-mig.confluent
128128
groups:

0 commit comments

Comments
 (0)