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

Only manage internal DNS zone if configuration has been specified #5375

Merged
merged 6 commits into from
Jul 23, 2018
Merged

Only manage internal DNS zone if configuration has been specified #5375

merged 6 commits into from
Jul 23, 2018

Conversation

mellowplace
Copy link
Contributor

@mellowplace mellowplace commented Jun 22, 2018 •
edited
Loading

This change is Reviewable

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 22, 2018
@mellowplace mellowplace mentioned this pull request Jun 22, 2018
Closed
@mikesplain
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 22, 2018
@mellowplace
Copy link
Contributor Author

/assign @justinsb

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 2, 2018
justinsb
justinsb reviewed Jul 20, 2018
View reviewed changes
pkg/apis/kops/v1alpha1/zz_generated.conversion.go Outdated
@@ -2662,14 +2662,10 @@ func autoConvert_kops_LoadBalancerAccessSpec_To_v1alpha1_LoadBalancerAccessSpec(
out.Type = LoadBalancerType(in.Type)
out.IdleTimeoutSeconds = in.IdleTimeoutSeconds
out.AdditionalSecurityGroups = in.AdditionalSecurityGroups
// WARNING: in.UseApiInternal requires manual conversion: does not exist in peer-type
Copy link
Member

Choose a reason for hiding this comment

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

Ah - this means you need to add the new field to v1alpha1 also...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah ok, I wasn't sure if v1alpha1 was an API that should not change and what I was supposed to do was add the field only to v1alpha2 and have a conversion function. Will add it here as well.

justinsb
justinsb reviewed Jul 20, 2018
View reviewed changes
pkg/apis/kops/cluster.go Outdated
@@ -286,6 +286,7 @@ type LoadBalancerAccessSpec struct {
Type LoadBalancerType `json:"type,omitempty"`
IdleTimeoutSeconds *int64 `json:"idleTimeoutSeconds,omitempty"`
AdditionalSecurityGroups []string `json:"additionalSecurityGroups,omitempty"`
UseApiInternal bool `json:"useApiInternal,omitempty"`
Copy link
Member

Choose a reason for hiding this comment

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

Naming nit: it isn't very obvious (to me) what this does from the name. How about useForInternalApi or inClusterApi or useInsideCluster ?

(And we have to take another pass to add this to v1alpha1 anyway ... :-) )

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yep fair enough, I wasn't too keen on the name myself, I think useForInternalApi is clearer

@justinsb
Copy link
Member

One nit on the naming, but then I think we can get this in. Sorry it took so long for me to get to this one...

If we're quick we can get this into 1.10...

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 20, 2018
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 23, 2018
@justinsb
Copy link
Member

Thanks for the tweak @mellowplace

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 23, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb, mellowplace

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 23, 2018
@k8s-ci-robot k8s-ci-robot merged commit 99d6ef5 into kubernetes:master Jul 23, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinsb justinsb justinsb left review comments

Assignees

@justinsb justinsb

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mellowplace @mikesplain @justinsb @k8s-ci-robot