diff --git a/0-bootstrap/others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/2-services/argocd/instances/ibm-eventstreams-instance.yaml b/0-bootstrap/others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/2-services/argocd/instances/ibm-eventstreams-instance.yaml index 56cc51531..32eea99f3 100644 --- a/0-bootstrap/others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/2-services/argocd/instances/ibm-eventstreams-instance.yaml +++ b/0-bootstrap/others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/2-services/argocd/instances/ibm-eventstreams-instance.yaml @@ -29,7 +29,7 @@ spec: spec: security: internalTls: 'TLSv1.2' - version: 10.5.0 + version: 11.0.2 license: # By installing this product you accept the license terms at https://ibm.biz/es-license accept: true @@ -43,36 +43,54 @@ spec: kafka: replicas: 3 authorization: - type: runas + type: custom + supportsAdminApi: true + authorizerClass: com.ibm.eventstreams.runas.authorizer.RunAsAuthorizer config: - inter.broker.protocol.version: "2.8" - interceptor.class.names: com.ibm.eventstreams.interceptors.metrics.ProducerMetricsInterceptor + inter.broker.protocol.version: "3.2" log.cleaner.threads: 6 - log.message.format.version: "2.8" + log.message.format.version: "3.2" num.io.threads: 24 num.network.threads: 9 num.replica.fetchers: 3 offsets.topic.replication.factor: 3 + default.replication.factor: 3 + min.insync.replicas: 2 listeners: - external: + - name: external + port: 9094 type: route authentication: type: scram-sha-512 - tls: + tls: true + - name: tls + port: 9093 + type: internal + tls: true authentication: type: tls - metrics: {} + metricsConfig: + type: jmxPrometheusExporter + valueFrom: + configMapKeyRef: + key: kafka-metrics-config.yaml + name: metrics-config storage: type: persistent-claim size: 4Gi class: managed-nfs-storage zookeeper: replicas: 3 - metrics: {} + metricsConfig: + type: jmxPrometheusExporter + valueFrom: + configMapKeyRef: + key: zookeeper-metrics-config.yaml + name: metrics-config storage: type: persistent-claim size: 2Gi class: managed-nfs-storage requestIbmServices: - iam: true - monitoring: true \ No newline at end of file + iam: false + monitoring: false \ No newline at end of file diff --git a/0-bootstrap/others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/2-services/argocd/operators/ibm-eventstreams-operator.yaml b/0-bootstrap/others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/2-services/argocd/operators/ibm-eventstreams-operator.yaml index bdb86f3b9..8ed667185 100644 --- a/0-bootstrap/others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/2-services/argocd/operators/ibm-eventstreams-operator.yaml +++ b/0-bootstrap/others/1-shared-cluster/cluster-1-cicd-dev-stage-prod/2-services/argocd/operators/ibm-eventstreams-operator.yaml @@ -24,7 +24,7 @@ spec: ibmeventstreams: name: ibm-eventstreams subscription: - channel: v2.5 + channel: v3.0 installPlanApproval: Automatic name: ibm-eventstreams source: ibm-operator-catalog diff --git a/0-bootstrap/others/1-shared-cluster/cluster-n-prod/2-services/argocd/instances/ibm-eventstreams-instance.yaml b/0-bootstrap/others/1-shared-cluster/cluster-n-prod/2-services/argocd/instances/ibm-eventstreams-instance.yaml index 56cc51531..32eea99f3 100644 --- a/0-bootstrap/others/1-shared-cluster/cluster-n-prod/2-services/argocd/instances/ibm-eventstreams-instance.yaml +++ b/0-bootstrap/others/1-shared-cluster/cluster-n-prod/2-services/argocd/instances/ibm-eventstreams-instance.yaml @@ -29,7 +29,7 @@ spec: spec: security: internalTls: 'TLSv1.2' - version: 10.5.0 + version: 11.0.2 license: # By installing this product you accept the license terms at https://ibm.biz/es-license accept: true @@ -43,36 +43,54 @@ spec: kafka: replicas: 3 authorization: - type: runas + type: custom + supportsAdminApi: true + authorizerClass: com.ibm.eventstreams.runas.authorizer.RunAsAuthorizer config: - inter.broker.protocol.version: "2.8" - interceptor.class.names: com.ibm.eventstreams.interceptors.metrics.ProducerMetricsInterceptor + inter.broker.protocol.version: "3.2" log.cleaner.threads: 6 - log.message.format.version: "2.8" + log.message.format.version: "3.2" num.io.threads: 24 num.network.threads: 9 num.replica.fetchers: 3 offsets.topic.replication.factor: 3 + default.replication.factor: 3 + min.insync.replicas: 2 listeners: - external: + - name: external + port: 9094 type: route authentication: type: scram-sha-512 - tls: + tls: true + - name: tls + port: 9093 + type: internal + tls: true authentication: type: tls - metrics: {} + metricsConfig: + type: jmxPrometheusExporter + valueFrom: + configMapKeyRef: + key: kafka-metrics-config.yaml + name: metrics-config storage: type: persistent-claim size: 4Gi class: managed-nfs-storage zookeeper: replicas: 3 - metrics: {} + metricsConfig: + type: jmxPrometheusExporter + valueFrom: + configMapKeyRef: + key: zookeeper-metrics-config.yaml + name: metrics-config storage: type: persistent-claim size: 2Gi class: managed-nfs-storage requestIbmServices: - iam: true - monitoring: true \ No newline at end of file + iam: false + monitoring: false \ No newline at end of file diff --git a/0-bootstrap/others/1-shared-cluster/cluster-n-prod/2-services/argocd/operators/ibm-eventstreams-operator.yaml b/0-bootstrap/others/1-shared-cluster/cluster-n-prod/2-services/argocd/operators/ibm-eventstreams-operator.yaml index bdb86f3b9..8ed667185 100644 --- a/0-bootstrap/others/1-shared-cluster/cluster-n-prod/2-services/argocd/operators/ibm-eventstreams-operator.yaml +++ b/0-bootstrap/others/1-shared-cluster/cluster-n-prod/2-services/argocd/operators/ibm-eventstreams-operator.yaml @@ -24,7 +24,7 @@ spec: ibmeventstreams: name: ibm-eventstreams subscription: - channel: v2.5 + channel: v3.0 installPlanApproval: Automatic name: ibm-eventstreams source: ibm-operator-catalog diff --git a/0-bootstrap/others/2-isolated-cluster/cluster-1-cicd-dev-stage/2-services/argocd/instances/ibm-eventstreams-instance.yaml b/0-bootstrap/others/2-isolated-cluster/cluster-1-cicd-dev-stage/2-services/argocd/instances/ibm-eventstreams-instance.yaml index 56cc51531..32eea99f3 100644 --- a/0-bootstrap/others/2-isolated-cluster/cluster-1-cicd-dev-stage/2-services/argocd/instances/ibm-eventstreams-instance.yaml +++ b/0-bootstrap/others/2-isolated-cluster/cluster-1-cicd-dev-stage/2-services/argocd/instances/ibm-eventstreams-instance.yaml @@ -29,7 +29,7 @@ spec: spec: security: internalTls: 'TLSv1.2' - version: 10.5.0 + version: 11.0.2 license: # By installing this product you accept the license terms at https://ibm.biz/es-license accept: true @@ -43,36 +43,54 @@ spec: kafka: replicas: 3 authorization: - type: runas + type: custom + supportsAdminApi: true + authorizerClass: com.ibm.eventstreams.runas.authorizer.RunAsAuthorizer config: - inter.broker.protocol.version: "2.8" - interceptor.class.names: com.ibm.eventstreams.interceptors.metrics.ProducerMetricsInterceptor + inter.broker.protocol.version: "3.2" log.cleaner.threads: 6 - log.message.format.version: "2.8" + log.message.format.version: "3.2" num.io.threads: 24 num.network.threads: 9 num.replica.fetchers: 3 offsets.topic.replication.factor: 3 + default.replication.factor: 3 + min.insync.replicas: 2 listeners: - external: + - name: external + port: 9094 type: route authentication: type: scram-sha-512 - tls: + tls: true + - name: tls + port: 9093 + type: internal + tls: true authentication: type: tls - metrics: {} + metricsConfig: + type: jmxPrometheusExporter + valueFrom: + configMapKeyRef: + key: kafka-metrics-config.yaml + name: metrics-config storage: type: persistent-claim size: 4Gi class: managed-nfs-storage zookeeper: replicas: 3 - metrics: {} + metricsConfig: + type: jmxPrometheusExporter + valueFrom: + configMapKeyRef: + key: zookeeper-metrics-config.yaml + name: metrics-config storage: type: persistent-claim size: 2Gi class: managed-nfs-storage requestIbmServices: - iam: true - monitoring: true \ No newline at end of file + iam: false + monitoring: false \ No newline at end of file diff --git a/0-bootstrap/others/2-isolated-cluster/cluster-1-cicd-dev-stage/2-services/argocd/operators/ibm-eventstreams-operator.yaml b/0-bootstrap/others/2-isolated-cluster/cluster-1-cicd-dev-stage/2-services/argocd/operators/ibm-eventstreams-operator.yaml index bdb86f3b9..8ed667185 100644 --- a/0-bootstrap/others/2-isolated-cluster/cluster-1-cicd-dev-stage/2-services/argocd/operators/ibm-eventstreams-operator.yaml +++ b/0-bootstrap/others/2-isolated-cluster/cluster-1-cicd-dev-stage/2-services/argocd/operators/ibm-eventstreams-operator.yaml @@ -24,7 +24,7 @@ spec: ibmeventstreams: name: ibm-eventstreams subscription: - channel: v2.5 + channel: v3.0 installPlanApproval: Automatic name: ibm-eventstreams source: ibm-operator-catalog diff --git a/0-bootstrap/others/2-isolated-cluster/cluster-n-prod/2-services/argocd/instances/ibm-eventstreams-instance.yaml b/0-bootstrap/others/2-isolated-cluster/cluster-n-prod/2-services/argocd/instances/ibm-eventstreams-instance.yaml index 56cc51531..32eea99f3 100644 --- a/0-bootstrap/others/2-isolated-cluster/cluster-n-prod/2-services/argocd/instances/ibm-eventstreams-instance.yaml +++ b/0-bootstrap/others/2-isolated-cluster/cluster-n-prod/2-services/argocd/instances/ibm-eventstreams-instance.yaml @@ -29,7 +29,7 @@ spec: spec: security: internalTls: 'TLSv1.2' - version: 10.5.0 + version: 11.0.2 license: # By installing this product you accept the license terms at https://ibm.biz/es-license accept: true @@ -43,36 +43,54 @@ spec: kafka: replicas: 3 authorization: - type: runas + type: custom + supportsAdminApi: true + authorizerClass: com.ibm.eventstreams.runas.authorizer.RunAsAuthorizer config: - inter.broker.protocol.version: "2.8" - interceptor.class.names: com.ibm.eventstreams.interceptors.metrics.ProducerMetricsInterceptor + inter.broker.protocol.version: "3.2" log.cleaner.threads: 6 - log.message.format.version: "2.8" + log.message.format.version: "3.2" num.io.threads: 24 num.network.threads: 9 num.replica.fetchers: 3 offsets.topic.replication.factor: 3 + default.replication.factor: 3 + min.insync.replicas: 2 listeners: - external: + - name: external + port: 9094 type: route authentication: type: scram-sha-512 - tls: + tls: true + - name: tls + port: 9093 + type: internal + tls: true authentication: type: tls - metrics: {} + metricsConfig: + type: jmxPrometheusExporter + valueFrom: + configMapKeyRef: + key: kafka-metrics-config.yaml + name: metrics-config storage: type: persistent-claim size: 4Gi class: managed-nfs-storage zookeeper: replicas: 3 - metrics: {} + metricsConfig: + type: jmxPrometheusExporter + valueFrom: + configMapKeyRef: + key: zookeeper-metrics-config.yaml + name: metrics-config storage: type: persistent-claim size: 2Gi class: managed-nfs-storage requestIbmServices: - iam: true - monitoring: true \ No newline at end of file + iam: false + monitoring: false \ No newline at end of file diff --git a/0-bootstrap/others/2-isolated-cluster/cluster-n-prod/2-services/argocd/operators/ibm-eventstreams-operator.yaml b/0-bootstrap/others/2-isolated-cluster/cluster-n-prod/2-services/argocd/operators/ibm-eventstreams-operator.yaml index bdb86f3b9..8ed667185 100644 --- a/0-bootstrap/others/2-isolated-cluster/cluster-n-prod/2-services/argocd/operators/ibm-eventstreams-operator.yaml +++ b/0-bootstrap/others/2-isolated-cluster/cluster-n-prod/2-services/argocd/operators/ibm-eventstreams-operator.yaml @@ -24,7 +24,7 @@ spec: ibmeventstreams: name: ibm-eventstreams subscription: - channel: v2.5 + channel: v3.0 installPlanApproval: Automatic name: ibm-eventstreams source: ibm-operator-catalog diff --git a/0-bootstrap/others/3-multi-cluster/cluster-1-cicd/2-services/argocd/instances/ibm-eventstreams-instance.yaml b/0-bootstrap/others/3-multi-cluster/cluster-1-cicd/2-services/argocd/instances/ibm-eventstreams-instance.yaml index 56cc51531..32eea99f3 100644 --- a/0-bootstrap/others/3-multi-cluster/cluster-1-cicd/2-services/argocd/instances/ibm-eventstreams-instance.yaml +++ b/0-bootstrap/others/3-multi-cluster/cluster-1-cicd/2-services/argocd/instances/ibm-eventstreams-instance.yaml @@ -29,7 +29,7 @@ spec: spec: security: internalTls: 'TLSv1.2' - version: 10.5.0 + version: 11.0.2 license: # By installing this product you accept the license terms at https://ibm.biz/es-license accept: true @@ -43,36 +43,54 @@ spec: kafka: replicas: 3 authorization: - type: runas + type: custom + supportsAdminApi: true + authorizerClass: com.ibm.eventstreams.runas.authorizer.RunAsAuthorizer config: - inter.broker.protocol.version: "2.8" - interceptor.class.names: com.ibm.eventstreams.interceptors.metrics.ProducerMetricsInterceptor + inter.broker.protocol.version: "3.2" log.cleaner.threads: 6 - log.message.format.version: "2.8" + log.message.format.version: "3.2" num.io.threads: 24 num.network.threads: 9 num.replica.fetchers: 3 offsets.topic.replication.factor: 3 + default.replication.factor: 3 + min.insync.replicas: 2 listeners: - external: + - name: external + port: 9094 type: route authentication: type: scram-sha-512 - tls: + tls: true + - name: tls + port: 9093 + type: internal + tls: true authentication: type: tls - metrics: {} + metricsConfig: + type: jmxPrometheusExporter + valueFrom: + configMapKeyRef: + key: kafka-metrics-config.yaml + name: metrics-config storage: type: persistent-claim size: 4Gi class: managed-nfs-storage zookeeper: replicas: 3 - metrics: {} + metricsConfig: + type: jmxPrometheusExporter + valueFrom: + configMapKeyRef: + key: zookeeper-metrics-config.yaml + name: metrics-config storage: type: persistent-claim size: 2Gi class: managed-nfs-storage requestIbmServices: - iam: true - monitoring: true \ No newline at end of file + iam: false + monitoring: false \ No newline at end of file diff --git a/0-bootstrap/others/3-multi-cluster/cluster-1-cicd/2-services/argocd/operators/ibm-eventstreams-operator.yaml b/0-bootstrap/others/3-multi-cluster/cluster-1-cicd/2-services/argocd/operators/ibm-eventstreams-operator.yaml index bdb86f3b9..8ed667185 100644 --- a/0-bootstrap/others/3-multi-cluster/cluster-1-cicd/2-services/argocd/operators/ibm-eventstreams-operator.yaml +++ b/0-bootstrap/others/3-multi-cluster/cluster-1-cicd/2-services/argocd/operators/ibm-eventstreams-operator.yaml @@ -24,7 +24,7 @@ spec: ibmeventstreams: name: ibm-eventstreams subscription: - channel: v2.5 + channel: v3.0 installPlanApproval: Automatic name: ibm-eventstreams source: ibm-operator-catalog diff --git a/0-bootstrap/others/3-multi-cluster/cluster-2-dev/2-services/argocd/instances/ibm-eventstreams-instance.yaml b/0-bootstrap/others/3-multi-cluster/cluster-2-dev/2-services/argocd/instances/ibm-eventstreams-instance.yaml index 56cc51531..32eea99f3 100644 --- a/0-bootstrap/others/3-multi-cluster/cluster-2-dev/2-services/argocd/instances/ibm-eventstreams-instance.yaml +++ b/0-bootstrap/others/3-multi-cluster/cluster-2-dev/2-services/argocd/instances/ibm-eventstreams-instance.yaml @@ -29,7 +29,7 @@ spec: spec: security: internalTls: 'TLSv1.2' - version: 10.5.0 + version: 11.0.2 license: # By installing this product you accept the license terms at https://ibm.biz/es-license accept: true @@ -43,36 +43,54 @@ spec: kafka: replicas: 3 authorization: - type: runas + type: custom + supportsAdminApi: true + authorizerClass: com.ibm.eventstreams.runas.authorizer.RunAsAuthorizer config: - inter.broker.protocol.version: "2.8" - interceptor.class.names: com.ibm.eventstreams.interceptors.metrics.ProducerMetricsInterceptor + inter.broker.protocol.version: "3.2" log.cleaner.threads: 6 - log.message.format.version: "2.8" + log.message.format.version: "3.2" num.io.threads: 24 num.network.threads: 9 num.replica.fetchers: 3 offsets.topic.replication.factor: 3 + default.replication.factor: 3 + min.insync.replicas: 2 listeners: - external: + - name: external + port: 9094 type: route authentication: type: scram-sha-512 - tls: + tls: true + - name: tls + port: 9093 + type: internal + tls: true authentication: type: tls - metrics: {} + metricsConfig: + type: jmxPrometheusExporter + valueFrom: + configMapKeyRef: + key: kafka-metrics-config.yaml + name: metrics-config storage: type: persistent-claim size: 4Gi class: managed-nfs-storage zookeeper: replicas: 3 - metrics: {} + metricsConfig: + type: jmxPrometheusExporter + valueFrom: + configMapKeyRef: + key: zookeeper-metrics-config.yaml + name: metrics-config storage: type: persistent-claim size: 2Gi class: managed-nfs-storage requestIbmServices: - iam: true - monitoring: true \ No newline at end of file + iam: false + monitoring: false \ No newline at end of file diff --git a/0-bootstrap/others/3-multi-cluster/cluster-2-dev/2-services/argocd/operators/ibm-eventstreams-operator.yaml b/0-bootstrap/others/3-multi-cluster/cluster-2-dev/2-services/argocd/operators/ibm-eventstreams-operator.yaml index bdb86f3b9..8ed667185 100644 --- a/0-bootstrap/others/3-multi-cluster/cluster-2-dev/2-services/argocd/operators/ibm-eventstreams-operator.yaml +++ b/0-bootstrap/others/3-multi-cluster/cluster-2-dev/2-services/argocd/operators/ibm-eventstreams-operator.yaml @@ -24,7 +24,7 @@ spec: ibmeventstreams: name: ibm-eventstreams subscription: - channel: v2.5 + channel: v3.0 installPlanApproval: Automatic name: ibm-eventstreams source: ibm-operator-catalog diff --git a/0-bootstrap/others/3-multi-cluster/cluster-3-stage/2-services/argocd/instances/ibm-eventstreams-instance.yaml b/0-bootstrap/others/3-multi-cluster/cluster-3-stage/2-services/argocd/instances/ibm-eventstreams-instance.yaml index 56cc51531..32eea99f3 100644 --- a/0-bootstrap/others/3-multi-cluster/cluster-3-stage/2-services/argocd/instances/ibm-eventstreams-instance.yaml +++ b/0-bootstrap/others/3-multi-cluster/cluster-3-stage/2-services/argocd/instances/ibm-eventstreams-instance.yaml @@ -29,7 +29,7 @@ spec: spec: security: internalTls: 'TLSv1.2' - version: 10.5.0 + version: 11.0.2 license: # By installing this product you accept the license terms at https://ibm.biz/es-license accept: true @@ -43,36 +43,54 @@ spec: kafka: replicas: 3 authorization: - type: runas + type: custom + supportsAdminApi: true + authorizerClass: com.ibm.eventstreams.runas.authorizer.RunAsAuthorizer config: - inter.broker.protocol.version: "2.8" - interceptor.class.names: com.ibm.eventstreams.interceptors.metrics.ProducerMetricsInterceptor + inter.broker.protocol.version: "3.2" log.cleaner.threads: 6 - log.message.format.version: "2.8" + log.message.format.version: "3.2" num.io.threads: 24 num.network.threads: 9 num.replica.fetchers: 3 offsets.topic.replication.factor: 3 + default.replication.factor: 3 + min.insync.replicas: 2 listeners: - external: + - name: external + port: 9094 type: route authentication: type: scram-sha-512 - tls: + tls: true + - name: tls + port: 9093 + type: internal + tls: true authentication: type: tls - metrics: {} + metricsConfig: + type: jmxPrometheusExporter + valueFrom: + configMapKeyRef: + key: kafka-metrics-config.yaml + name: metrics-config storage: type: persistent-claim size: 4Gi class: managed-nfs-storage zookeeper: replicas: 3 - metrics: {} + metricsConfig: + type: jmxPrometheusExporter + valueFrom: + configMapKeyRef: + key: zookeeper-metrics-config.yaml + name: metrics-config storage: type: persistent-claim size: 2Gi class: managed-nfs-storage requestIbmServices: - iam: true - monitoring: true \ No newline at end of file + iam: false + monitoring: false \ No newline at end of file diff --git a/0-bootstrap/others/3-multi-cluster/cluster-3-stage/2-services/argocd/operators/ibm-eventstreams-operator.yaml b/0-bootstrap/others/3-multi-cluster/cluster-3-stage/2-services/argocd/operators/ibm-eventstreams-operator.yaml index bdb86f3b9..8ed667185 100644 --- a/0-bootstrap/others/3-multi-cluster/cluster-3-stage/2-services/argocd/operators/ibm-eventstreams-operator.yaml +++ b/0-bootstrap/others/3-multi-cluster/cluster-3-stage/2-services/argocd/operators/ibm-eventstreams-operator.yaml @@ -24,7 +24,7 @@ spec: ibmeventstreams: name: ibm-eventstreams subscription: - channel: v2.5 + channel: v3.0 installPlanApproval: Automatic name: ibm-eventstreams source: ibm-operator-catalog diff --git a/0-bootstrap/others/3-multi-cluster/cluster-n-prod/2-services/argocd/instances/ibm-eventstreams-instance.yaml b/0-bootstrap/others/3-multi-cluster/cluster-n-prod/2-services/argocd/instances/ibm-eventstreams-instance.yaml index 56cc51531..32eea99f3 100644 --- a/0-bootstrap/others/3-multi-cluster/cluster-n-prod/2-services/argocd/instances/ibm-eventstreams-instance.yaml +++ b/0-bootstrap/others/3-multi-cluster/cluster-n-prod/2-services/argocd/instances/ibm-eventstreams-instance.yaml @@ -29,7 +29,7 @@ spec: spec: security: internalTls: 'TLSv1.2' - version: 10.5.0 + version: 11.0.2 license: # By installing this product you accept the license terms at https://ibm.biz/es-license accept: true @@ -43,36 +43,54 @@ spec: kafka: replicas: 3 authorization: - type: runas + type: custom + supportsAdminApi: true + authorizerClass: com.ibm.eventstreams.runas.authorizer.RunAsAuthorizer config: - inter.broker.protocol.version: "2.8" - interceptor.class.names: com.ibm.eventstreams.interceptors.metrics.ProducerMetricsInterceptor + inter.broker.protocol.version: "3.2" log.cleaner.threads: 6 - log.message.format.version: "2.8" + log.message.format.version: "3.2" num.io.threads: 24 num.network.threads: 9 num.replica.fetchers: 3 offsets.topic.replication.factor: 3 + default.replication.factor: 3 + min.insync.replicas: 2 listeners: - external: + - name: external + port: 9094 type: route authentication: type: scram-sha-512 - tls: + tls: true + - name: tls + port: 9093 + type: internal + tls: true authentication: type: tls - metrics: {} + metricsConfig: + type: jmxPrometheusExporter + valueFrom: + configMapKeyRef: + key: kafka-metrics-config.yaml + name: metrics-config storage: type: persistent-claim size: 4Gi class: managed-nfs-storage zookeeper: replicas: 3 - metrics: {} + metricsConfig: + type: jmxPrometheusExporter + valueFrom: + configMapKeyRef: + key: zookeeper-metrics-config.yaml + name: metrics-config storage: type: persistent-claim size: 2Gi class: managed-nfs-storage requestIbmServices: - iam: true - monitoring: true \ No newline at end of file + iam: false + monitoring: false \ No newline at end of file diff --git a/0-bootstrap/others/3-multi-cluster/cluster-n-prod/2-services/argocd/operators/ibm-eventstreams-operator.yaml b/0-bootstrap/others/3-multi-cluster/cluster-n-prod/2-services/argocd/operators/ibm-eventstreams-operator.yaml index bdb86f3b9..8ed667185 100644 --- a/0-bootstrap/others/3-multi-cluster/cluster-n-prod/2-services/argocd/operators/ibm-eventstreams-operator.yaml +++ b/0-bootstrap/others/3-multi-cluster/cluster-n-prod/2-services/argocd/operators/ibm-eventstreams-operator.yaml @@ -24,7 +24,7 @@ spec: ibmeventstreams: name: ibm-eventstreams subscription: - channel: v2.5 + channel: v3.0 installPlanApproval: Automatic name: ibm-eventstreams source: ibm-operator-catalog diff --git a/0-bootstrap/single-cluster/2-services/argocd/instances/ibm-eventstreams-instance.yaml b/0-bootstrap/single-cluster/2-services/argocd/instances/ibm-eventstreams-instance.yaml index 56cc51531..32eea99f3 100644 --- a/0-bootstrap/single-cluster/2-services/argocd/instances/ibm-eventstreams-instance.yaml +++ b/0-bootstrap/single-cluster/2-services/argocd/instances/ibm-eventstreams-instance.yaml @@ -29,7 +29,7 @@ spec: spec: security: internalTls: 'TLSv1.2' - version: 10.5.0 + version: 11.0.2 license: # By installing this product you accept the license terms at https://ibm.biz/es-license accept: true @@ -43,36 +43,54 @@ spec: kafka: replicas: 3 authorization: - type: runas + type: custom + supportsAdminApi: true + authorizerClass: com.ibm.eventstreams.runas.authorizer.RunAsAuthorizer config: - inter.broker.protocol.version: "2.8" - interceptor.class.names: com.ibm.eventstreams.interceptors.metrics.ProducerMetricsInterceptor + inter.broker.protocol.version: "3.2" log.cleaner.threads: 6 - log.message.format.version: "2.8" + log.message.format.version: "3.2" num.io.threads: 24 num.network.threads: 9 num.replica.fetchers: 3 offsets.topic.replication.factor: 3 + default.replication.factor: 3 + min.insync.replicas: 2 listeners: - external: + - name: external + port: 9094 type: route authentication: type: scram-sha-512 - tls: + tls: true + - name: tls + port: 9093 + type: internal + tls: true authentication: type: tls - metrics: {} + metricsConfig: + type: jmxPrometheusExporter + valueFrom: + configMapKeyRef: + key: kafka-metrics-config.yaml + name: metrics-config storage: type: persistent-claim size: 4Gi class: managed-nfs-storage zookeeper: replicas: 3 - metrics: {} + metricsConfig: + type: jmxPrometheusExporter + valueFrom: + configMapKeyRef: + key: zookeeper-metrics-config.yaml + name: metrics-config storage: type: persistent-claim size: 2Gi class: managed-nfs-storage requestIbmServices: - iam: true - monitoring: true \ No newline at end of file + iam: false + monitoring: false \ No newline at end of file diff --git a/0-bootstrap/single-cluster/2-services/argocd/operators/ibm-eventstreams-operator.yaml b/0-bootstrap/single-cluster/2-services/argocd/operators/ibm-eventstreams-operator.yaml index bdb86f3b9..8ed667185 100644 --- a/0-bootstrap/single-cluster/2-services/argocd/operators/ibm-eventstreams-operator.yaml +++ b/0-bootstrap/single-cluster/2-services/argocd/operators/ibm-eventstreams-operator.yaml @@ -24,7 +24,7 @@ spec: ibmeventstreams: name: ibm-eventstreams subscription: - channel: v2.5 + channel: v3.0 installPlanApproval: Automatic name: ibm-eventstreams source: ibm-operator-catalog diff --git a/doc/es-recipe.md b/doc/es-recipe.md index edce3ca03..4b82d59cf 100644 --- a/doc/es-recipe.md +++ b/doc/es-recipe.md @@ -26,7 +26,7 @@ This IBM Event Streams recipe should provide a highly available deployment of IB #### Storage - ibm-eventstreams-instance.yaml Make sure the `storageClassName` specified in `${GITOPS_PROFILE}/2-services/argocd/instances/ibm-eventstreams-instance.yaml` suits your needs. By default, the storage class used for this recipe, which should be the storage class requested unless the use case or specific requirements dictate otherwise, is **`managed-nfs-storage`** since the IBM Technology Zone environments this recipe is meant for mount NFS storage. If you are using this recipe and the GitOps Framework that executes this recipe on another environment, make sure you select the appropriate storage class. Bear in mind that IBM Event Streams requires **block storage**. -#### High Availability - ibm-apic-instance.yaml +#### High Availability - ibm-eventstreams-instance.yaml Make sure the high availability specified in `${GITOPS_PROFILE}/2-services/argocd/instances/ibm-eventstreams-instance.yaml` for each of the IBM Event Streams components suit your needs. * The Kafka and Zookeeper components are already set up highly available as you can see within `spec.strimziOverrides.kafka.replicas` and `spec.strimziOverrides.zookeeper.replicas` respectively. @@ -54,13 +54,13 @@ NAME STATUS es-inst Ready ``` -You can now access your IBM API Connect Cloud Manager +You can now access your IBM Event Streams ``` oc get EventStreams es-inst -n tools -o=jsonpath='{.status.endpoints[?(@.name=="ui")].uri}' ``` -The credentials for logging into the IBM API Connect Cloud Manager are `admin/` where password is stored in a secret. +The credentials for logging into the IBM Event Streams are `admin/` where password is stored in a secret. ``` oc get secret platform-auth-idp-credentials -n ibm-common-services -o=jsonpath='{.data.admin_password}' | base64 -D