Skip to content
This repository was archived by the owner on Mar 6, 2024. It is now read-only.

Deprecate KindOverride fields and use internal api group. #531

Merged
merged 8 commits into from
Jul 31, 2020
Merged

Deprecate KindOverride fields and use internal api group. #531

merged 8 commits into from
Jul 31, 2020

Conversation

jiachengxu
Copy link
Contributor

@jiachengxu jiachengxu commented Jul 30, 2020 •
edited
Loading

What this PR does / why we need it:

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 #

Special notes for your reviewer:

Documentation:

Does this PR introduce a user-facing change?:

Deprecate KindOverride fields and use internal api group.

@kubermatic-bot kubermatic-bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. labels Jul 30, 2020
@kubermatic-bot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jiachengxu

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Jul 30, 2020
@jiachengxu jiachengxu marked this pull request as ready for review July 31, 2020 04:48
@kubermatic-bot kubermatic-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 31, 2020
@jiachengxu
Copy link
Contributor Author

/retest

2 similar comments
@jiachengxu
Copy link
Contributor Author

/retest

@jiachengxu
Copy link
Contributor Author

/retest

aborilov
aborilov reviewed Jul 31, 2020
View reviewed changes
Copy link
Contributor

@aborilov aborilov left a comment

Choose a reason for hiding this comment

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

looks good, I just think it's better to use constants in test

pkg/manager/internal/controllers/customresourcediscovery_controller_test.go Outdated
@@ -135,7 +135,7 @@ func TestCustomResourceDiscoveryReconciler(t *testing.T) {

internalCRD := &apiextensionsv1.CustomResourceDefinition{}
require.NoError(t, r.Client.Get(ctx, types.NamespacedName{
Name: strings.Join([]string{"redis", serviceClusterName, crDiscovery.Namespace}, "."),
Name: strings.Join([]string{"redis", "internal", serviceClusterName, crDiscovery.Namespace}, "."),
Copy link
Contributor

Choose a reason for hiding this comment

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

why not using constant here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed here.

test/integration/apiserver.go Outdated
@@ -380,14 +378,14 @@ func instanceService(ctx context.Context, conn *grpc.ClientConn, tenantAccount *
offering := &catalogv1alpha1.Offering{
ObjectMeta: metav1.ObjectMeta{
Namespace: tenantAccount.Status.Namespace.Name,
Name: strings.Join([]string{"dbs", serviceCluster.Name, providerAccount.Name}, "."),
Name: strings.Join([]string{"dbs", "external", serviceCluster.Name, providerAccount.Name}, "."),
Copy link
Contributor

Choose a reason for hiding this comment

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

same here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We cannot use constants pkg in test, since constants are under internal package.

Copy link
Contributor

Choose a reason for hiding this comment

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

that is sad

Copy link
Contributor Author

Choose a reason for hiding this comment

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

hmm, if needed, we can move the whole constants package out of internal, what do you think?

Copy link
Contributor

Choose a reason for hiding this comment

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

it's not a big deal, I'm ok to merge it as is, but yeah, I think constants should not be in the internals

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, let's do it in a dedicated PR and move the whole constants pkg out of internal

Copy link
Contributor

Choose a reason for hiding this comment

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

👍

@aborilov
Copy link
Contributor

/lgtm

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

LGTM label has been added.

Git tree hash: b14fdcff9d074537f6db0b2d9d8f126f8804d1d8

@jiachengxu
Copy link
Contributor Author

/hold

@kubermatic-bot kubermatic-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 31, 2020
@kubermatic-bot kubermatic-bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 31, 2020
@jiachengxu
Copy link
Contributor Author

/retest

@jiachengxu
Copy link
Contributor 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 Jul 31, 2020
@jiachengxu jiachengxu changed the title Deprecate KindOverride fields and use external/internal api groups. Deprecate KindOverride fields and use internal api group. Jul 31, 2020
@thetechnick
Copy link
Contributor

/lgtm

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

LGTM label has been added.

Git tree hash: 236dbc7b1dd4678585878a4685b53098e8c2f01c

@kubermatic-bot kubermatic-bot merged commit 39a3142 into master Jul 31, 2020
@kubermatic-bot kubermatic-bot deleted the kind-override branch July 31, 2020 13:05
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
1 more reviewer

@aborilov aborilov aborilov left review comments

Reviewers whose approvals may not affect merge requirements
Assignees

@aborilov aborilov

@thetechnick thetechnick

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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jiachengxu @kubermatic-bot @aborilov @thetechnick