UPSTREAM: <carry>: change config file location and restore perFSGroup to Quantity #19773
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
openshift-ci-robot
added
the
size/S
| @@ -73,6 +74,11 @@ func PatchVolumePluginsForLocalQuota(rootdir string, plugins *[]volume.VolumePlu | |||
| return fmt.Errorf("expected kind \"%s\" and apiVersion \"%s\" for volume config file", volumeConfigKind, volumeConfigAPIVersion) | |||
| } | |||
|
|
|||
| quota, err := resource.ParseQuantity(volumeConfig.LocalQuota.PerFSGroup) | |||
| if err != nil { | |||
| return fmt.Errorf("enable to parse \"%s\" as a quantity", volumeConfig.LocalQuota.PerFSGroup) | |||
sjenning
force-pushed
the
volume-config-resource
branch
from
4875fb1 to
12f2dfb
Compare
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: derekwaynecarr, sjenning The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
|
/retest Please review the full test history for this PR and help us cut down flakes. |
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.
Follow on to #19533
perFSGroupInGBback toperFSGroupwith aQuantityvalue./etc/origin/node/volume-config.yamlso that it can be a second key to the existingnode-config-computeconfigmap and everything will Just Work (tm).xref https://bugzilla.redhat.com/show_bug.cgi?id=1579305
@derekwaynecarr @smarterclayton @jupierce