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

Override hubble-ui images if overwriteRegistry is set #13139

Merged
merged 1 commit into from
Feb 29, 2024

Conversation

embik
Copy link
Member

@embik embik commented Feb 28, 2024

What this PR does / why we need it:

As reported, the hubble-ui frontend and backend images are not correctly overridden if overwriteRegistry is set. Turns out, the valuesFrontend and valuesBackend variables prepared for it where never added to the main values map.

To make this PR backport-compatible for 2.24, I am also not setting the podSecurityContext that would have been part of cloning the common values into valuesFrontend and valuesBackend. The value doesn't exist anyway.

In addition, I have moved the construction of the final values map from the sub-maps to the end of the function. I found it deeply confusing that the maps are wired up into values first and then set.

Which issue(s) this PR fixes:

Fixes #13136

What type of PR is this?
/kind bug

Special notes for your reviewer:

Does this PR introduce a user-facing change? Then add your Release Note here:

Fix missing image registry override for hubble-ui components if Cilium is deployed as System Application

Documentation:

NONE

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>
@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. docs/none Denotes a PR that doesn't need documentation (changes). dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. kind/bug Categorizes issue or PR as related to a bug. do-not-merge/code-freeze Indicates that a PR should not merge because it has not been approved for code freeze yet. sig/networking Denotes a PR or issue as being assigned to SIG Networking. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 28, 2024
@embik
Copy link
Member Author

embik commented Feb 28, 2024

/cherry-pick release/v2.24

@kubermatic-bot
Copy link
Contributor

@embik: once the present PR merges, I will cherry-pick it on top of release/v2.24 in a new PR and assign it to you.

In response to this:

/cherry-pick release/v2.24

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@embik
Copy link
Member Author

embik commented Feb 28, 2024

/cc @cnvergence

@embik
Copy link
Member Author

embik commented Feb 28, 2024

/milestone KKP 2.25

@kubermatic-bot kubermatic-bot added this to the KKP 2.25 milestone Feb 28, 2024
Copy link
Member

@cnvergence cnvergence left a comment

Choose a reason for hiding this comment

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

lgtm

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 28, 2024
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: ef8a69ccd53063be9b424ae7703b6da8a46dab28

@cnvergence
Copy link
Member

/approve

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cnvergence

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 28, 2024
@embik embik added the code-freeze-approved Indicates a PR has been approved by release managers during code freeze. label Feb 29, 2024
@kubermatic-bot kubermatic-bot removed the do-not-merge/code-freeze Indicates that a PR should not merge because it has not been approved for code freeze yet. label Feb 29, 2024
@kubermatic-bot kubermatic-bot merged commit 93a0c89 into kubermatic:main Feb 29, 2024
19 checks passed
@kubermatic-bot
Copy link
Contributor

@embik: new pull request created: #13140

In response to this:

/cherry-pick release/v2.24

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@embik embik deleted the cilium-image-fix branch February 29, 2024 07:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. code-freeze-approved Indicates a PR has been approved by release managers during code freeze. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/none Denotes a PR that doesn't need documentation (changes). kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/networking Denotes a PR or issue as being assigned to SIG Networking. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

air-gapped - kkp cilium CNI: hubble container images ignored with overwriteRegistry
3 participants