Skip to content

when the name in label or annotations containing slash, it needs to b… #2089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 7, 2020
Merged

when the name in label or annotations containing slash, it needs to b… #2089

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad5ba5f
when the name in label or annotations containing slash, it needs to b…
Dec 7, 2020
8a54cdb
add comment, handle ~ case and refactor
Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions operator/src/main/java/oracle/kubernetes/operator/helpers/KubernetesUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,16 @@ static void addPatches(
String basePath,
Map<String, String> current,
Map<String, String> required) {

for (String name : required.keySet()) {
// We must encode each '/' and '~' in a JSON patch token using '~1' and '~0', otherwise
// the JSON patch will incorrectly treat '/' and '~' as special delimiters. (RFC 6901).
// The resulting patched JSON will have '/' and '~' within the token (not ~0 or ~1).
String encodedPath = basePath + name.replace("~","~0").replace("/","~1");
if (!current.containsKey(name)) {
patchBuilder.add(basePath + name, required.get(name));
patchBuilder.add(encodedPath, required.get(name));
} else {
patchBuilder.replace(basePath + name, required.get(name));
patchBuilder.replace(encodedPath, required.get(name));
}
}
}
Expand Down