docs: remove warning about aws vpc cni not being compatible with Ubun…

…tu 22.04, following #16313
kubernetes · Feb 5, 2024 · 1b5e6dd · 1b5e6dd
1 parent 0fca3f3
commit 1b5e6dd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/docs/networking/aws-vpc.md b/docs/networking/aws-vpc.md
@@ -2,8 +2,6 @@
 
 The Amazon VPC CNI uses the native AWS networking for Pods. Every pod gets an Elastic Network Interface (ENI) on the node it is running and an IP address belonging to the subnets assigned to the node.
 
-**WARNING**: The Amazon VPC CNI is not compatible with Ubuntu 22.04. See [kubernetes/kops#15720](https://github.com/kubernetes/kops/issues/15720) and [aws/amazon-vpc-cni-k8s#2103](https://github.com/aws/amazon-vpc-cni-k8s/issues/2103) for more info.
-
 ## Installing
 
 To use Amazon VPC, specify the following in the cluster spec:
@@ -26,7 +24,6 @@ kops create cluster \
 
 **Important:** pods use the VPC CIDR, i.e. there is no isolation between the master, node/s and the internal k8s network. In addition, this CNI does not enforce network policies.
 
-
 ## Configuration
 
 [Configuration options for the Amazon VPC CNI plugin](https://github.com/aws/amazon-vpc-cni-k8s/tree/master#cni-configuration-variables) can be set through env vars defined in the cluster spec:
@@ -43,4 +40,4 @@ kops create cluster \
 
 ## Troubleshooting
 
-In case of any issues the directory `/var/log/aws-routed-eni` contains the log files of the CNI plugin. This directory is located in all the nodes in the cluster.
+In case of any issues the directory `/var/log/aws-routed-eni` contains the log files of the CNI plugin. This directory is located in all the nodes in the cluster.
diff --git a/docs/operations/images.md b/docs/operations/images.md
@@ -5,6 +5,7 @@ As of Kubernetes 1.27 the default images used by kOps are the **[official Ubuntu
 You can choose a different image for an instance group by editing it with `kops edit ig nodes`.
 
 For AWS, you should set the `image` field in one of the following formats:
+
 * `ami-abcdef` - specifies an image by id directly (image id is precise, but ids vary by region)
 * `<owner>/<name>` specifies an image by its owner's account ID  and name properties
 * `<alias>/<name>` specifies an image by its [owner's alias](#owner-aliases) and name properties
@@ -224,8 +225,6 @@ az vm image list --all --output table \
 
 Ubuntu 22.04 is based on Kernel version **5.15** which fixes all the known major Kernel bugs.
 
-**WARNING**: The Amazon VPC CNI is not compatible with Ubuntu 22.04. See [kubernetes/kops#15720](https://github.com/kubernetes/kops/issues/15720) and [aws/amazon-vpc-cni-k8s#2103](https://github.com/aws/amazon-vpc-cni-k8s/issues/2103) for more info.
-
 Available images can be listed using:
 
 ```bash

diff --git a/docs/releases/1.29-NOTES.md b/docs/releases/1.29-NOTES.md
@@ -43,13 +43,11 @@ instances.
 ## Other breaking changes
 
 * `kops toolbox dump` limits the number of nodes dumped to 500 by default. Use `--max-nodes` to override.
- 
+
 * Support for Kubernetes version 1.23 has been removed.
 
 # Known Issues
 
-* The Amazon VPC CNI is not compatible with Ubuntu 22.04. See [kubernetes/kops#15720](https://github.com/kubernetes/kops/issues/15720) and [aws/amazon-vpc-cni-k8s#2103](https://github.com/aws/amazon-vpc-cni-k8s/issues/2103) for more info.
-
 # Deprecations
 
 * Support for Kubernetes version 1.24 is deprecated and will be removed in kOps 1.30.