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

1609 release standard images #1689

Merged
merged 42 commits into from
Aug 8, 2023
Merged

1609 release standard images #1689

merged 42 commits into from
Aug 8, 2023

Conversation

jimmykarily
Copy link
Contributor

Fixes #1609

@jimmykarily jimmykarily mentioned this pull request Aug 7, 2023
Merged
@jimmykarily jimmykarily marked this pull request as ready for review August 8, 2023 07:26
@jimmykarily jimmykarily requested a review from a team August 8, 2023 07:26
Itxaka
Itxaka reviewed Aug 8, 2023
View reviewed changes
Earthfile Outdated
RUN ln -s /system/providers/agent-provider-kairos /usr/bin/kairos
END

INSTALL_NOHANG:
Copy link
Member

Choose a reason for hiding this comment

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

should we just add this pacakge to the base images and ignore this altogether? Its just one package no?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should be possible, yes, will give this a try.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This never handled almalinux, rockylinux, debian... I should probably add the package to all of them?

Itxaka
Itxaka reviewed Aug 8, 2023
View reviewed changes
Earthfile Outdated
IF [[ "$PROVIDER_KAIROS_BRANCH" = "" ]] # Install with luet (released versions of the binary)
# If base image does not bundle a luet config use one
# TODO: Remove this, use luet config from base images so they are in sync
IF [ ! -e "/etc/luet/luet.yaml" ]
Copy link
Member

Choose a reason for hiding this comment

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

I think this can be removed now.

The reason for this on the provider repo was that the base image from kairos could already provide the framework file and we could drop it from the provider repo, but now that we are building from here directly, we could just drop it altogether.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point, will do.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

From here as well I guess: https://github.com/kairos-io/kairos/pull/1689/files/3a483d716e3e9b464ff13f4ad2022f1f96d32e92#diff-2705f6016a64189abd14041e2f3e8dbb829553295d9088e4eb42eccb5e61bf47R1229

Itxaka
Itxaka reviewed Aug 8, 2023
View reviewed changes
Earthfile
COMMAND

ARG K3S_VERSION
IF [[ "$K3S_VERSION" = "" ]]
Copy link
Member

Choose a reason for hiding this comment

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

should we make this to be latest the default? Otherwise you get the full build until this point then it fails :/

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's easy to forget to pass this arg in a workflow. The result would be an artifact that will advertise itself (for example) as 1.25.11 but inside it would have the latest k3s. Given how Earthly caches things, when this fails, the next try is a lot faster. It's still annoying that it fails late but I think its worth it as a tradeoff, what do you think?

Copy link
Member

Choose a reason for hiding this comment

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

yeah good to me, I would like a different option for this to fail earlier but this is good for now, lets merge this asap!

Itxaka
Itxaka reviewed Aug 8, 2023
View reviewed changes
Itxaka
Itxaka reviewed Aug 8, 2023
View reviewed changes
Itxaka
Itxaka previously approved these changes Aug 8, 2023
View reviewed changes
Copy link
Member

@Itxaka Itxaka left a comment

Choose a reason for hiding this comment

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

All nits, not blockers

jimmykarily
jimmykarily commented Aug 8, 2023
View reviewed changes
Earthfile Outdated
IF [ "$FLAVOR" = "opensuse-leap" ] || [ "$FLAVOR" = "opensuse-leap-arm-rpi" ]
RUN zypper ref && zypper in -y nohang
ELSE IF [ "$FLAVOR" = "alpine-ubuntu" ] || [ "$FLAVOR" = "alpine-opensuse-leap" ] || [ "$FLAVOR" = "alpine-arm-rpi" ]
RUN apk add grep
Copy link
Contributor Author

Choose a reason for hiding this comment

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

😕 So since alpine doesn't have nohang we decided to install grep instead ? :D

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We only enable this on systemd: https://github.com/kairos-io/kairos/blob/master/overlay/files/system/oem/09_services.yaml#L21-L22

So the question is, how does this work on systemd flavors that don't have it?
(fedora, rockylinux, almalinux)

Copy link
Member

Choose a reason for hiding this comment

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

lol

Itxaka
Itxaka previously approved these changes Aug 8, 2023
View reviewed changes
Copy link
Member

@Itxaka Itxaka left a comment

Choose a reason for hiding this comment

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

lets gooooo

@jimmykarily jimmykarily force-pushed the 1609-release-standard-images branch from 6d5d13d to f6b1607 Compare August 8, 2023 12:19
jimmykarily
jimmykarily commented Aug 8, 2023
View reviewed changes
images/Dockerfile.ubuntu-20-lts-arm-nvidia-jetson-agx-orin
Comment on lines +31 to +34
# nohang
RUN add-apt-repository ppa:oibaf/test
RUN apt-get install -y nohang

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is not really needed since we don't build standard images for this flavor (https://github.com/kairos-io/kairos/pull/1689/files#diff-5cb44b260a8400267a5ff9938571e2022a5ef59730459941d173f5b5fffb389c).

@jimmykarily
Use dev version for provider kairos in Earthly
ad2fad3 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
[WIP] Build a matrix for standard (provider) images
0e70d04 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
Build provider-kairos image with the right flags
676e2ec 
E.g. Invoke it as:

earthly +iso -PROVIDER_KAIROS=true -PROVIDER_KAIROS_VERSION=2.3.0 -K3S_VERSION=1.24.2

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
Use latest package for provider-kairos and k3s
6fc1c3c 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
Remove PROVIDER_KAIROS_VERSION setting
cdc0ddf 
because when we install with luet, the version is defined by the
repository in framework-profile.yaml

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
Remove implemented TODO
992473f 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
Construct the k8s versions by quering the luet repo for available ones
d691c55 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
No need to change version strings
1f3d00a 
They are already in the required format for luet

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
WIP
82fff2a 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
Remove default MODEL that doesn't work
107ca1b 
because the top level default always wins (Earthly...)

and downgrade osbuilder because it breaks arm builds. This should fix it:

kairos-io/osbuilder#80

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
Don't build standard images for nvidia jetson
4e26200 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
WIP
5315931 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
mauromorales and others added 25 commits August 8, 2023 16:34
@mauromorales @jimmykarily
Remove not used ARGs and simplify targets
f503649 
Signed-off-by: Dimitris Karakasilis <dimitris@spectrocloud.com>
@jimmykarily
Try out on our branch
70d7299 
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
@mauromorales @jimmykarily
Configure luet before searching it
450e7d7 
Signed-off-by: Dimitris Karakasilis <dimitris@spectrocloud.com>
@jimmykarily
Try to fix luet
ca19c3b 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
Fix luet
b35fdca 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
Fix signing path
6871695 
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
@jimmykarily
Bump CI
dc249bb 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
Add debug job
5ffd3e1 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
Remove dummy job and try to remove permissions
13e4e45 
to see if they are actually needed anywhere

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
Debug, debug, debug
140d4c8 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
Switch back to old naming
6a5d1f4 
we will deal with it on another PR

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@mauromorales @jimmykarily
Simplify jq syntax
0af91ab 
Signed-off-by: Dimitris Karakasilis <dimitris@spectrocloud.com>
@jimmykarily
Fix arm image release pipeline (no generic yet)
1dd43ab 
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
@mauromorales @jimmykarily
Fix luet installation in job
e073df9 
Signed-off-by: Dimitris Karakasilis <dimitris@spectrocloud.com>
@jimmykarily
Fix the release-arm pipeline
4268c52 
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
@mauromorales @jimmykarily
Unshallow the checkout in the pipeline to build a proper VERSION
f937621 
Signed-off-by: Dimitris Karakasilis <dimitris@spectrocloud.com>
@jimmykarily
Use the action fetch-depth instead of unshallow
40d24ad 
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
@mauromorales @jimmykarily
Fix earthly things
aae174a 
Signed-off-by: Dimitris Karakasilis <dimitris@spectrocloud.com>
@jimmykarily
WIP
e08432e 
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
@jimmykarily
Remove our test branch from the workflow
57e8703 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@mauromorales @jimmykarily
Remove done TODOs and make sure we install tools in all k3s versions
852250c 
Signed-off-by: Dimitris Karakasilis <dimitris@spectrocloud.com>
@jimmykarily
Rename Earthly command and remove unnecessary copying
f654fbd 
because the framework-profile should already be in place

(Fixes based on PR comments)

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
Add nohang in base images (wherever it's available)
b116718 
and remove the Earthly target for that.

Question: We only enable this on systemd:
  https://github.com/kairos-io/kairos/blob/master/overlay/files/system/oem/09_services.yaml#L21-L22
  What about systemd flavors that don't have it? (fedora, rockylinux,
  almalinux)

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
Add repository for nohang in jetson dockerfile
5f17aae 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily
Filter which flavors to build standard image for
52c94bd 
and stop running the release pipeline our current branch

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily jimmykarily force-pushed the 1609-release-standard-images branch from 0dbbc35 to 52c94bd Compare August 8, 2023 13:34
@jimmykarily
Fix name of matrix
eff6969 
Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
@jimmykarily jimmykarily merged commit 817f4ee into master Aug 8, 2023
@jimmykarily jimmykarily deleted the 1609-release-standard-images branch August 8, 2023 14:12
jimmykarily added a commit to kairos-io/provider-kairos that referenced this pull request Aug 8, 2023
@jimmykarily
Remove release pipelines because now releasing images happens in kair…
7af168c 
…os (#472)

TODO: Build standard images for all flavors in kairos on "master", so
that we can completely remove the image building code from this repo
(and the rest of the image building pipelines). This way, there won't be
any duplication anymore.

Part of [#1609](kairos-io/kairos#1609)
Goes together with: kairos-io/kairos#1689

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Itxaka Itxaka Itxaka left review comments

Assignees

@mauromorales mauromorales

@jimmykarily jimmykarily

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

Successfully merging this pull request may close these issues.

⚠️ Build provider-kairos in this repository
3 participants
@jimmykarily @Itxaka @mauromorales