Path with changes in config-model-generator

Signed-off-by: Lukas Kral <lukywill16@gmail.com>

Author: im-konge

cluster-operator/src/main/java/io/strimzi/operator/cluster/model/KafkaConfiguration.java

@@ -152,30 +152,6 @@ public static Map<String, ConfigModel> readConfigModel(KafkaVersion kafkaVersion
         }
     }
 
-    /**
-     * Gets the custom config model used for plugins directly imported to Strimzi.
-     * This will ensure that we are able to do dynamic changes instead of rolling update.
-     *
-     * @return The custom config model containing available configuration of plugins
-     */
-    public static Map<String, ConfigModel> readCustomConfigModel() {
-        String name = "/custom-plugin-config-model.json";
-
-        try {
-            try (InputStream in = KafkaConfiguration.class.getResourceAsStream(name)) {
-                if (in != null) {
-                    ConfigModels configModels = new ObjectMapper().readValue(in, ConfigModels.class);
-                    return configModels.getConfigs();
-                } else {
-                    // The configuration model does not exist
-                    throw new RuntimeException("Configuration model " + name + " was not found");
-                }
-            }
-        } catch (IOException e) {
-            throw new RuntimeException("Error reading from classpath resource " + name, e);
-        }
-    }
-
     /**
      * Return the config properties with their values in this KafkaConfiguration which are not known broker configs.
      * These might be consumed by broker plugins.
@@ -184,11 +160,9 @@ public static Map<String, ConfigModel> readCustomConfigModel() {
      */
     public Set<String> unknownConfigsWithValues(KafkaVersion kafkaVersion) {
         Map<String, ConfigModel> configModel = readConfigModel(kafkaVersion);
-        Map<String, ConfigModel> customConfigModel = readCustomConfigModel();
-
         Set<String> result = new HashSet<>();
         for (Map.Entry<String, String> e :this.asOrderedProperties().asMap().entrySet()) {
-            if (isCustomConfigurationOption(e.getKey(), configModel) && isCustomConfigurationOption(e.getKey(), customConfigModel)) {
+            if (isCustomConfigurationOption(e.getKey(), configModel)) {
                 result.add(e.getKey() + "=" + e.getValue());
             }
         }
@@ -228,12 +202,6 @@ public static boolean isCustomConfigurationOption(String optionName, Map<String,
      * @return  True if the property uses the Double type. False otherwise.
      */
     public static boolean isDouble(String optionName, Map<String, ConfigModel> configModel) {
-        ConfigModel optionConfigModel = configModel.get(optionName);
-
-        if (optionConfigModel == null) {
-            return false;
-        }
-
-        return Type.DOUBLE.equals(optionConfigModel.getType());
+        return Type.DOUBLE.equals(configModel.get(optionName).getType());
     }
 }

cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/resource/KafkaConfigurationDiff.java

@@ -42,7 +42,6 @@ public class KafkaConfigurationDiff extends AbstractJsonDiff {
     private final Reconciliation reconciliation;
     private final Collection<AlterConfigOp> nodeConfigDiff;
     private final Map<String, ConfigModel> configModel;
-    private final Map<String, ConfigModel> customConfigModel;
     private final boolean isController;
     private final boolean isBroker;
 
@@ -206,7 +205,6 @@ public class KafkaConfigurationDiff extends AbstractJsonDiff {
     protected KafkaConfigurationDiff(Reconciliation reconciliation, Config nodeConfigs, String desired, KafkaVersion kafkaVersion, NodeRef nodeRef, boolean isController, boolean isBroker) {
         this.reconciliation = reconciliation;
         this.configModel = KafkaConfiguration.readConfigModel(kafkaVersion);
-        this.customConfigModel = KafkaConfiguration.readCustomConfigModel();
         this.isController = isController;
         this.isBroker = isBroker;
         this.nodeConfigDiff = diff(nodeRef, desired, nodeConfigs, configModel);
@@ -328,7 +326,7 @@ private Collection<AlterConfigOp> diff(NodeRef nodeRef, String desired,
 
     private boolean updateOrAdd(String propertyName, Map<String, ConfigModel> configModel, Map<String, String> desiredMap, Map<String, String> currentMap, Collection<AlterConfigOp> updatedCE) {
         if (!isIgnorableProperty(propertyName)) {
-            if (KafkaConfiguration.isCustomConfigurationOption(propertyName, configModel) && KafkaConfiguration.isCustomConfigurationOption(propertyName, customConfigModel)) {
+            if (KafkaConfiguration.isCustomConfigurationOption(propertyName, configModel)) {
                 LOGGER.traceCr(reconciliation, "custom property {} has been updated/added {}", propertyName, desiredMap.get(propertyName));
             } else if (KafkaConfiguration.isDouble(propertyName, configModel) && areDoublesEqual(propertyName, currentMap, desiredMap)) {
                 // Double properties get special handling because Kafka might reformat them during serialization
@@ -345,7 +343,7 @@ private boolean updateOrAdd(String propertyName, Map<String, ConfigModel> config
     }
 
     private boolean removeProperty(Map<String, ConfigModel> configModel, Collection<AlterConfigOp> updatedCE, String pathValueWithoutSlash, ConfigEntry entry) {
-        if (KafkaConfiguration.isCustomConfigurationOption(entry.name(), configModel) && KafkaConfiguration.isCustomConfigurationOption(entry.name(), customConfigModel)) {
+        if (KafkaConfiguration.isCustomConfigurationOption(entry.name(), configModel)) {
             // we are deleting custom option
             LOGGER.traceCr(reconciliation, "removing custom property {}", entry.name());
         } else if (entry.isDefault()) {
@@ -386,9 +384,6 @@ public boolean isEmpty() {
      * @return true if the entry matches the scope
      */
     private boolean isScope(ConfigEntry entry, Scope scope) {
-        if (customConfigModel.get(entry.name()) != null) {
-            return customConfigModel.get(entry.name()).getScope().equals(scope);
-        }
         return configModel.get(entry.name()).getScope().equals(scope);
     }
 

cluster-operator/src/main/resources/custom-plugin-config-model.json

@@ -59,6 +59,8 @@ private KafkaConfigModelGenerator() {
     public static void main(String[] args) throws Exception {
         String version = kafkaVersion();
         Map<String, ConfigModel> configs = configs(version);
+        addCustomPluginConfig(configs);
+
         ObjectMapper mapper = JsonMapper.builder().enable(SerializationFeature.INDENT_OUTPUT).enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY).build();
         ConfigModels root = new ConfigModels();
         root.setVersion(version);
@@ -133,6 +135,15 @@ private static Map<String, ConfigModel> configs(String version) throws NoSuchMet
         return result;
     }
 
+    private static void addCustomPluginConfig(Map<String, ConfigModel> configs) {
+        String prometheusMetricAllowListName = "prometheus.metrics.reporter.allowlist";
+        ConfigModel prometheusMetricConfigModel = new ConfigModel();
+        prometheusMetricConfigModel.setScope(Scope.CLUSTER_WIDE);
+        prometheusMetricConfigModel.setType(Type.LIST);
+
+        configs.put(prometheusMetricAllowListName, prometheusMetricConfigModel);
+    }
+
     private static Type parseType(String typeStr) {
         Type type;
         if ("boolean".equals(typeStr)) {