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

Update kube-router to 1.6 #16110

Merged
merged 3 commits into from
Nov 19, 2023
Merged

Update kube-router to 1.6 #16110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36ad005
Update kube-router to v1.6.0
aauren Nov 18, 2023
6903c6c
Remove deprecation of kube-router
aauren Nov 18, 2023
f31ca6f
Remove deprecation of kube-router from release notes
aauren Nov 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions docs/networking/kube-router.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Kube-router

⚠ The Kube-router CNI is not supported for Kubernetes 1.28 or later.

[Kube-router](https://github.com/cloudnativelabs/kube-router) is project that provides one cohesive solution that provides CNI networking for pods, an IPVS based network service proxy and iptables based network policy enforcement.

Kube-router also provides a service proxy, so kube-proxy will not be deployed in to the cluster.
Expand Down
2 changes: 1 addition & 1 deletion docs/releases/1.27-NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ they would do so when the respective `topology` was set to `public`.

* Support for Ubuntu 18.04 is deprecated and will be removed in kOps 1.28.

* Canal, Flannel, and Kube-Router are deprecated and support will be removed for Kubernetes 1.28 and later.
* Canal, and Flannel are deprecated and support will be removed for Kubernetes 1.28 and later.

* Support for AWS Classic Load Balancer for API is deprecated and should not be used for newly created clusters.

Expand Down
2 changes: 1 addition & 1 deletion docs/releases/1.28-NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

* Support for Ubuntu 18.04 is has been removed.

* Support for Canal, Flannel, and Kube-Router has been removed for Kubernetes 1.28 and later.
* Support for Canal and Flannel have been removed for Kubernetes 1.28 and later.

* RHEL-based distros will no longer have `wget`, `curl`, `python2`, and `git` packages installed. Install them with [hooks](/cluster_spec/#hooks) if needed.

Expand Down
4 changes: 1 addition & 3 deletions pkg/apis/kops/validation/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,9 +1147,7 @@ func validateNetworking(cluster *kops.Cluster, v *kops.NetworkingSpec, fldPath *
}
optionTaken = true

if cluster.IsKubernetesGTE("1.28") {
allErrs = append(allErrs, field.Forbidden(fldPath.Child("kubeRouter"), "kube-router is not supported for Kubernetes >= 1.28"))
} else if cluster.Spec.IsIPv6Only() {
if cluster.Spec.IsIPv6Only() {
allErrs = append(allErrs, field.Forbidden(fldPath.Child("kubeRouter"), "kube-router does not support IPv6"))
}
}
Expand Down
6 changes: 3 additions & 3 deletions upup/models/cloudup/resources/addons/networking.kuberouter/k8s-1.12.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Pulled and modified from https://raw.githubusercontent.com/cloudnativelabs/kube-router/v1.5.3/daemonset/kubeadm-kuberouter.yaml
# Pulled and modified from https://raw.githubusercontent.com/cloudnativelabs/kube-router/v1.6.0/daemonset/kubeadm-kuberouter.yaml

apiVersion: v1
kind: ConfigMap
Expand Down Expand Up @@ -62,7 +62,7 @@ spec:
serviceAccountName: kube-router
containers:
- name: kube-router
image: docker.io/cloudnativelabs/kube-router:v1.5.3
image: docker.io/cloudnativelabs/kube-router:v1.6.0
args:
- --run-router=true
- --run-firewall=true
Expand Down Expand Up @@ -103,7 +103,7 @@ spec:
readOnly: false
initContainers:
- name: install-cni
image: docker.io/cloudnativelabs/kube-router:v1.5.3
image: docker.io/cloudnativelabs/kube-router:v1.6.0
command:
- /bin/sh
- -c
Expand Down
Loading