-
Notifications
You must be signed in to change notification settings - Fork 498
[FLINK-37406] Add support for structured YAML config in FlinkDeployment CRD #1013
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.
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
Changes from 18 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
b90676a
[FLINK-37406] Add support for structured YAML config in FlinkDeployme…
csviri d9da3fb
diff, test fixes
csviri ddf83c0
wip
csviri 03614b3
fix
csviri dfbbb33
wip
csviri 38eda4c
wip
csviri a9ee837
unit tests
csviri 6a89134
CRD update in helm chart, add migration test
csviri e4a4d24
Config
csviri 9fc5a8a
naming
csviri 3ac4339
cleanup
csviri 381951b
improvements + cleanup
csviri 3829654
naming
csviri 447ea75
remove empty lines
csviri 17030be
crd checker and changed e2e test
csviri 43c2462
javadocs fix
csviri 1494b10
add javadoc for ConfigObjectNode
csviri 9626931
use proper values not string in yaml
csviri c74e56b
fix duplicate dependency
csviri File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
89 changes: 89 additions & 0 deletions
89
...tor-api/src/main/java/org/apache/flink/kubernetes/operator/api/spec/ConfigObjectNode.java
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.flink.kubernetes.operator.api.spec; | ||
|
|
||
| import org.apache.flink.configuration.Configuration; | ||
|
|
||
| import com.fasterxml.jackson.databind.JsonNode; | ||
| import com.fasterxml.jackson.databind.node.JsonNodeFactory; | ||
| import com.fasterxml.jackson.databind.node.ObjectNode; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.HashMap; | ||
| import java.util.Iterator; | ||
| import java.util.Map; | ||
|
|
||
| /** Allows parsing configurations as YAML, and adds related utility methods. */ | ||
| public class ConfigObjectNode extends ObjectNode { | ||
|
|
||
| public ConfigObjectNode() { | ||
| this(JsonNodeFactory.instance); | ||
| } | ||
|
|
||
| public ConfigObjectNode(JsonNodeFactory nc, Map<String, JsonNode> kids) { | ||
| super(nc, kids); | ||
| } | ||
|
|
||
| public ConfigObjectNode(JsonNodeFactory nc) { | ||
| super(nc); | ||
| } | ||
|
|
||
| public void remove(String... names) { | ||
| remove(Arrays.asList(names)); | ||
| } | ||
|
|
||
| public void putAllFrom(Map<String, String> value) { | ||
gyfora marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| value.forEach(this::put); | ||
| } | ||
|
|
||
| public void setAllFrom(Map<String, String> value) { | ||
| removeAll(); | ||
csviri marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| putAllFrom(value); | ||
| } | ||
|
|
||
| public Map<String, String> asFlatMap() { | ||
csviri marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| Map<String, String> flatMap = new HashMap<>(); | ||
| flattenHelper(this, "", flatMap); | ||
| return flatMap; | ||
| } | ||
|
|
||
| public Configuration asConfiguration() { | ||
| return Configuration.fromMap(asFlatMap()); | ||
| } | ||
|
|
||
| private static void flattenHelper( | ||
| JsonNode node, String parentKey, Map<String, String> flatMap) { | ||
| if (node.isObject()) { | ||
| Iterator<Map.Entry<String, JsonNode>> fields = node.fields(); | ||
| while (fields.hasNext()) { | ||
| Map.Entry<String, JsonNode> field = fields.next(); | ||
| String newKey = | ||
| parentKey.isEmpty() ? field.getKey() : parentKey + "." + field.getKey(); | ||
| flattenHelper(field.getValue(), newKey, flatMap); | ||
| } | ||
| } else if (node.isArray()) { | ||
| for (int i = 0; i < node.size(); i++) { | ||
| String newKey = parentKey + "[" + i + "]"; | ||
| flattenHelper(node.get(i), newKey, flatMap); | ||
| } | ||
| } else { | ||
| // Store values as strings | ||
| flatMap.put(parentKey, node.asText()); | ||
| } | ||
| } | ||
| } | ||
39 changes: 39 additions & 0 deletions
39
...main/java/org/apache/flink/kubernetes/operator/api/spec/ConfigObjectNodeDeserializer.java
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.flink.kubernetes.operator.api.spec; | ||
|
|
||
| import com.fasterxml.jackson.core.JsonParser; | ||
| import com.fasterxml.jackson.databind.DeserializationContext; | ||
| import com.fasterxml.jackson.databind.JsonDeserializer; | ||
| import com.fasterxml.jackson.databind.node.ObjectNode; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| /** Allows to deserialize to ConfigObjectNode. */ | ||
| public class ConfigObjectNodeDeserializer extends JsonDeserializer<ConfigObjectNode> { | ||
|
|
||
| @Override | ||
| public ConfigObjectNode deserialize( | ||
| JsonParser jsonParser, DeserializationContext deserializationContext) | ||
| throws IOException { | ||
| ObjectNode tree = jsonParser.readValueAsTree(); | ||
| var res = new ConfigObjectNode(); | ||
| tree.fields().forEachRemaining(entry -> res.set(entry.getKey(), entry.getValue())); | ||
| return res; | ||
| } | ||
| } |
This file contains hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This dependency is now added twice if I see correctly
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good catch fixed