-
Notifications
You must be signed in to change notification settings - Fork 214
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: restore backwards compatibility (#1915)
* fix: clean-up unneeded matcher field * fix: restore backwards compatibility Note that the current implementation is flawed because custom ResourceUpdatePreProcessor should be registered to be found when attempting to use custom matching logic. See also #1914 for more details.
- Loading branch information
Showing
3 changed files
with
27 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 26 additions & 1 deletion
27
.../javaoperatorsdk/operator/processing/dependent/kubernetes/ResourceUpdatePreProcessor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,36 @@ | ||
package io.javaoperatorsdk.operator.processing.dependent.kubernetes; | ||
|
||
import io.fabric8.kubernetes.api.model.HasMetadata; | ||
import io.fabric8.zjsonpatch.JsonDiff; | ||
import io.javaoperatorsdk.operator.ReconcilerUtils; | ||
import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider; | ||
import io.javaoperatorsdk.operator.api.reconciler.Context; | ||
|
||
public interface ResourceUpdatePreProcessor<R extends HasMetadata> { | ||
|
||
R replaceSpecOnActual(R actual, R desired, Context<?> context); | ||
|
||
boolean matches(R actual, R desired, boolean equality); | ||
default boolean matches(R actual, R desired, boolean equality) { | ||
final var objectMapper = ConfigurationServiceProvider.instance().getObjectMapper(); | ||
|
||
// reflection will be replaced by this: | ||
// https://github.com/fabric8io/kubernetes-client/issues/3816 | ||
var desiredSpecNode = objectMapper.valueToTree(ReconcilerUtils.getSpec(desired)); | ||
var actualSpecNode = objectMapper.valueToTree(ReconcilerUtils.getSpec(actual)); | ||
var diffJsonPatch = JsonDiff.asJson(desiredSpecNode, actualSpecNode); | ||
// In case of equality is set to true, no diffs are allowed, so we return early if diffs exist | ||
// On contrary (if equality is false), "add" is allowed for cases when for some | ||
// resources Kubernetes fills-in values into spec. | ||
final var diffNumber = diffJsonPatch.size(); | ||
if (equality && diffNumber > 0) { | ||
return false; | ||
} | ||
for (int i = 0; i < diffNumber; i++) { | ||
String operation = diffJsonPatch.get(i).get("op").asText(); | ||
if (!operation.equals("add")) { | ||
return false; | ||
} | ||
} | ||
return true; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters