fix: Validate the type of configmap before loading parameters. Fixes #7312 #7314
Conversation
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
…7312 Signed-off-by: Yuan Tang <terrytangyuan@gmail.com>
Signed-off-by: Yuan Tang <terrytangyuan@gmail.com>
Signed-off-by: Yuan Tang <terrytangyuan@gmail.com>
terrytangyuan
commented
Dec 1, 2021
| @@ -1,4 +1,4 @@ | |||
| package util | |||
| package common | |||
There was a problem hiding this comment.
Moving this file to common to avoid cyclic dependencies
simster7
approved these changes
Dec 1, 2021
workflow/common/configmap.go
Outdated
| @@ -18,6 +18,11 @@ func GetConfigMapValue(configMapInformer cache.SharedIndexInformer, namespace, n | |||
| if !ok { | |||
| return "", fmt.Errorf("unable to convert object %s to configmap when syncing ConfigMaps", name) | |||
| } | |||
| if cmType := cm.Labels[LabelKeyConfigMapType]; cmType != LabelValueTypeConfigMapParameter { | |||
| return "", fmt.Errorf( | |||
| "ConfigMap '%s' needs to have the label %s: %s for parameters loading", | |||
There was a problem hiding this comment.
Suggested change
| "ConfigMap '%s' needs to have the label %s: %s for parameters loading", | |
| "ConfigMap '%s' needs to have the label %s: %s to load parameters", |
Signed-off-by: Yuan Tang <terrytangyuan@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #7312.
Signed-off-by: Yuan Tang terrytangyuan@gmail.com
Don't bother creating a PR until you've done this:
make pre-commit -Bto fix codegen, lint, and commit message problems.Create your PR as a draft.
does not need to pass.
Tips: