This repository has been archived by the owner on Jun 29, 2022. It is now read-only.
Restic bug fixes; unit tests and docs formatting #1365
Merged
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
invidian
suggested changes
Feb 8, 2021
invidian
suggested changes
Feb 8, 2021
ipochi
force-pushed
the
imran/restic-fixes
branch
from
b87f1e2
to
f97f800
Compare
ipochi
force-pushed
the
imran/restic-fixes
branch
2 times, most recently
from
79a1a13
to
bd42db2
Compare
invidian
previously requested changes
Feb 9, 2021
| @@ -31,64 +31,64 @@ Velero component configuration example: | |||
| # velero.lokocfg | |||
| component "velero" { | |||
|
|
|||
| # provider = "azure/openebs/restic" | |||
There was a problem hiding this comment.
Nit: I suggest opening separate PRs with such fixes, so they can be immediately merged.
ipochi
force-pushed
the
imran/restic-fixes
branch
from
bd42db2
to
ebd457e
Compare
Signed-off-by: Imran Pochi <imran@kinvolk.io>
This commit updates the TolerationSeconds from string to int64. Also update the json tag from `toleration_seconds` to `tolerationSeconds`. JSON tag is updated because, Tolerations struct is directly marshalled to JSON and stored as a string TolerationsRaw which is then passed to the helm templates. This causes the Kubernetes API Server to complain during validation that no such field regarding `toleration_seconds` since API server was expected `tolerationSeconds`. Data type is changed to int64, becuase Kubernetes API server expects the TolerationSeconds to be int64 instead of string. Thereby causing validation to fail at the API server end. Updates the unit test to reflect the same. Signed-off-by: Imran Pochi <imran@kinvolk.io>
This commit adds validation to the Tolerations type. This is done so because Kubernetes API server expects that if `TolerationSeconds` is set then `Effect` must be set to `NoExecute`. This condition checks for the same and reports and error to the user if this condition is not met. Adds unit test for the same. Signed-off-by: Imran Pochi <imran@kinvolk.io>
This commit adds a check to check if restic.tolerations.toleration_seconds is set then the value of restic.tolerations.effect must be `NoExecute` Signed-off-by: Imran Pochi <imran@kinvolk.io>
This commit adds a conditional check for restic.region is to be set if restic.provider is `aws`. This change is done to reflect the addtional configuration of region that is required when provider is `aws`. Without this additional check lokoctl throws an error message that is caught few levels below in the stack in the velero. Catching this error allows a consistent error message reporting to the user. If any other provider is used, then region value is optional. Updates the unit test to reflect the same. Signed-off-by: Imran Pochi <imran@kinvolk.io>
ipochi
force-pushed
the
imran/restic-fixes
branch
from
ebd457e
to
5f0b1e8
Compare
surajssd
reviewed
Feb 11, 2021
surajssd
previously approved these changes
Feb 11, 2021
invidian
previously approved these changes
Feb 11, 2021
ipochi
force-pushed
the
imran/restic-fixes
branch
2 times, most recently
from
8cf20fa
to
03ebe0e
Compare
ipochi
force-pushed
the
imran/restic-fixes
branch
2 times, most recently
from
e3e4af5
to
3cdfbef
Compare
This commit fixes the formatting for the configuration reference documentation of Velero component. Signed-off-by: Imran Pochi <imran@kinvolk.io>
ipochi
force-pushed
the
imran/restic-fixes
branch
from
3cdfbef
to
09bf039
Compare
invidian
approved these changes
Feb 11, 2021
knrt10
approved these changes
Feb 11, 2021
surajssd
approved these changes
Feb 11, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR fixes the issue with Restic.Tolerations; adds unit tests and fixes docs formatting.
toleration_secondsis changed totolerationSecondsTolerationSecondsfield is now an integer instead of string.TolerationSecondsis set, thenEffectmust beNoExecute.