Merge pull request #1873 from confluentinc/remove-java8-ANSIENG-4443

Remove java8 ANSIENG-4443
confluentinc · Jan 7, 2025 · ac1c55f · ac1c55f
2 parents 44a8f8b + 8a3907f
commit ac1c55f
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 104 deletions.
diff --git a/molecule/Dockerfile-amazonlinux2023.j2 b/molecule/Dockerfile-amazonlinux2023.j2
@@ -22,4 +22,3 @@ RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/'  /etc/sudoers
 {% set REPO_VER = PACKAGE_VER | regex_replace('^([0-9])\\.([0-9]*).*', '\\1.\\2') %}
 {% set COMMON_REPO_URL = lookup('env', 'COMMON_REPO_URL') | default('http://packages.confluent.io', true) %}
 {% set CLIENT_REPO_URL = lookup('env', 'CLIENT_REPO_URL') | default('https://packages.confluent.io', true) %}
-
diff --git a/molecule/Dockerfile-rhel-java8.j2 b/molecule/Dockerfile-rhel-java8.j2
diff --git a/molecule/connect-scale-up/molecule.yml b/molecule/connect-scale-up/molecule.yml
@@ -159,7 +159,7 @@ provisioner:
       all:
         ssl_enabled: true
         ssl_mutual_auth_enabled: true
-        redhat_java_package_name: java-11-openjdk
+        redhat_java_package_name: java-17-openjdk
         # To run the FileStream connector, you must add the filestream-connectors path in the plugin.path
         kafka_connect_custom_properties:
           plugin.path: "/usr/share/filestream-connectors,/usr/share/java/connect_plugins"

diff --git a/molecule/kerberos-rhel/molecule.yml b/molecule/kerberos-rhel/molecule.yml
@@ -24,7 +24,7 @@ platforms:
       - ${CONTROLLER_HOSTGROUP:-zookeeper}
       - ${CONTROLLER_HOSTGROUP:-zookeeper}_migration
     image: oraclelinux:9-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -37,7 +37,7 @@ platforms:
       - ${CONTROLLER_HOSTGROUP:-zookeeper}
       - ${CONTROLLER_HOSTGROUP:-zookeeper}_migration
     image: oraclelinux:9-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -50,7 +50,7 @@ platforms:
       - kafka_broker
       - kafka_broker_migration
     image: oraclelinux:9-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -63,7 +63,7 @@ platforms:
       - kafka_broker
       - kafka_broker_migration
     image: oraclelinux:9-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -76,7 +76,7 @@ platforms:
       - kafka_broker
       - kafka_broker_migration
     image: oraclelinux:9-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -88,7 +88,7 @@ platforms:
     groups:
       - schema_registry
     image: oraclelinux:9-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -100,7 +100,7 @@ platforms:
     groups:
       - kafka_rest
     image: oraclelinux:9-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -112,7 +112,7 @@ platforms:
     groups:
       - kafka_connect
     image: oraclelinux:9-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -124,7 +124,7 @@ platforms:
     groups:
       - ksql
     image: oraclelinux:9-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -136,7 +136,7 @@ platforms:
     groups:
       - control_center
     image: oraclelinux:9-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -151,7 +151,7 @@ platforms:
     groups:
       - kafka_controller_migration
     image: oraclelinux:9-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -163,7 +163,7 @@ platforms:
     groups:
       - kafka_controller_migration
     image: oraclelinux:9-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro

diff --git a/molecule/ksql-scale-up/molecule.yml b/molecule/ksql-scale-up/molecule.yml
@@ -13,7 +13,7 @@ platforms:
     groups:
       - ${CONTROLLER_HOSTGROUP:-zookeeper}
     image: almalinux:9-minimal
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -25,7 +25,7 @@ platforms:
     groups:
       - kafka_broker
     image: almalinux:9-minimal
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -37,7 +37,7 @@ platforms:
     groups:
       - kafka_broker
     image: almalinux:9-minimal
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -49,7 +49,7 @@ platforms:
     groups:
       - kafka_broker
     image: almalinux:9-minimal
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -61,7 +61,7 @@ platforms:
     groups:
       - kafka_connect
     image: almalinux:9-minimal
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -73,7 +73,7 @@ platforms:
     groups:
       - ksql
     image: almalinux:9-minimal
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -85,7 +85,7 @@ platforms:
     groups:
       - ksql
     image: almalinux:9-minimal
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -95,7 +95,7 @@ platforms:
   - name: ksql3
     hostname: ksql3.confluent
     image: almalinux:9-minimal
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -105,7 +105,7 @@ platforms:
   - name: ksql4
     hostname: ksql4.confluent
     image: almalinux:9-minimal
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -117,7 +117,7 @@ platforms:
     groups:
       - control_center
     image: almalinux:9-minimal
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -136,7 +136,7 @@ provisioner:
       all:
         ssl_enabled: true
         ssl_mutual_auth_enabled: true
-        redhat_java_package_name: java-1.8.0-openjdk # use java8 package
+        redhat_java_package_name: java-17-openjdk # use java17 package
         ksql_custom_properties:
           ksql.heartbeat.enable: true
         # To run the FileStream connector, you must add the filestream-connectors path in the plugin.path

diff --git a/molecule/oauth-rbac-plain-rhel8/molecule.yml b/molecule/oauth-rbac-plain-rhel8/molecule.yml
@@ -37,7 +37,7 @@ platforms:
       - ${CONTROLLER_HOSTGROUP:-zookeeper}
       - ${CONTROLLER_HOSTGROUP:-zookeeper}_migration
     image: oraclelinux:8-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -50,7 +50,7 @@ platforms:
       - ${CONTROLLER_HOSTGROUP:-zookeeper}
       - ${CONTROLLER_HOSTGROUP:-zookeeper}_migration
     image: oraclelinux:8-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -63,7 +63,7 @@ platforms:
       - ${CONTROLLER_HOSTGROUP:-zookeeper}
       - ${CONTROLLER_HOSTGROUP:-zookeeper}_migration
     image: oraclelinux:8-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -76,7 +76,7 @@ platforms:
       - kafka_broker
       - kafka_broker_migration
     image: oraclelinux:8-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -89,7 +89,7 @@ platforms:
       - kafka_broker
       - kafka_broker_migration
     image: oraclelinux:8-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -102,7 +102,7 @@ platforms:
       - kafka_broker
       - kafka_broker_migration
     image: oraclelinux:8-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -115,7 +115,7 @@ platforms:
       - schema_registry
       - schema_registry_migration
     image: oraclelinux:8-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -128,7 +128,7 @@ platforms:
       - kafka_rest
       - kafka_rest_migration
     image: oraclelinux:8-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -141,7 +141,7 @@ platforms:
       - kafka_connect
       - kafka_connect_migration
     image: oraclelinux:8-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -154,7 +154,7 @@ platforms:
       - ksql
       - ksql_migration
     image: oraclelinux:8-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -167,7 +167,7 @@ platforms:
       - control_center
       - control_center_migration
     image: oraclelinux:8-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -182,7 +182,7 @@ platforms:
     groups:
       - kafka_controller_migration
     image: oraclelinux:8-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -194,7 +194,7 @@ platforms:
     groups:
       - kafka_controller_migration
     image: oraclelinux:8-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -206,7 +206,7 @@ platforms:
     groups:
       - kafka_controller_migration
     image: oraclelinux:8-slim
-    dockerfile: ../Dockerfile-rhel-java8.j2
+    dockerfile: ../Dockerfile-rhel-java17.j2
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,4 +22,3 @@ RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers
		{% set REPO_VER = PACKAGE_VER \| regex_replace('^([0-9])\\.([0-9]).', '\\1.\\2') %}
		{% set COMMON_REPO_URL = lookup('env', 'COMMON_REPO_URL') \| default('http://packages.confluent.io', true) %}
		{% set CLIENT_REPO_URL = lookup('env', 'CLIENT_REPO_URL') \| default('https://packages.confluent.io', true) %}