Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing Install attributes #111

Merged
merged 6 commits into from
May 6, 2024
Merged

Add missing Install attributes #111

merged 6 commits into from
May 6, 2024

Conversation

mauromorales
Copy link
Member

@mauromorales mauromorales commented May 6, 2024 •
edited
Loading

relates to #2492

@mauromorales mauromorales requested a review from a team May 6, 2024 13:38
@mauromorales mauromorales self-assigned this May 6, 2024
Itxaka
Itxaka reviewed May 6, 2024
View reviewed changes
schema/install_schema.go Outdated
}

type ElementalPartitions struct {
BIOS *Partition
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bios and Efi should not be here, they are not configurable by user

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed

@mauromorales mauromorales mentioned this pull request May 6, 2024
Merged
@mauromorales
Remove unused
fa71261 
Signed-off-by: Mauro Morales <[email protected]>
@mauromorales
Add missing structs
79c260a 
Signed-off-by: Mauro Morales <[email protected]>
@codecov Codecov
Copy link

codecov bot commented May 6, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 53.18%. Comparing base (cd73d32) to head (505af6d).

Additional details and impacted files 
@@           Coverage Diff           @@
##             main     #111   +/-   ##
=======================================
  Coverage   53.18%   53.18%           
=======================================
  Files          16       16           
  Lines        1115     1115           
=======================================
  Hits          593      593           
  Misses        424      424           
  Partials       98       98

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Itxaka
Itxaka reviewed May 6, 2024
View reviewed changes
schema/install_schema.go Outdated
}

// ImageSource represents the source from where an image is created for easy identification
type ImageSource struct {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need this here? I dont think it will work, i.e. you cannot override the Source by a yaml directly like this, you need to override the install.Source like here:

func generateInstallConfForCLIArgs(sourceImageURL string) string {
	if sourceImageURL == "" {
		return ""
	}

	return fmt.Sprintf(`install:
  source: %s
`, sourceImageURL)
}

then that yaml gets ingested and converted to an actual ImageSource which is for internal use mainly

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so what should source be? just a string? or it shouldn't be there at all?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

made it a string, now, let me know if it's not correct

@mauromorales
Make Image.Source a string
775f822 
Signed-off-by: Mauro Morales <[email protected]>
Itxaka
Itxaka reviewed May 6, 2024
View reviewed changes
schema/install_schema.go
Label string `json:"label,omitempty" mapstructure:"label"`
Size uint `json:"size,omitempty" mapstructure:"size"`
FS string `json:"fs,omitempty" mapstructure:"fs"`
Source string `json:"uri,omitempty" mapstructure:"uri"`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no idea to be honest. The processing of this is done on the spec generation I think so a string should be ok I guess?

@mauromorales
Remove firmware and part-table
b312ea7 
Signed-off-by: Mauro Morales <[email protected]>
Itxaka
Itxaka reviewed May 6, 2024
View reviewed changes
schema/install_schema.go Outdated Show resolved Hide resolved
@mauromorales
Remove unused attributes
505af6d 
Signed-off-by: Mauro Morales <[email protected]>
@mauromorales mauromorales merged commit 7bbd596 into main May 6, 2024
10 of 11 checks passed
@mauromorales mauromorales deleted the add-missing-install-attributes branch May 6, 2024 14:41
github-actions bot referenced this pull request in kairos-io/provider-kairos May 6, 2024
@renovate
fix(deps): update module github.com/kairos-io/kairos-sdk to v0.1.3 (#555
477d7b2 
)

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[github.com/kairos-io/kairos-sdk](https://togithub.com/kairos-io/kairos-sdk)
| `v0.1.2` -> `v0.1.3` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fkairos-io%2fkairos-sdk/v0.1.3?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fkairos-io%2fkairos-sdk/v0.1.3?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fkairos-io%2fkairos-sdk/v0.1.2/v0.1.3?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fkairos-io%2fkairos-sdk/v0.1.2/v0.1.3?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>kairos-io/kairos-sdk
(github.com/kairos-io/kairos-sdk)</summary>

###
[`v0.1.3`](https://togithub.com/kairos-io/kairos-sdk/releases/tag/v0.1.3)

[Compare
Source](https://togithub.com/kairos-io/kairos-sdk/compare/v0.1.2...v0.1.3)

#### What's Changed

- Show encrypted parts in state by
[@&#8203;Itxaka](https://togithub.com/Itxaka) in
[https://github.com/kairos-io/kairos-sdk/pull/108](https://togithub.com/kairos-io/kairos-sdk/pull/108)
- Add missing Install attributes by
[@&#8203;mauromorales](https://togithub.com/mauromorales) in
[https://github.com/kairos-io/kairos-sdk/pull/111](https://togithub.com/kairos-io/kairos-sdk/pull/111)

**Full Changelog**:
kairos-io/kairos-sdk@v0.1.2...v0.1.3

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 11pm every weekday,before 7am
every weekday,every weekend" in timezone Europe/Brussels, Automerge - At
any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/kairos-io/provider-kairos).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMzEuMCIsInVwZGF0ZWRJblZlciI6IjM3LjM0MC4xMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Itxaka Itxaka Itxaka approved these changes

Assignees

@mauromorales mauromorales

Labels
None yet
Projects
🧙Issue tracking board
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mauromorales @Itxaka