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

Support for disabling kubernetes-dashboard #9511

Merged
merged 6 commits into from Apr 7, 2022
Merged

Support for disabling kubernetes-dashboard #9511

merged 6 commits into from Apr 7, 2022

Conversation

ahmedwaleedmalik
Copy link
Member

Signed-off-by: Waleed Malik ahmedwaleedmalik@gmail.com

What does this PR do / Why do we need it:
Introduces a new field in cluster spec enableKubernetesDashboard which can be used to toggle kubernetes-dashboard. Since kubernetes-dashboard should be enabled by default this field has a default value of true.

Does this PR close any issues?:
Fixes #9510

Special notes for your reviewer:

Documentation:

Does this PR introduce a user-facing change?:

Support for disabling kubernetes-dashboard

@ahmedwaleedmalik ahmedwaleedmalik self-assigned this Apr 1, 2022
@kubermatic-bot kubermatic-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. 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. sig/api Denotes a PR or issue as being assigned to SIG API. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 1, 2022
@kubermatic kubermatic deleted a comment from kubermatic-bot Apr 1, 2022
@ahmedwaleedmalik
Support for disabling kubernetes-dashboard
562c244 
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
xrstf
xrstf reviewed Apr 1, 2022
View reviewed changes
Copy link
Contributor

@xrstf xrstf left a comment

Choose a reason for hiding this comment

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

C

pkg/controller/user-cluster-controller-manager/resources/controller.go Outdated Show resolved Hide resolved
@ahmedwaleedmalik ahmedwaleedmalik changed the title WIP: Support for disabling kubernetes-dashboard Support for disabling kubernetes-dashboard Apr 4, 2022
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 4, 2022
@ahmedwaleedmalik
Update test data
5cd3c51 
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
@ahmedwaleedmalik
Copy link
Member Author

/retest

@kubermatic-bot kubermatic-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 4, 2022
xrstf
xrstf reviewed Apr 4, 2022
View reviewed changes
Copy link
Contributor

@xrstf xrstf left a comment

Choose a reason for hiding this comment

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

Comment

charts/kubermatic-operator/crd/k8c.io/kubermatic.k8c.io_clusters.yaml Outdated Show resolved Hide resolved
@ahmedwaleedmalik
Refacatored code
4dee308 
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
@kubermatic-bot kubermatic-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Apr 5, 2022
@ahmedwaleedmalik
Merge master and resolve conflicts
c1ad0e5 
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
@ahmedwaleedmalik
Copy link
Member Author

/hold

@kubermatic-bot kubermatic-bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 5, 2022
@ahmedwaleedmalik
Copy link
Member Author

/unhold

@kubermatic-bot kubermatic-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 5, 2022
@ahmedwaleedmalik
Refactored tests
1740cd3 
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
@ahmedwaleedmalik
Refactored code
b984e12 
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
@ahmedwaleedmalik
Copy link
Member Author

/retest

@ahmedwaleedmalik ahmedwaleedmalik mentioned this pull request Apr 5, 2022
Closed
@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Apr 6, 2022
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: bff71497b1adaaff761d22ce0c7a21c57a88603a

@ahmedwaleedmalik
Copy link
Member Author

@floreks missing approval 🤔

@maciaszczykm
Copy link
Contributor

/approve

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahmedwaleedmalik, maciaszczykm

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 Apr 7, 2022
@ahmedwaleedmalik
Copy link
Member Author

/retest

@kubermatic kubermatic deleted a comment from kubermatic-bot Apr 7, 2022
@ahmedwaleedmalik
Copy link
Member Author

/test all

@kubermatic-bot kubermatic-bot merged commit 09bf469 into kubermatic:master Apr 7, 2022
@ahmedwaleedmalik ahmedwaleedmalik deleted the kubernetes-dashboard branch April 14, 2022 08:41
@ahmedwaleedmalik
Copy link
Member Author

/cherry-pick release/v2.20

@kubermatic-bot
Copy link
Contributor

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

Applying: Support for disabling kubernetes-dashboard
Using index info to reconstruct a base tree...
M	charts/kubermatic-operator/crd/k8c.io/kubermatic.k8c.io_clusters.yaml
M	charts/kubermatic-operator/crd/k8c.io/kubermatic.k8c.io_clustertemplates.yaml
M	cmd/kubermatic-api/swagger.json
M	cmd/user-cluster-controller-manager/main.go
M	pkg/api/v1/types.go
M	pkg/apis/kubermatic/v1/cluster.go
M	pkg/controller/seed-controller-manager/kubernetes/resources.go
M	pkg/controller/user-cluster-controller-manager/resources/controller.go
M	pkg/controller/user-cluster-controller-manager/resources/reconciler.go
M	pkg/handler/common/cluster.go
M	pkg/handler/v2/cluster_template/cluster_template.go
M	pkg/resources/cluster/cluster.go
M	pkg/resources/usercluster/deployment.go
M	pkg/test/e2e/utils/apiclient/models/cluster_spec.go
A	pkg/validation/openapi/crd/k8c.io/kubermatic.k8c.io_clusters.yaml
A	pkg/validation/openapi/crd/k8c.io/kubermatic.k8c.io_clustertemplates.yaml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/validation/openapi/crd/k8c.io/kubermatic.k8c.io_clustertemplates.yaml deleted in HEAD and modified in Support for disabling kubernetes-dashboard. Version Support for disabling kubernetes-dashboard of pkg/validation/openapi/crd/k8c.io/kubermatic.k8c.io_clustertemplates.yaml left in tree.
CONFLICT (modify/delete): pkg/validation/openapi/crd/k8c.io/kubermatic.k8c.io_clusters.yaml deleted in HEAD and modified in Support for disabling kubernetes-dashboard. Version Support for disabling kubernetes-dashboard of pkg/validation/openapi/crd/k8c.io/kubermatic.k8c.io_clusters.yaml left in tree.
Auto-merging pkg/test/e2e/utils/apiclient/models/cluster_spec.go
Auto-merging pkg/resources/usercluster/deployment.go
Auto-merging pkg/resources/cluster/cluster.go
Auto-merging pkg/handler/v2/cluster_template/cluster_template.go
CONFLICT (content): Merge conflict in pkg/handler/v2/cluster_template/cluster_template.go
Auto-merging pkg/handler/common/cluster.go
Auto-merging pkg/controller/user-cluster-controller-manager/resources/reconciler.go
CONFLICT (content): Merge conflict in pkg/controller/user-cluster-controller-manager/resources/reconciler.go
Auto-merging pkg/controller/user-cluster-controller-manager/resources/controller.go
Auto-merging pkg/controller/seed-controller-manager/kubernetes/resources.go
CONFLICT (content): Merge conflict in pkg/controller/seed-controller-manager/kubernetes/resources.go
Auto-merging pkg/apis/kubermatic/v1/cluster.go
Auto-merging pkg/api/v1/types.go
Auto-merging cmd/user-cluster-controller-manager/main.go
Auto-merging cmd/kubermatic-api/swagger.json
Auto-merging charts/kubermatic-operator/crd/k8c.io/kubermatic.k8c.io_clustertemplates.yaml
Auto-merging charts/kubermatic-operator/crd/k8c.io/kubermatic.k8c.io_clusters.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Support for disabling kubernetes-dashboard
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:

/cherry-pick 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.

@ahmedwaleedmalik ahmedwaleedmalik mentioned this pull request Jun 24, 2022
Merged
@ahmedwaleedmalik ahmedwaleedmalik mentioned this pull request Aug 1, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@floreks floreks floreks left review comments

@xrstf xrstf Awaiting requested review from xrstf

Assignees

@floreks floreks

@maciaszczykm maciaszczykm

@ahmedwaleedmalik ahmedwaleedmalik

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. sig/api Denotes a PR or issue as being assigned to SIG API. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. 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.

Support for disabling kubernetes-dashboard
5 participants
@ahmedwaleedmalik @kubermatic-bot @maciaszczykm @xrstf @floreks