This repository has been archived by the owner on Mar 16, 2024. It is now read-only.
Add resolved offerings to the AppInstance status #2377
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
g-linville
changed the title
g-linville
changed the title
Signed-off-by: Grant Linville <[email protected]>
g-linville
force-pushed
the
resolved-offerings-second-try
branch
from
f375bd5 to
acd4a24
Compare
g-linville
requested review from
thedadams,
njhale,
StrongMonkey,
keyallis and
tylerslaton
njhale
suggested changes
Dec 19, 2023
| @@ -597,12 +597,34 @@ func containerAnnotation(container v1.Container) string { | |||
| return string(json) | |||
| } | |||
|
|
|||
| func resolvedOfferingsAnnotation(appInstance *v1.AppInstance, container v1.Container) (string, error) { | |||
| if resolved, exists := appInstance.Status.ResolvedOfferings.Containers[container.Name]; exists { | |||
| data, err := convert.EncodeToMap(resolved) | |||
There was a problem hiding this comment.
I was following the example of the containerAnnotation func right above it.
There was a problem hiding this comment.
The comment above says it is converting to map first to sort the keys, but I thought json.Marshal does that automatically.
Signed-off-by: Grant Linville <[email protected]>
thedadams
approved these changes
Dec 19, 2023
| @@ -597,12 +597,34 @@ func containerAnnotation(container v1.Container) string { | |||
| return string(json) | |||
| } | |||
|
|
|||
| func resolvedOfferingsAnnotation(appInstance *v1.AppInstance, container v1.Container) (string, error) { | |||
| if resolved, exists := appInstance.Status.ResolvedOfferings.Containers[container.Name]; exists { | |||
| data, err := convert.EncodeToMap(resolved) | |||
There was a problem hiding this comment.
The comment above says it is converting to map first to sort the keys, but I thought json.Marshal does that automatically.
njhale
approved these changes
Dec 19, 2023
dciangot
added a commit
to dciangot/runtime
that referenced
this pull request
Dec 20, 2023
resolve offerings introduced in acorn-io#2377
dciangot
added a commit
to dciangot/runtime
that referenced
this pull request
Dec 20, 2023
resolve offerings introduced in acorn-io#2377 Signed-off-by: dciangot <[email protected]>
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 is the second try at resolved offerings. This time I am just adding it as an additional controller route on AppInstances, leaving Defaults alone and making nothing depend on the new resolved offerings. I have tested this and verified that the bug that caused child acorns to be deleted is not present with these changes.
The unit tests for resolved offerings are copied from the
defaultspackage and modified a little bit.Checklist
This is a title (#1216). Here's an example