Increase the minimum supported Kubernetes version to v1.19

Since Kubernetes v1.19, some APIs are deprecated. Add deprecated comment to those APIs and update documents. Reference: https://kubernetes.io/docs/reference/using-api/deprecation-guide/ Signed-off-by: hjiajing <hjiajing@vmware.com>
antrea-io · Apr 18, 2024 · 06ca2d0 · 06ca2d0
1 parent 4bc74d2
commit 06ca2d0
Show file tree

Hide file tree

Showing 14 changed files with 86 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Network Policies in a very efficient manner.
 
 ## Prerequisites
 
-Antrea has been tested with Kubernetes clusters running version 1.16 or later.
+Antrea has been tested with Kubernetes clusters running version 1.19 or later.
 
 * `NodeIPAMController` must be enabled in the Kubernetes cluster.\
   When deploying a cluster with kubeadm the `--pod-network-cidr <cidr>`

diff --git a/build/charts/antrea/crds/clustergroup.yaml b/build/charts/antrea/crds/clustergroup.yaml
@@ -10,6 +10,8 @@ spec:
     - name: v1alpha3
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha3 ClusterGroup is deprecated; use crd.antrea.io/v1beta1 ClusterGroup"
       schema:
         openAPIV3Schema:
           type: object

diff --git a/build/charts/antrea/crds/clusternetworkpolicy.yaml b/build/charts/antrea/crds/clusternetworkpolicy.yaml
@@ -10,6 +10,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 ClusterNetworkPolicy is deprecated; use crd.antrea.io/v1beta1 ClusterNetworkPolicy"
       additionalPrinterColumns:
         - name: Tier
           type: string

diff --git a/build/charts/antrea/crds/externalippool.yaml b/build/charts/antrea/crds/externalippool.yaml
@@ -10,6 +10,8 @@ spec:
     - name: v1alpha2
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha2 ExternalIPPool is deprecated; use crd.antrea.io/v1beta1 ExternalIPPool"
       schema:
         openAPIV3Schema:
           type: object

diff --git a/build/charts/antrea/crds/group.yaml b/build/charts/antrea/crds/group.yaml
@@ -8,6 +8,8 @@ spec:
     - name: v1alpha3
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha3 Group is deprecated; use crd.antrea.io/v1beta1 Group"
       schema:
         openAPIV3Schema:
           type: object

diff --git a/build/charts/antrea/crds/networkpolicy.yaml b/build/charts/antrea/crds/networkpolicy.yaml
@@ -10,6 +10,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 NetworkPolicy is deprecated; use crd.antrea.io/v1beta1 NetworkPolicy"
       additionalPrinterColumns:
         - name: Tier
           type: string

diff --git a/build/charts/antrea/crds/traceflow.yaml b/build/charts/antrea/crds/traceflow.yaml
@@ -10,6 +10,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 Traceflow is deprecated; use crd.antrea.io/v1beta1 Traceflow"
       additionalPrinterColumns:
         - jsonPath: .status.phase
           description: The phase of the Traceflow.

diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml
@@ -314,6 +314,8 @@ spec:
     - name: v1alpha3
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha3 ClusterGroup is deprecated; use crd.antrea.io/v1beta1 ClusterGroup"
       schema:
         openAPIV3Schema:
           type: object
@@ -576,6 +578,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 ClusterNetworkPolicy is deprecated; use crd.antrea.io/v1beta1 ClusterNetworkPolicy"
       additionalPrinterColumns:
         - name: Tier
           type: string
@@ -2406,6 +2410,8 @@ spec:
     - name: v1alpha2
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha2 ExternalIPPool is deprecated; use crd.antrea.io/v1beta1 ExternalIPPool"
       schema:
         openAPIV3Schema:
           type: object
@@ -2671,6 +2677,8 @@ spec:
     - name: v1alpha3
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha3 Group is deprecated; use crd.antrea.io/v1beta1 Group"
       schema:
         openAPIV3Schema:
           type: object
@@ -3052,6 +3060,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 NetworkPolicy is deprecated; use crd.antrea.io/v1beta1 NetworkPolicy"
       additionalPrinterColumns:
         - name: Tier
           type: string
@@ -4515,6 +4525,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 Traceflow is deprecated; use crd.antrea.io/v1beta1 Traceflow"
       additionalPrinterColumns:
         - jsonPath: .status.phase
           description: The phase of the Traceflow.

diff --git a/build/yamls/antrea-crds.yml b/build/yamls/antrea-crds.yml
@@ -309,6 +309,8 @@ spec:
     - name: v1alpha3
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha3 ClusterGroup is deprecated; use crd.antrea.io/v1beta1 ClusterGroup"
       schema:
         openAPIV3Schema:
           type: object
@@ -569,6 +571,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 ClusterNetworkPolicy is deprecated; use crd.antrea.io/v1beta1 ClusterNetworkPolicy"
       additionalPrinterColumns:
         - name: Tier
           type: string
@@ -2393,6 +2397,8 @@ spec:
     - name: v1alpha2
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha2 ExternalIPPool is deprecated; use crd.antrea.io/v1beta1 ExternalIPPool"
       schema:
         openAPIV3Schema:
           type: object
@@ -2654,6 +2660,8 @@ spec:
     - name: v1alpha3
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha3 Group is deprecated; use crd.antrea.io/v1beta1 Group"
       schema:
         openAPIV3Schema:
           type: object
@@ -3031,6 +3039,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 NetworkPolicy is deprecated; use crd.antrea.io/v1beta1 NetworkPolicy"
       additionalPrinterColumns:
         - name: Tier
           type: string
@@ -4488,6 +4498,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 Traceflow is deprecated; use crd.antrea.io/v1beta1 Traceflow"
       additionalPrinterColumns:
         - jsonPath: .status.phase
           description: The phase of the Traceflow.

diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml
@@ -314,6 +314,8 @@ spec:
     - name: v1alpha3
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha3 ClusterGroup is deprecated; use crd.antrea.io/v1beta1 ClusterGroup"
       schema:
         openAPIV3Schema:
           type: object
@@ -576,6 +578,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 ClusterNetworkPolicy is deprecated; use crd.antrea.io/v1beta1 ClusterNetworkPolicy"
       additionalPrinterColumns:
         - name: Tier
           type: string
@@ -2406,6 +2410,8 @@ spec:
     - name: v1alpha2
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha2 ExternalIPPool is deprecated; use crd.antrea.io/v1beta1 ExternalIPPool"
       schema:
         openAPIV3Schema:
           type: object
@@ -2671,6 +2677,8 @@ spec:
     - name: v1alpha3
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha3 Group is deprecated; use crd.antrea.io/v1beta1 Group"
       schema:
         openAPIV3Schema:
           type: object
@@ -3052,6 +3060,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 NetworkPolicy is deprecated; use crd.antrea.io/v1beta1 NetworkPolicy"
       additionalPrinterColumns:
         - name: Tier
           type: string
@@ -4515,6 +4525,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 Traceflow is deprecated; use crd.antrea.io/v1beta1 Traceflow"
       additionalPrinterColumns:
         - jsonPath: .status.phase
           description: The phase of the Traceflow.

diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml
@@ -314,6 +314,8 @@ spec:
     - name: v1alpha3
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha3 ClusterGroup is deprecated; use crd.antrea.io/v1beta1 ClusterGroup"
       schema:
         openAPIV3Schema:
           type: object
@@ -576,6 +578,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 ClusterNetworkPolicy is deprecated; use crd.antrea.io/v1beta1 ClusterNetworkPolicy"
       additionalPrinterColumns:
         - name: Tier
           type: string
@@ -2406,6 +2410,8 @@ spec:
     - name: v1alpha2
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha2 ExternalIPPool is deprecated; use crd.antrea.io/v1beta1 ExternalIPPool"
       schema:
         openAPIV3Schema:
           type: object
@@ -2671,6 +2677,8 @@ spec:
     - name: v1alpha3
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha3 Group is deprecated; use crd.antrea.io/v1beta1 Group"
       schema:
         openAPIV3Schema:
           type: object
@@ -3052,6 +3060,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 NetworkPolicy is deprecated; use crd.antrea.io/v1beta1 NetworkPolicy"
       additionalPrinterColumns:
         - name: Tier
           type: string
@@ -4515,6 +4525,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 Traceflow is deprecated; use crd.antrea.io/v1beta1 Traceflow"
       additionalPrinterColumns:
         - jsonPath: .status.phase
           description: The phase of the Traceflow.

diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml
@@ -314,6 +314,8 @@ spec:
     - name: v1alpha3
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha3 ClusterGroup is deprecated; use crd.antrea.io/v1beta1 ClusterGroup"
       schema:
         openAPIV3Schema:
           type: object
@@ -576,6 +578,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 ClusterNetworkPolicy is deprecated; use crd.antrea.io/v1beta1 ClusterNetworkPolicy"
       additionalPrinterColumns:
         - name: Tier
           type: string
@@ -2406,6 +2410,8 @@ spec:
     - name: v1alpha2
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha2 ExternalIPPool is deprecated; use crd.antrea.io/v1beta1 ExternalIPPool"
       schema:
         openAPIV3Schema:
           type: object
@@ -2671,6 +2677,8 @@ spec:
     - name: v1alpha3
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha3 Group is deprecated; use crd.antrea.io/v1beta1 Group"
       schema:
         openAPIV3Schema:
           type: object
@@ -3052,6 +3060,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 NetworkPolicy is deprecated; use crd.antrea.io/v1beta1 NetworkPolicy"
       additionalPrinterColumns:
         - name: Tier
           type: string
@@ -4515,6 +4525,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 Traceflow is deprecated; use crd.antrea.io/v1beta1 Traceflow"
       additionalPrinterColumns:
         - jsonPath: .status.phase
           description: The phase of the Traceflow.

diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml
@@ -314,6 +314,8 @@ spec:
     - name: v1alpha3
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha3 ClusterGroup is deprecated; use crd.antrea.io/v1beta1 ClusterGroup"
       schema:
         openAPIV3Schema:
           type: object
@@ -576,6 +578,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 ClusterNetworkPolicy is deprecated; use crd.antrea.io/v1beta1 ClusterNetworkPolicy"
       additionalPrinterColumns:
         - name: Tier
           type: string
@@ -2406,6 +2410,8 @@ spec:
     - name: v1alpha2
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha2 ExternalIPPool is deprecated; use crd.antrea.io/v1beta1 ExternalIPPool"
       schema:
         openAPIV3Schema:
           type: object
@@ -2671,6 +2677,8 @@ spec:
     - name: v1alpha3
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha3 Group is deprecated; use crd.antrea.io/v1beta1 Group"
       schema:
         openAPIV3Schema:
           type: object
@@ -3052,6 +3060,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 NetworkPolicy is deprecated; use crd.antrea.io/v1beta1 NetworkPolicy"
       additionalPrinterColumns:
         - name: Tier
           type: string
@@ -4515,6 +4525,8 @@ spec:
     - name: v1alpha1
       served: true
       storage: false
+      deprecated: true
+      deprecationWarning: "crd.antrea.io/v1alpha1 Traceflow is deprecated; use crd.antrea.io/v1beta1 Traceflow"
       additionalPrinterColumns:
         - jsonPath: .status.phase
           description: The phase of the Traceflow.

diff --git a/pkg/apiserver/handlers/webhook/convert_crd.go b/pkg/apiserver/handlers/webhook/convert_crd.go
@@ -45,6 +45,7 @@ func statusSucceed() metav1.Status {
 
 // doConversionV1beta1 converts the requested objects in the v1beta1 ConversionRequest using the given conversion function and
 // returns a conversion response. Failures are reported with the Reason in the conversion response.
+// Deprecated: apiextensions/v1beta1 is deprecated, use apiextensions/v1 instead
 func doConversionV1beta1(convertRequest *v1beta1.ConversionRequest, convert convertFunc) *v1beta1.ConversionResponse {
 	var convertedObjects []runtime.RawExtension
 	for _, obj := range convertRequest.Objects {