diff --git a/docs/reference.md b/docs/reference.md index b06be9c..ea3fe65 100644 --- a/docs/reference.md +++ b/docs/reference.md @@ -130,16 +130,16 @@ custom resource tracked, so if there is a label selector defined for `Glue` it n to the `Glue` resource when it is created. Since it is not trivial to parse label selectors, in more complex forms of label selectors (other the ones mentioned above), the labels to add to the `Glue` resources by a `GlueOperator` needs to be specified explicitly using -[`glue.operator.glue-operator-managed-glue-labels`](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/main/java/io/csviri/operator/glue/ControllerConfig.java#L10-L10) +[`glue.operator.glue-operator-managed-glue-label`](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/main/java/io/csviri/operator/glue/ControllerConfig.java#L10-L10) config key (which is a type of map). Therefore, for a label selector that specified two values for a glue: `quarkus.operator-sdk.controllers.glue.selector=mylabel1=value1,mylabel2=value2` you need to add the following configuration params: -`glue.operator.glue-operator-managed-glue-labels.mylabel1=value1` +`glue.operator.glue-operator-managed-glue-label.mylabel1=value1` -`glue.operator.glue-operator-managed-glue-labels.mylabel2=value2` +`glue.operator.glue-operator-managed-glue-label.mylabel2=value2` This will ensure that the labels are added correctly to the `Glue`. See the related [integration test](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/test/java/io/csviri/operator/glue/GlueOperatorComplexLabelSelectorTest.java#L23-L23). diff --git a/src/main/java/io/csviri/operator/glue/ControllerConfig.java b/src/main/java/io/csviri/operator/glue/ControllerConfig.java index e213e4d..fd95e8b 100644 --- a/src/main/java/io/csviri/operator/glue/ControllerConfig.java +++ b/src/main/java/io/csviri/operator/glue/ControllerConfig.java @@ -7,6 +7,6 @@ @ConfigMapping(prefix = "glue.operator") public interface ControllerConfig { - Map glueOperatorManagedGlueLabels(); + Map glueOperatorManagedGlueLabel(); } diff --git a/src/main/java/io/csviri/operator/glue/reconciler/operator/GlueOperatorReconciler.java b/src/main/java/io/csviri/operator/glue/reconciler/operator/GlueOperatorReconciler.java index 7559a53..40ffa37 100644 --- a/src/main/java/io/csviri/operator/glue/reconciler/operator/GlueOperatorReconciler.java +++ b/src/main/java/io/csviri/operator/glue/reconciler/operator/GlueOperatorReconciler.java @@ -190,15 +190,15 @@ public static String glueName(String name, String kind) { private Map initDefaultLabelsToAddToGlue() { Map res = new HashMap<>(); - if (!controllerConfig.glueOperatorManagedGlueLabels().isEmpty()) { - res.putAll(controllerConfig.glueOperatorManagedGlueLabels()); + if (!controllerConfig.glueOperatorManagedGlueLabel().isEmpty()) { + res.putAll(controllerConfig.glueOperatorManagedGlueLabel()); } else { glueLabelSelector.ifPresent(ls -> { if (ls.contains(",") || ls.contains("(")) { throw new GlueException( "Glue reconciler label selector contains non-simple label selector: " + ls + ". Specify Glue label selector in simple form ('key=value' or 'key') " + - "or configure 'glue.operator.glue-operator-managed-glue-labels'"); + "or configure 'glue.operator.glue-operator-managed-glue-label'"); } String[] labelSelectorParts = ls.split("="); if (labelSelectorParts.length > 2) { diff --git a/src/test/java/io/csviri/operator/glue/GlueOperatorComplexLabelSelectorTest.java b/src/test/java/io/csviri/operator/glue/GlueOperatorComplexLabelSelectorTest.java index c9a719c..ce9c8cc 100644 --- a/src/test/java/io/csviri/operator/glue/GlueOperatorComplexLabelSelectorTest.java +++ b/src/test/java/io/csviri/operator/glue/GlueOperatorComplexLabelSelectorTest.java @@ -64,8 +64,8 @@ public Map getConfigOverrides() { // complex label selector with 2 values checked GLUE_LABEL_KEY1 + "=" + LABEL_VALUE + "," + GLUE_LABEL_KEY2 + "=" + LABEL_VALUE, // explicit labels added to glue - "glue.operator.glue-operator-managed-glue-labels." + GLUE_LABEL_KEY1, LABEL_VALUE, - "glue.operator.glue-operator-managed-glue-labels." + GLUE_LABEL_KEY2, LABEL_VALUE); + "glue.operator.glue-operator-managed-glue-label." + GLUE_LABEL_KEY1, LABEL_VALUE, + "glue.operator.glue-operator-managed-glue-label." + GLUE_LABEL_KEY2, LABEL_VALUE); } }