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

[release/v2.21] Use seed config proxy for seed-cm (#11561) #11596

Merged

Conversation

mate4st
Copy link
Contributor

@mate4st mate4st commented Dec 22, 2022

What this PR does / why we need it:

Backport of:
#11561

Which issue(s) this PR fixes:

Fixes #11509

What type of PR is this?

/kind bug

Use seed proxy configuration for seed-controler-manager
NONE

* Use seed config proxy for seed-cm

* harmonize proxy env helper functions

* gimps

* readd null check
@kubermatic-bot kubermatic-bot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 22, 2022
@mate4st
Copy link
Contributor Author

mate4st commented Jan 2, 2023

/test pre-kubermatic-test-integration

1 similar comment
@mate4st
Copy link
Contributor Author

mate4st commented Jan 2, 2023

/test pre-kubermatic-test-integration

@xrstf
Copy link
Contributor

xrstf commented Jan 2, 2023

/approve
/lgtm
/override pre-kubermatic-test-integration
/override pre-kubermatic-mla-e2e

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 2, 2023
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: c53c5788cfd304199e19968f6983b8b8636581b5

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 2, 2023
@xrstf xrstf added cherry-pick-approved Indicates a PR has been approved by release managers. and removed approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Jan 2, 2023
@kubermatic-bot
Copy link
Contributor

@xrstf: Overrode contexts on behalf of xrstf: pre-kubermatic-mla-e2e, pre-kubermatic-test-integration

In response to this:

/approve
/lgtm
/override pre-kubermatic-test-integration
/override pre-kubermatic-mla-e2e

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

embik commented Jan 3, 2023

/approve

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: embik, WeirdMachine, xrstf

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 Jan 3, 2023
@kubermatic-bot kubermatic-bot merged commit 4e31883 into kubermatic:release/v2.21 Jan 3, 2023
@mate4st
Copy link
Contributor Author

mate4st commented Jan 5, 2023

/cherrypick release/v2.20

@kubermatic-bot
Copy link
Contributor

@WeirdMachine: #11596 failed to apply on top of branch "release/v2.20":

Applying: Use seed config proxy for seed-cm (#11561)
Using index info to reconstruct a base tree...
M	pkg/controller/operator/common/util.go
A	pkg/controller/operator/common/webhook.go
M	pkg/controller/operator/master/resources/kubermatic/api.go
M	pkg/controller/operator/master/resources/kubermatic/master-controller-manager.go
M	pkg/controller/operator/master/resources/kubermatic/ui.go
M	pkg/controller/operator/seed/resources/kubermatic/seed-controller-manager.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/operator/seed/resources/kubermatic/seed-controller-manager.go
Auto-merging pkg/controller/operator/master/resources/kubermatic/ui.go
Auto-merging pkg/controller/operator/master/resources/kubermatic/master-controller-manager.go
Auto-merging pkg/controller/operator/master/resources/kubermatic/api.go
CONFLICT (modify/delete): pkg/controller/operator/common/webhook.go deleted in HEAD and modified in Use seed config proxy for seed-cm (#11561). Version Use seed config proxy for seed-cm (#11561) of pkg/controller/operator/common/webhook.go left in tree.
Auto-merging pkg/controller/operator/common/util.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use seed config proxy for seed-cm (#11561)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release/v2.20

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.

mate4st added a commit to mate4st/kubermatic that referenced this pull request Jan 5, 2023
…ubermatic#11596)

* Use seed config proxy for seed-cm (kubermatic#11561)

* Use seed config proxy for seed-cm

* harmonize proxy env helper functions

* gimps

* readd null check

* fix default package
mate4st added a commit to mate4st/kubermatic that referenced this pull request Jan 9, 2023
…ubermatic#11596)

* Use seed config proxy for seed-cm (kubermatic#11561)

* Use seed config proxy for seed-cm

* harmonize proxy env helper functions

* gimps

* readd null check

* fix default package
kubermatic-bot pushed a commit that referenced this pull request Jan 9, 2023
…11631)

* Use seed config proxy for seed-cm (#11561)

* Use seed config proxy for seed-cm

* harmonize proxy env helper functions

* gimps

* readd null check

* fix default package
mate4st added a commit to mate4st/kubermatic that referenced this pull request Jan 11, 2023
…ubermatic#11596) (kubermatic#11631)

* Use seed config proxy for seed-cm (kubermatic#11561)

* Use seed config proxy for seed-cm

* harmonize proxy env helper functions

* gimps

* readd null check

* fix default package
mate4st added a commit to mate4st/kubermatic that referenced this pull request Jan 11, 2023
…ubermatic#11596) (kubermatic#11631)

* Use seed config proxy for seed-cm (kubermatic#11561)

* Use seed config proxy for seed-cm

* harmonize proxy env helper functions

* gimps

* readd null check

* fix default package
kubermatic-bot pushed a commit that referenced this pull request Jan 16, 2023
…11631) (#11669)

* Use seed config proxy for seed-cm (#11561)

* Use seed config proxy for seed-cm

* harmonize proxy env helper functions

* gimps

* readd null check

* fix default package
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. cherry-pick-approved Indicates a PR has been approved by release managers. 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. 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/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. 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.

None yet

4 participants