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 admission control configuration for the user cluster API deployment #6308

Merged
merged 1 commit into from
Dec 17, 2020
Merged

add admission control configuration for the user cluster API deployment #6308

merged 1 commit into from
Dec 17, 2020

Conversation

zreigz
Copy link
Contributor

@zreigz zreigz commented Dec 15, 2020

What this PR does / why we need it: add admission control configuration for the user cluster API deployment

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #6307

add admission control configuration for the user cluster API deployment

@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 15, 2020
@zreigz zreigz force-pushed the add-admission-control-configuration branch from e03758b to b38f9bf Compare December 15, 2020 13:42
@zreigz zreigz force-pushed the add-admission-control-configuration branch from b38f9bf to d618086 Compare December 15, 2020 14:18
@zreigz zreigz requested a review from lsviben December 15, 2020 15:33
@lsviben
Copy link
Contributor

lsviben commented Dec 16, 2020

I checked the API changes LGTM

/lgtm

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Dec 16, 2020
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 32041b075c04ccfe108130aae7a5cc74051b846f

@moelsayed
Copy link
Contributor

/lgtm
/approve

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: moelsayed, zreigz

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 Dec 17, 2020
@zreigz
Copy link
Contributor Author

zreigz commented Dec 17, 2020

/retest

1 similar comment
@zreigz
Copy link
Contributor Author

zreigz commented Dec 17, 2020

/retest

@kubermatic-bot kubermatic-bot merged commit c3f9233 into kubermatic:master Dec 17, 2020
@zreigz
Copy link
Contributor Author

zreigz commented Jan 15, 2021

/cherrypick release/v2.14

@zreigz
Copy link
Contributor Author

zreigz commented Jan 15, 2021

/cherrypick release/v2.15

@kubermatic-bot
Copy link
Contributor

@zreigz: #6308 failed to apply on top of branch "release/v2.14":

Applying: add admission control configuration for the user cluster API deployment
Using index info to reconstruct a base tree...
A	cmd/image-loader/main.go
A	cmd/kubermatic-api/swagger.json
A	pkg/api/v1/types.go
A	pkg/controller/seed-controller-manager/kubernetes/resources.go
A	pkg/resources/apiserver/deployment.go
A	pkg/resources/cluster/cluster.go
A	pkg/resources/resources.go
A	pkg/resources/test/fixtures/deployment-aws-1.17.0-apiserver.yaml
A	pkg/resources/test/fixtures/deployment-aws-1.18.0-apiserver.yaml
A	pkg/resources/test/fixtures/deployment-aws-1.19.0-apiserver.yaml
A	pkg/resources/test/fixtures/deployment-azure-1.17.0-apiserver.yaml
A	pkg/resources/test/fixtures/deployment-azure-1.18.0-apiserver.yaml
A	pkg/resources/test/fixtures/deployment-azure-1.19.0-apiserver.yaml
A	pkg/resources/test/fixtures/deployment-bringyourown-1.17.0-apiserver.yaml
A	pkg/resources/test/fixtures/deployment-bringyourown-1.18.0-apiserver.yaml
A	pkg/resources/test/fixtures/deployment-bringyourown-1.19.0-apiserver.yaml
A	pkg/resources/test/fixtures/deployment-digitalocean-1.17.0-apiserver.yaml
A	pkg/resources/test/fixtures/deployment-digitalocean-1.18.0-apiserver.yaml
A	pkg/resources/test/fixtures/deployment-digitalocean-1.19.0-apiserver.yaml
A	pkg/resources/test/fixtures/deployment-openstack-1.17.0-apiserver.yaml
A	pkg/resources/test/fixtures/deployment-openstack-1.18.0-apiserver.yaml
A	pkg/resources/test/fixtures/deployment-openstack-1.19.0-apiserver.yaml
A	pkg/resources/test/fixtures/deployment-vsphere-1.17.0-apiserver.yaml
A	pkg/resources/test/fixtures/deployment-vsphere-1.18.0-apiserver.yaml
A	pkg/resources/test/fixtures/deployment-vsphere-1.19.0-apiserver.yaml
A	pkg/resources/test/load_files_test.go
A	pkg/test/e2e/api/utils/apiclient/models/cluster_spec.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/resources/test/fixtures/deployment-digitalocean-1.19.0-apiserver.yaml deleted in HEAD and modified in add admission control configuration for the user cluster API deployment. Version add admission control configuration for the user cluster API deployment of pkg/resources/test/fixtures/deployment-digitalocean-1.19.0-apiserver.yaml left in tree.
Auto-merging api/pkg/test/e2e/api/utils/apiclient/models/cluster_spec.go
Auto-merging api/pkg/resources/test/load_files_test.go
Auto-merging api/pkg/resources/test/fixtures/deployment-vsphere-1.18.0-apiserver.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-vsphere-1.18.0-apiserver.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-vsphere-1.17.0-apiserver.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-vsphere-1.17.0-apiserver.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-vsphere-1.15.0-apiserver.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-vsphere-1.15.0-apiserver.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-openstack-1.18.0-apiserver.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-openstack-1.18.0-apiserver.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-openstack-1.17.0-apiserver.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-openstack-1.17.0-apiserver.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-openstack-1.15.0-apiserver.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-openstack-1.15.0-apiserver.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-digitalocean-1.18.0-apiserver.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-digitalocean-1.18.0-apiserver.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-digitalocean-1.17.0-apiserver.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-digitalocean-1.17.0-apiserver.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-bringyourown-1.18.0-apiserver.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-bringyourown-1.18.0-apiserver.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-bringyourown-1.17.0-apiserver.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-bringyourown-1.17.0-apiserver.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-bringyourown-1.15.0-apiserver.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-bringyourown-1.15.0-apiserver.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-azure-1.18.0-apiserver.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-azure-1.18.0-apiserver.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-azure-1.17.0-apiserver.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-azure-1.17.0-apiserver.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-azure-1.15.0-apiserver.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-azure-1.15.0-apiserver.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-aws-1.18.0-apiserver.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-aws-1.18.0-apiserver.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-aws-1.17.0-apiserver.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-aws-1.17.0-apiserver.yaml
Auto-merging api/pkg/resources/test/fixtures/deployment-aws-1.15.0-apiserver.yaml
CONFLICT (content): Merge conflict in api/pkg/resources/test/fixtures/deployment-aws-1.15.0-apiserver.yaml
Auto-merging api/pkg/resources/resources.go
Auto-merging api/pkg/resources/cluster/cluster.go
CONFLICT (content): Merge conflict in api/pkg/resources/cluster/cluster.go
Auto-merging api/pkg/resources/apiserver/deployment.go
CONFLICT (content): Merge conflict in api/pkg/resources/apiserver/deployment.go
Auto-merging api/pkg/controller/seed-controller-manager/kubernetes/resources.go
Auto-merging api/pkg/api/v1/types.go
Auto-merging api/cmd/kubermatic-api/swagger.json
Auto-merging api/cmd/image-loader/main.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 add admission control configuration for the user cluster API deployment
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.14

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.

@kubermatic-bot
Copy link
Contributor

@zreigz: #6308 failed to apply on top of branch "release/v2.15":

Applying: add admission control configuration for the user cluster API deployment
Using index info to reconstruct a base tree...
M	cmd/image-loader/main.go
M	cmd/kubermatic-api/swagger.json
M	pkg/api/v1/types.go
M	pkg/controller/seed-controller-manager/kubernetes/resources.go
M	pkg/resources/cluster/cluster.go
M	pkg/resources/resources.go
M	pkg/resources/test/fixtures/deployment-aws-1.17.0-apiserver.yaml
M	pkg/resources/test/fixtures/deployment-aws-1.18.0-apiserver.yaml
M	pkg/resources/test/fixtures/deployment-aws-1.19.0-apiserver.yaml
M	pkg/resources/test/fixtures/deployment-azure-1.17.0-apiserver.yaml
M	pkg/resources/test/fixtures/deployment-azure-1.18.0-apiserver.yaml
M	pkg/resources/test/fixtures/deployment-azure-1.19.0-apiserver.yaml
M	pkg/resources/test/fixtures/deployment-bringyourown-1.17.0-apiserver.yaml
M	pkg/resources/test/fixtures/deployment-bringyourown-1.18.0-apiserver.yaml
M	pkg/resources/test/fixtures/deployment-bringyourown-1.19.0-apiserver.yaml
M	pkg/resources/test/fixtures/deployment-digitalocean-1.17.0-apiserver.yaml
M	pkg/resources/test/fixtures/deployment-digitalocean-1.18.0-apiserver.yaml
M	pkg/resources/test/fixtures/deployment-digitalocean-1.19.0-apiserver.yaml
M	pkg/resources/test/fixtures/deployment-openstack-1.17.0-apiserver.yaml
M	pkg/resources/test/fixtures/deployment-openstack-1.18.0-apiserver.yaml
M	pkg/resources/test/fixtures/deployment-openstack-1.19.0-apiserver.yaml
M	pkg/resources/test/fixtures/deployment-vsphere-1.17.0-apiserver.yaml
M	pkg/resources/test/fixtures/deployment-vsphere-1.18.0-apiserver.yaml
M	pkg/resources/test/fixtures/deployment-vsphere-1.19.0-apiserver.yaml
M	pkg/resources/test/load_files_test.go
M	pkg/test/e2e/api/utils/apiclient/models/cluster_spec.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/test/e2e/api/utils/apiclient/models/cluster_spec.go
Auto-merging pkg/resources/test/load_files_test.go
Auto-merging pkg/resources/test/fixtures/deployment-vsphere-1.19.0-apiserver.yaml
Auto-merging pkg/resources/test/fixtures/deployment-vsphere-1.18.0-apiserver.yaml
Auto-merging pkg/resources/test/fixtures/deployment-vsphere-1.17.0-apiserver.yaml
Auto-merging pkg/resources/test/fixtures/deployment-openstack-1.19.0-apiserver.yaml
Auto-merging pkg/resources/test/fixtures/deployment-openstack-1.18.0-apiserver.yaml
Auto-merging pkg/resources/test/fixtures/deployment-openstack-1.17.0-apiserver.yaml
Auto-merging pkg/resources/test/fixtures/deployment-digitalocean-1.19.0-apiserver.yaml
Auto-merging pkg/resources/test/fixtures/deployment-digitalocean-1.18.0-apiserver.yaml
Auto-merging pkg/resources/test/fixtures/deployment-digitalocean-1.17.0-apiserver.yaml
Auto-merging pkg/resources/test/fixtures/deployment-bringyourown-1.19.0-apiserver.yaml
Auto-merging pkg/resources/test/fixtures/deployment-bringyourown-1.18.0-apiserver.yaml
Auto-merging pkg/resources/test/fixtures/deployment-bringyourown-1.17.0-apiserver.yaml
Auto-merging pkg/resources/test/fixtures/deployment-azure-1.19.0-apiserver.yaml
Auto-merging pkg/resources/test/fixtures/deployment-azure-1.18.0-apiserver.yaml
Auto-merging pkg/resources/test/fixtures/deployment-azure-1.17.0-apiserver.yaml
Auto-merging pkg/resources/test/fixtures/deployment-aws-1.19.0-apiserver.yaml
Auto-merging pkg/resources/test/fixtures/deployment-aws-1.18.0-apiserver.yaml
Auto-merging pkg/resources/test/fixtures/deployment-aws-1.17.0-apiserver.yaml
Auto-merging pkg/resources/resources.go
Auto-merging pkg/resources/cluster/cluster.go
CONFLICT (content): Merge conflict in pkg/resources/cluster/cluster.go
Auto-merging pkg/controller/seed-controller-manager/kubernetes/resources.go
Auto-merging pkg/api/v1/types.go
Auto-merging cmd/kubermatic-api/swagger.json
Auto-merging cmd/image-loader/main.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 add admission control configuration for the user cluster API deployment
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.15

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@moelsayed moelsayed Awaiting requested review from moelsayed

@lsviben lsviben Awaiting requested review from lsviben

Assignees

@moelsayed moelsayed

@lsviben lsviben

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. 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. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add support for --admission-control-config-file in the user cluster API server
4 participants
@zreigz @lsviben @kubermatic-bot @moelsayed