chore: split config.Registries into the separate resource.
#9780
+2,353
−111
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
DmitriyMV
force-pushed
the
split-registry
branch
from
bac4314
to
afa039e
Compare
DmitriyMV
changed the title
config.Registry into the separate resource.config.Registries into the separate resource.
DmitriyMV
force-pushed
the
split-registry
branch
from
afa039e
to
b7bb576
Compare
dsseng
approved these changes
Nov 21, 2024
smira
reviewed
Nov 25, 2024
smira
reviewed
Nov 25, 2024
internal/app/machined/pkg/controllers/files/cri_registry_config.go
Outdated
Show resolved
Hide resolved
smira
reviewed
Nov 25, 2024
DmitriyMV
force-pushed
the
split-registry
branch
from
b7bb576
to
d0f1a62
Compare
|
@smira I think all paths leading to |
smira
reviewed
Nov 26, 2024
| // This is a hack, but I (Dmitry) don't have enough patience to figure out why we don't support complex maps | ||
| return "resource/definitions/cri/registry.proto", "talos.resource.definitions.cri.RegistryMirrorConfig" | ||
| case typeData{"github.com/siderolabs/talos/pkg/machinery/resources/cri", "RegistryConfig"}: | ||
| // This is a hack, but I (Dmitry) don't have enough patience to figure out why we don't support complex maps |
smira
reviewed
Nov 26, 2024
| ) | ||
|
|
||
| // RegistriesSpecType is type of RegistriesSpec resource. | ||
| const RegistriesSpecType = resource.Type("Registries.net.talos.dev") |
There was a problem hiding this comment.
if we call it registries, we should name the constant RegistriesType, and cascading down.
I would probably name it RegistriesConfig though
smira
reviewed
Nov 26, 2024
| const RegistriesID resource.ID = "registries" | ||
|
|
||
| // RegistriesSpec resource holds info about container registries. | ||
| type RegistriesSpec = typed.Resource[RegistriesSpecSpec, RegistriesSpecExtension] |
There was a problem hiding this comment.
add it to the cri_test.go in this folder to catch some issues quickly
smira
reviewed
Nov 26, 2024
| @@ -1506,13 +1507,19 @@ func Upgrade(_ runtime.Sequence, data any) (runtime.TaskExecutionFunc, string) { | |||
|
|
|||
| logger.Printf("performing upgrade via %q", in.GetImage()) | |||
|
|
|||
| rgs, err := safe.ReaderGetByID[*crires.RegistriesSpec](ctx, r.State().V1Alpha2().Resources(), crires.RegistriesID) | |||
There was a problem hiding this comment.
this certainly has a race condition (not here, but more on the install sequence)
a proper way would be to block for the config to be available
Suggested change
| rgs, err := safe.ReaderGetByID[*crires.RegistriesSpec](ctx, r.State().V1Alpha2().Resources(), crires.RegistriesID) | |
| rgs, err := safe.StateWaitFor[*crires.RegistriesSpec](ctx, r.State().V1Alpha2().Resources(), crires.RegistriesID, state.WithEventTypes(state.Created, state.Updated)) |
DmitriyMV
force-pushed
the
split-registry
branch
from
d0f1a62
to
65d4127
Compare
|
Integration provision passes, so upgrades work. I'll remove the label to speed-up process. |
Required for siderolabs#9614 Closes siderolabs#9766 Signed-off-by: Dmitriy Matrenichev <[email protected]>
DmitriyMV
force-pushed
the
split-registry
branch
from
65d4127
to
3ffb2e1
Compare
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.
Required for #9614
Closes #9766