Updates & Refactors for k8s 1.32 #644
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
mallardduck
commented
Jan 14, 2025
| } | ||
|
|
||
| // Need to verify encrypted is actually different... | ||
| if !bytes.Equal(resourceBytes, maybeEncrypted) { |
There was a problem hiding this comment.
Because we can do this check here...
pkg/resourcesets/collector.go
Outdated
| @@ -436,17 +436,21 @@ func writeToBackup(ctx context.Context, resource map[string]interface{}, backupP | |||
| if err != nil { | |||
| return fmt.Errorf("error converting resource to JSON: %v", err) | |||
| } | |||
| if transformer != nil && !util.IsDefaultEncryptionTransformer(transformer) { | |||
There was a problem hiding this comment.
...it technically does similar to what this intended to do, just after transformer.TransformToStorage is called instead of before. Obviously before was better, but no longer an option (for) now.
|
|
||
| resourceBytes, err = json.Marshal(encrypted) | ||
| // Since k8s 1.32 we cannot verify a transformer must be run, so it's always run now. | ||
| maybeEncrypted, err := transformer.TransformToStorage(ctx, resourceBytes, value.DefaultContext(additionalAuthenticatedData)) |
There was a problem hiding this comment.
I think that because of those factors, this is a new change in dataflow/processing that non-encrypted restores used to skip, but will now run all the time. So ultimately this likely doesn't change too much at the end of the day, but is technically a new area that an error could come from.
alexandreLamarre
previously approved these changes
Feb 6, 2025
Signed-off-by: Alexandre Lamarre <[email protected]>
alexandreLamarre
approved these changes
Feb 6, 2025
|
Part of rancher/rancher#48832 |
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.
Blocked by: #645
I will submit a version of this based of
mainafter above is merged. This will ensure higher test coverage before the breaking upstream change is accounted for.