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.

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

Adding cli to custom klipper helm image #7682

Merged
merged 3 commits into from
Jun 28, 2023

Conversation

vitorsavian
Copy link
Member

@vitorsavian vitorsavian commented Jun 7, 2023

Proposed Changes

A new cli flag for changing our klipper helm image that is default

Types of Changes

New feature

Verification

See linked issue

Testing

Linked Issues

#3865

User-Facing Change

the default helm-controller job image can now be overridden with the --helm-job-image CLI flag

Further Comments

Signed-off-by: Vitor Savian <vitor.savian@suse.com>
@vitorsavian vitorsavian requested a review from a team as a code owner June 7, 2023 18:55
Copy link
Member

@brandond brandond left a comment

Choose a reason for hiding this comment

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

Although the images are still called klipper-helm and klipper-lb, we don't call things "klipper" any more, even internally. Klipper was an early project name for K3s, and we've completely dropped except for these two image names.

pkg/cli/cmds/server.go Outdated Show resolved Hide resolved
pkg/cli/server/server.go Outdated Show resolved Hide resolved
pkg/daemons/config/types.go Outdated Show resolved Hide resolved
pkg/server/server.go Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Jun 7, 2023

Codecov Report

Patch coverage has no change and project coverage change: +2.11 🎉

Comparison is base (e5e1a67) 47.55% compared to head (109fe12) 49.67%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7682      +/-   ##
==========================================
+ Coverage   47.55%   49.67%   +2.11%     
==========================================
  Files         141      140       -1     
  Lines       14347    14450     +103     
==========================================
+ Hits         6823     7178     +355     
+ Misses       6442     6078     -364     
- Partials     1082     1194     +112     
Flag Coverage Δ
e2etests 49.36% <0.00%> (?)
inttests 44.49% <0.00%> (-0.43%) ⬇️
unittests ?

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
pkg/cli/cmds/server.go 100.00% <ø> (ø)
pkg/cli/server/server.go 60.13% <0.00%> (-1.08%) ⬇️
pkg/daemons/config/types.go 70.00% <ø> (-14.45%) ⬇️
pkg/server/server.go 58.36% <0.00%> (+1.47%) ⬆️

... and 62 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Copy link
Member

@brandond brandond left a comment

Choose a reason for hiding this comment

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

nit, lgtm otherwise!

pkg/cli/cmds/server.go Outdated Show resolved Hide resolved
Signed-off-by: Vitor Savian <vitor.savian@suse.com>
Signed-off-by: Vitor Savian <vitor.savian@suse.com>
@vitorsavian vitorsavian merged commit 0809187 into k3s-io:master Jun 28, 2023
brandond pushed a commit to brandond/k3s that referenced this pull request Jul 7, 2023
Adding cli to custom klipper helm image

Signed-off-by: Vitor Savian <vitor.savian@suse.com>
(cherry picked from commit 0809187)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond pushed a commit to brandond/k3s that referenced this pull request Jul 7, 2023
Adding cli to custom klipper helm image

Signed-off-by: Vitor Savian <vitor.savian@suse.com>
(cherry picked from commit 0809187)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond pushed a commit to brandond/k3s that referenced this pull request Jul 7, 2023
Adding cli to custom klipper helm image

Signed-off-by: Vitor Savian <vitor.savian@suse.com>
(cherry picked from commit 0809187)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond pushed a commit that referenced this pull request Jul 7, 2023
Adding cli to custom klipper helm image

Signed-off-by: Vitor Savian <vitor.savian@suse.com>
(cherry picked from commit 0809187)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond pushed a commit that referenced this pull request Jul 7, 2023
Adding cli to custom klipper helm image

Signed-off-by: Vitor Savian <vitor.savian@suse.com>
(cherry picked from commit 0809187)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond pushed a commit that referenced this pull request Jul 7, 2023
Adding cli to custom klipper helm image

Signed-off-by: Vitor Savian <vitor.savian@suse.com>
(cherry picked from commit 0809187)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@vitorsavian vitorsavian deleted the add-custom-klipper-image-cli branch October 18, 2023 00:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants