diff --git a/molecule/Dockerfile-amazonlinux2023.j2 b/molecule/Dockerfile-amazonlinux2023.j2 index 2e51768cc1..0fb0ded384 100644 --- 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 deleted file mode 100644 index da486cc695..0000000000 --- a/molecule/Dockerfile-rhel-java8.j2 +++ /dev/null @@ -1,48 +0,0 @@ -FROM {{ item.image }} -LABEL maintainer="CP Ansible" -ENV container docker - -RUN microdnf -y --nodocs install yum -# RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == \ -# systemd-tmpfiles-setup.service ] || rm -f $i; done); \ -RUN rm -f /lib/systemd/system/multi-user.target.wants/*;\ -rm -f /etc/systemd/system/*.wants/*;\ -rm -f /lib/systemd/system/local-fs.target.wants/*; \ -rm -f /lib/systemd/system/sockets.target.wants/*udev*; \ -rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ -rm -f /lib/systemd/system/basic.target.wants/*;\ -rm -f /lib/systemd/system/anaconda.target.wants/*; - - -# Install requirements. -RUN yum -y install rpm \ - && yum -y update \ - && yum -y install sudo vim-enhanced \ - && yum install -y jq \ - && yum clean all - -# Disable requiretty. -RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers - -VOLUME ["/sys/fs/cgroup"] -CMD ["/usr/lib/systemd/systemd"] - -RUN yum -y install java-1.8.0-openjdk \ - rsync \ - openssl \ - rsyslog \ - openldap \ - openldap-clients \ - openldap-devel \ - krb5-libs \ - krb5-workstation \ - unzip \ - procps \ - procps-ng \ - tzdata-java - -{% set DEFAULT_PACKAGE_VER = lookup('pipe', "awk '/confluent_package_version:/ {print $2}' $MOLECULE_PROJECT_DIRECTORY/roles/variables/defaults/main.yml" ) %} -{% set PACKAGE_VER = lookup('env', 'VERSION') | default(DEFAULT_PACKAGE_VER, true) %} -{% set REPO_VER = PACKAGE_VER | regex_replace('^([0-9])\\.([0-9]*).*', '\\1.\\2') %} -{% set COMMON_REPO_URL = lookup('env', 'COMMON_REPO_URL') | default('https://packages.confluent.io', true) %} -{% set CLIENT_REPO_URL = lookup('env', 'CLIENT_REPO_URL') | default('https://packages.confluent.io', true) %} diff --git a/molecule/connect-scale-up/molecule.yml b/molecule/connect-scale-up/molecule.yml index ce67d6133b..02680588db 100644 --- 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 index 13af1461b9..ad11528b4e 100644 --- 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 index 2b103f5a20..5e1d29820e 100644 --- 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 index 870369d8af..780557bcf7 100644 --- 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 diff --git a/molecule/plain-customcerts-rhel-fips/molecule.yml b/molecule/plain-customcerts-rhel-fips/molecule.yml index fb809e2e96..c909a7ba34 100644 --- a/molecule/plain-customcerts-rhel-fips/molecule.yml +++ b/molecule/plain-customcerts-rhel-fips/molecule.yml @@ -147,7 +147,7 @@ provisioner: group_vars: all: scenario_name: plain-customcerts-rhel-fips - redhat_java_package_name: java-11-openjdk + redhat_java_package_name: java-17-openjdk fips_enabled: true sasl_protocol: plain diff --git a/molecule/rbac-mds-mtls-custom-rhel-fips/molecule.yml b/molecule/rbac-mds-mtls-custom-rhel-fips/molecule.yml index 5f31c4123c..c9f3ed553e 100644 --- a/molecule/rbac-mds-mtls-custom-rhel-fips/molecule.yml +++ b/molecule/rbac-mds-mtls-custom-rhel-fips/molecule.yml @@ -230,7 +230,7 @@ provisioner: all: scenario_name: rbac-mds-mtls-custom-rhel-fips fips_enabled: true - redhat_java_package_name: java-11-openjdk + redhat_java_package_name: java-17-openjdk ssl_enabled: true ssl_mutual_auth_enabled: true diff --git a/molecule/rbac-mtls-rhel-fips/molecule.yml b/molecule/rbac-mtls-rhel-fips/molecule.yml index 7f884320a0..111ef899be 100644 --- a/molecule/rbac-mtls-rhel-fips/molecule.yml +++ b/molecule/rbac-mtls-rhel-fips/molecule.yml @@ -149,7 +149,7 @@ provisioner: group_vars: all: scenario_name: rbac-mtls-rhel-fips - redhat_java_package_name: java-11-openjdk + redhat_java_package_name: java-17-openjdk ssl_enabled: true fips_enabled: true ssl_mutual_auth_enabled: true diff --git a/molecule/rbac-mtls-rhel8/molecule.yml b/molecule/rbac-mtls-rhel8/molecule.yml index 20344e6ecd..dcb88079d1 100644 --- a/molecule/rbac-mtls-rhel8/molecule.yml +++ b/molecule/rbac-mtls-rhel8/molecule.yml @@ -26,7 +26,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 @@ -39,7 +39,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 @@ -52,7 +52,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 @@ -65,7 +65,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 @@ -78,7 +78,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 @@ -91,7 +91,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 @@ -104,7 +104,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 @@ -117,7 +117,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 @@ -130,7 +130,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 @@ -143,7 +143,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 @@ -156,7 +156,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 @@ -171,7 +171,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 @@ -183,7 +183,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 @@ -195,7 +195,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