fix comments

Signed-off-by: Lixin Yao <lixin_yao@apple.com>
strimzi · Feb 22, 2024 · d350b3a · d350b3a
1 parent 7eb300b
commit d350b3a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/...ator/src/main/java/io/strimzi/operator/cluster/model/KafkaBrokerConfigurationBuilder.java b/...ator/src/main/java/io/strimzi/operator/cluster/model/KafkaBrokerConfigurationBuilder.java
@@ -859,8 +859,8 @@ public KafkaBrokerConfigurationBuilder withTieredStorage(String clusterName, Tie
         writer.println("rlmm.config.remote.log.metadata.common.client.ssl.keystore.password=${CERTS_STORE_PASSWORD}");
         writer.println("rlmm.config.remote.log.metadata.common.client.ssl.truststore.type=PKCS12");
         writer.println("# RSM configs set by the operator and by the user");
-        if (tieredStorage instanceof TieredStorageCustom) {
-            RemoteStorageManager rsm = ((TieredStorageCustom) tieredStorage).getRemoteStorageManager();
+        if (tieredStorage instanceof TieredStorageCustom customTieredStorage) {
+            RemoteStorageManager rsm = customTieredStorage.getRemoteStorageManager();
             writer.println("remote.log.storage.manager.class.name=" + rsm.getClassName());
             writer.println("remote.log.storage.manager.class.path=" + rsm.getClassPath());
             writer.println("remote.log.storage.manager.impl.prefix=rsm.config.");

diff --git a/cluster-operator/src/main/java/io/strimzi/operator/cluster/model/KafkaCluster.java b/cluster-operator/src/main/java/io/strimzi/operator/cluster/model/KafkaCluster.java
@@ -1680,8 +1680,8 @@ private String generatePerBrokerConfiguration(NodeRef node, KafkaPool pool, Map<
                         )
                         .withAuthorization(cluster, authorization)
                         .withCruiseControl(cluster, ccMetricsReporter, node.broker())
-                        .withUserConfiguration(configuration, node.broker() && ccMetricsReporter != null)
-                        .withTieredStorage(cluster, tieredStorage);
+                        .withTieredStorage(cluster, tieredStorage)
+                        .withUserConfiguration(configuration, node.broker() && ccMetricsReporter != null);
 
         if (useKRaft) {
             builder.withKRaft(cluster, namespace, pool.processRoles, nodes());

diff --git a/...ion/api/io.strimzi.api.kafka.model.kafka.tieredstorage.TieredStorageCustom.adoc b/...ion/api/io.strimzi.api.kafka.model.kafka.tieredstorage.TieredStorageCustom.adoc
@@ -1,6 +1,6 @@
 To configure the tiered storage feature, set the `type` property to `custom`.
 
-Custom tiered storage allows for custom RemoteStorageManager configuration to be used. By default Strimzi will use the `TopicBasedRemoteLogMetadataManager` for RLMM configuration.
+Custom tiered storage allows for custom RemoteStorageManager configuration to be used. By default Strimzi will use the `TopicBasedRemoteLogMetadataManager` for RLMM configuration. Users need to add the tiered storage plugin to the image first by building a custom container image.
 
 .Example custom tiered storage configuration
 [source,yaml,subs="attributes+"]

diff --git a/packaging/helm-charts/helm3/strimzi-kafka-operator/crds/040-Crd-kafka.yaml b/packaging/helm-charts/helm3/strimzi-kafka-operator/crds/040-Crd-kafka.yaml
@@ -1847,6 +1847,32 @@ spec:
                               description: Metadata applied to the resource.
                           description: Template for Kafka `StrimziPodSet` resource.
                       description: Template for Kafka cluster resources. The template allows users to specify how the Kubernetes resources are generated.
+                    tieredStorage:
+                      type: object
+                      properties:
+                        remoteStorageManager:
+                          type: object
+                          properties:
+                            className:
+                              type: string
+                              description: The class name for the RSM class.
+                            classPath:
+                              type: string
+                              description: The class path for the RSM class.
+                            configs:
+                              additionalProperties:
+                                type: string
+                              type: object
+                              description: The additional configuration map for the remoteStorageManager.
+                          description: Configuration for the remoteStorageManager.
+                        type:
+                          type: string
+                          enum:
+                            - custom
+                          description: "Storage type, must be either 'custom'."
+                      required:
+                        - type
+                      description: Configure tieredStorage for Kafka brokers.
                   required:
                     - listeners
                   description: Configuration of the Kafka cluster.