feat: compute schematic id only from the extensions #74
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
utkuozdemir
force-pushed
the
extensions-only-machine-schematic
branch
2 times, most recently
from
9fb2b01 to
ffc9a44
Compare
utkuozdemir
commented
Mar 15, 2024
| @@ -30,7 +29,7 @@ import ( | |||
| type TalosExtensionsController = qtransform.QController[*omni.TalosVersion, *omni.TalosExtensions] | |||
|
|
|||
| // NewTalosExtensionsController instantiates the TalosExtensions controller. | |||
| func NewTalosExtensionsController() *TalosExtensionsController { | |||
| func NewTalosExtensionsController(imageFactoryClient *imagefactory.Client) *TalosExtensionsController { | |||
There was a problem hiding this comment.
Switch to using the new wrapper, so the only point where we create a new image factory GRPC client is actually in magefactory.Client
utkuozdemir
commented
Mar 15, 2024
| @@ -311,7 +311,7 @@ const createSchematic = async () => { | |||
| meta_values: {}, | |||
| }; | |||
|
|
|||
| if (labels.value) { | |||
| if (labels.value && Object.keys(labels.value).length > 0) { | |||
There was a problem hiding this comment.
If no labels were set, we were setting here a YAML with empty content for the labels key. Now we do not set any META information if there are no labels.
Unix4ever
reviewed
Mar 16, 2024
internal/backend/runtime/omni/controllers/omni/cluster_machine_config.go
Outdated
Show resolved
Hide resolved
Unix4ever
reviewed
Mar 16, 2024
internal/backend/runtime/omni/controllers/omni/cluster_machine_config_status.go
Outdated
Show resolved
Hide resolved
Unix4ever
reviewed
Mar 16, 2024
internal/backend/runtime/omni/controllers/omni/internal/talos/schematic.go
Outdated
Show resolved
Hide resolved
Unix4ever
approved these changes
Mar 16, 2024
utkuozdemir
force-pushed
the
extensions-only-machine-schematic
branch
from
ffc9a44 to
4600223
Compare
utkuozdemir
added
the
integration/e2e-upgrades
utkuozdemir
force-pushed
the
extensions-only-machine-schematic
branch
from
4600223 to
46771f9
Compare
Unix4ever
force-pushed
the
extensions-only-machine-schematic
branch
5 times, most recently
from
353b0fe to
b979005
Compare
frezbo
reviewed
Mar 22, 2024
frezbo
approved these changes
Mar 22, 2024
When determining the schematic ID of a machine, instead of relying the ID on the schematic ID meta-extension, compute the ID by gathering the extensions on the machine. This way, the extension ID will not contain the META values, labels or the kernel args. This ID is actually the ID we need, as when we compare the desired schematic with the actual one during a Talos upgrade, we are only interested in the changes in the list of extensions. This does not cause the kernel args, labels, etc. to disappear, as they are used at installation time and preserved afterward (e.g., during upgrades). Additionally: - Remove the list of extensions from the `Schematic` resource, as it relied upon the schematics always being created through Omni. This is not always the case - i.e., when a partial join config is used. Therefore, instead of relying on it, we store the list of extensions by directly reading them from the machine and storing them on the `MachineStatus` resource. - Skip setting the schematic META section at all if there are no labels set on Download Installation Media screen. Closes #55. Signed-off-by: Utku Ozdemir <[email protected]>
Unix4ever
force-pushed
the
extensions-only-machine-schematic
branch
from
b979005 to
176f9d9
Compare
|
/m |
|
🙏🏻 |
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.
When determining the schematic ID of a machine, instead of relying the ID on the schematic ID meta-extension, compute the ID by gathering the extensions on the machine. This way, the extension ID will not contain the META values, labels or the kernel args.
This ID is actually the ID we need, as when we compare the desired schematic with the actual one during a Talos upgrade, we are only interested in the changes in the list of extensions.
This does not cause the kernel args, labels, etc. to disappear, as they are used at installation time and preserved afterward (e.g., during upgrades).
Additionally:
Schematicresource, as it relied upon the schematics always being created through Omni. This is not always the case - i.e., when a partial join config is used. Therefore, instead of relying on it, we store the list of extensions by directly reading them from the machine and storing them on theMachineStatusresource.Closes #55.