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

Networking cleanup #9157

Merged
merged 11 commits into from
May 24, 2020
Merged

Networking cleanup #9157

merged 11 commits into from
May 24, 2020

Conversation

olemarkus
Copy link
Member

No description provided.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 21, 2020
@olemarkus
Copy link
Member Author

/retest

johngmyers
johngmyers reviewed May 21, 2020
View reviewed changes
pkg/apis/kops/networking.go Outdated
@@ -37,22 +37,22 @@ type NetworkingSpec struct {
GCE *GCENetworkingSpec `json:"gce,omitempty"`
}

// ClassicNetworkingSpec is the specification of classic networking mode, integrated into kubernetes
// ClassicNetworkingSpec is the specification of classic networking mode, integrated into kubernetes.
// Support been removed since kops 1.4.
Copy link
Member

Choose a reason for hiding this comment

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

No, it was Kubernetes 1.4. I don't think this information is relevant.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks. There are quite a few issues about when features are added/removed from kops. And given that we refer users to the spec docs, I think this is relevant to many. At least it doesn't hurt.

Copy link
Member

Choose a reason for hiding this comment

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

Resolved

johngmyers
johngmyers reviewed May 21, 2020
View reviewed changes
pkg/apis/kops/networking.go Outdated
// ExternalNetworkingSpec is the specification for networking that is implemented by a Daemonset
// It also uses kubenet
// ExternalNetworkingSpec is the specification for networking that is implemented by a Daemonset.
// Uses the kubenet networking provider.
Copy link
Member

Choose a reason for hiding this comment

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

I think "networking provider" is misleading as it doesn't use the kops Kubenet provider. It uses the Kubernetes kubenet networking code.

Copy link
Member Author

Choose a reason for hiding this comment

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

Amended.

Copy link
Member

Choose a reason for hiding this comment

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

Resolved

johngmyers
johngmyers reviewed May 22, 2020
View reviewed changes
Copy link
Member

@johngmyers johngmyers left a comment

Choose a reason for hiding this comment

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

I don't think any of these are blockers. I'd like to get responses before signing off.

cmd/kops/create_cluster.go Outdated
return true
}
return false
return n.Kubenet == nil
Copy link
Member

Choose a reason for hiding this comment

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

This previously returned false for External. Now it returns true.

Copy link
Member Author

Choose a reason for hiding this comment

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

I think true is more correct. Given that both GCP and Kopeio supports private topology, it is up to the user to configure things correctly if they choose to use external.

cmd/kops/create_cluster.go Show resolved Hide resolved
docs/cli/kops_create_cluster.md Outdated Show resolved Hide resolved
pkg/apis/kops/networking.go Outdated Show resolved Hide resolved
Ole Markus With and others added 8 commits May 22, 2020 08:08
Update networking in kops create
95d2170 
* Remove classic from cli docs. Add missing providers
* Use cilium instead of weave in example since we don't consider weave stable
Remove some rather long networking nil checks
d1ff25b
Remove as much of the classic networking logic as we can
eebb605
@olemarkus @rifelpet
Update pkg/apis/kops/v1alpha2/networking.go
30a2ec7 
Co-authored-by: Peter Rifel <rifelpet@users.noreply.github.com>
Copy comments
77aab65
Small comment adjustments
82c4670
Inline supportsPrivateTopology
e3055a6
Docs fixes
6e04586
johngmyers
johngmyers requested changes May 23, 2020
View reviewed changes
pkg/apis/kops/networking.go Outdated Show resolved Hide resolved
@olemarkus @johngmyers
Update pkg/apis/kops/networking.go
1698069 
Co-authored-by: John Gardiner Myers <jgmyers@proofpoint.com>
@johngmyers
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 23, 2020
@rifelpet
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: olemarkus, rifelpet

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 May 24, 2020
@k8s-ci-robot k8s-ci-robot merged commit bfd65ae into kubernetes:master May 24, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone May 24, 2020
@olemarkus olemarkus deleted the networking-cleanup branch June 3, 2020 16:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rifelpet rifelpet rifelpet left review comments

@johngmyers johngmyers johngmyers requested changes

@joshbranham joshbranham Awaiting requested review from joshbranham

@robinpercy robinpercy Awaiting requested review from robinpercy

Assignees

@johngmyers johngmyers

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/api area/documentation area/nodeup 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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.18
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@olemarkus @johngmyers @rifelpet @k8s-ci-robot