Remove deprecated v1alpha1 CRDs for Antrea v2 release (#6162)

1. v1alpha1 Tier 2. v1alpha1 ClusterNetworkPolicy 3. v1alpha1 NetworkPolicy 4. v1alpha1 Traceflow Signed-off-by: Lan Luo <luola@vmware.com>
antrea-io · Apr 17, 2024 · d391c79 · d391c79
1 parent 178752a
commit d391c79
Show file tree

Hide file tree

Showing 34 changed files with 56 additions and 3,814 deletions.
diff --git a/build/charts/antrea/crds/tier.yaml b/build/charts/antrea/crds/tier.yaml
@@ -7,32 +7,6 @@ metadata:
 spec:
   group: crd.antrea.io
   versions:
-    - name: v1alpha1
-      served: true
-      storage: false
-      additionalPrinterColumns:
-        - name: Priority
-          type: integer
-          description: The Priority of this Tier relative to other Tiers.
-          jsonPath: .spec.priority
-        - name: Age
-          type: date
-          jsonPath: .metadata.creationTimestamp
-      schema:
-        openAPIV3Schema:
-          type: object
-          properties:
-            spec:
-              required:
-                - priority
-              type: object
-              properties:
-                priority:
-                  type: integer
-                  minimum: 0
-                  maximum: 255
-                description:
-                  type: string
     - name: v1beta1
       served: true
       storage: true

diff --git a/build/charts/antrea/templates/webhooks/validating/crdvalidator.yaml b/build/charts/antrea/templates/webhooks/validating/crdvalidator.yaml
@@ -15,7 +15,7 @@ webhooks:
     rules:
       - operations: ["CREATE", "UPDATE", "DELETE"]
         apiGroups: ["crd.antrea.io"]
-        apiVersions: ["v1alpha1", "v1beta1"]
+        apiVersions: ["v1beta1"]
         resources: ["tiers"]
         scope: "Cluster"
     admissionReviewVersions: ["v1", "v1beta1"]

diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml
@@ -4467,32 +4467,6 @@ metadata:
 spec:
   group: crd.antrea.io
   versions:
-    - name: v1alpha1
-      served: true
-      storage: false
-      additionalPrinterColumns:
-        - name: Priority
-          type: integer
-          description: The Priority of this Tier relative to other Tiers.
-          jsonPath: .spec.priority
-        - name: Age
-          type: date
-          jsonPath: .metadata.creationTimestamp
-      schema:
-        openAPIV3Schema:
-          type: object
-          properties:
-            spec:
-              required:
-                - priority
-              type: object
-              properties:
-                priority:
-                  type: integer
-                  minimum: 0
-                  maximum: 255
-                description:
-                  type: string
     - name: v1beta1
       served: true
       storage: true
@@ -7256,7 +7230,7 @@ webhooks:
     rules:
       - operations: ["CREATE", "UPDATE", "DELETE"]
         apiGroups: ["crd.antrea.io"]
-        apiVersions: ["v1alpha1", "v1beta1"]
+        apiVersions: ["v1beta1"]
         resources: ["tiers"]
         scope: "Cluster"
     admissionReviewVersions: ["v1", "v1beta1"]

diff --git a/build/yamls/antrea-crds.yml b/build/yamls/antrea-crds.yml
@@ -4442,32 +4442,6 @@ metadata:
 spec:
   group: crd.antrea.io
   versions:
-    - name: v1alpha1
-      served: true
-      storage: false
-      additionalPrinterColumns:
-        - name: Priority
-          type: integer
-          description: The Priority of this Tier relative to other Tiers.
-          jsonPath: .spec.priority
-        - name: Age
-          type: date
-          jsonPath: .metadata.creationTimestamp
-      schema:
-        openAPIV3Schema:
-          type: object
-          properties:
-            spec:
-              required:
-                - priority
-              type: object
-              properties:
-                priority:
-                  type: integer
-                  minimum: 0
-                  maximum: 255
-                description:
-                  type: string
     - name: v1beta1
       served: true
       storage: true

diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml
@@ -4467,32 +4467,6 @@ metadata:
 spec:
   group: crd.antrea.io
   versions:
-    - name: v1alpha1
-      served: true
-      storage: false
-      additionalPrinterColumns:
-        - name: Priority
-          type: integer
-          description: The Priority of this Tier relative to other Tiers.
-          jsonPath: .spec.priority
-        - name: Age
-          type: date
-          jsonPath: .metadata.creationTimestamp
-      schema:
-        openAPIV3Schema:
-          type: object
-          properties:
-            spec:
-              required:
-                - priority
-              type: object
-              properties:
-                priority:
-                  type: integer
-                  minimum: 0
-                  maximum: 255
-                description:
-                  type: string
     - name: v1beta1
       served: true
       storage: true
@@ -7257,7 +7231,7 @@ webhooks:
     rules:
       - operations: ["CREATE", "UPDATE", "DELETE"]
         apiGroups: ["crd.antrea.io"]
-        apiVersions: ["v1alpha1", "v1beta1"]
+        apiVersions: ["v1beta1"]
         resources: ["tiers"]
         scope: "Cluster"
     admissionReviewVersions: ["v1", "v1beta1"]

diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml
@@ -4467,32 +4467,6 @@ metadata:
 spec:
   group: crd.antrea.io
   versions:
-    - name: v1alpha1
-      served: true
-      storage: false
-      additionalPrinterColumns:
-        - name: Priority
-          type: integer
-          description: The Priority of this Tier relative to other Tiers.
-          jsonPath: .spec.priority
-        - name: Age
-          type: date
-          jsonPath: .metadata.creationTimestamp
-      schema:
-        openAPIV3Schema:
-          type: object
-          properties:
-            spec:
-              required:
-                - priority
-              type: object
-              properties:
-                priority:
-                  type: integer
-                  minimum: 0
-                  maximum: 255
-                description:
-                  type: string
     - name: v1beta1
       served: true
       storage: true
@@ -7254,7 +7228,7 @@ webhooks:
     rules:
       - operations: ["CREATE", "UPDATE", "DELETE"]
         apiGroups: ["crd.antrea.io"]
-        apiVersions: ["v1alpha1", "v1beta1"]
+        apiVersions: ["v1beta1"]
         resources: ["tiers"]
         scope: "Cluster"
     admissionReviewVersions: ["v1", "v1beta1"]

diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml
@@ -4467,32 +4467,6 @@ metadata:
 spec:
   group: crd.antrea.io
   versions:
-    - name: v1alpha1
-      served: true
-      storage: false
-      additionalPrinterColumns:
-        - name: Priority
-          type: integer
-          description: The Priority of this Tier relative to other Tiers.
-          jsonPath: .spec.priority
-        - name: Age
-          type: date
-          jsonPath: .metadata.creationTimestamp
-      schema:
-        openAPIV3Schema:
-          type: object
-          properties:
-            spec:
-              required:
-                - priority
-              type: object
-              properties:
-                priority:
-                  type: integer
-                  minimum: 0
-                  maximum: 255
-                description:
-                  type: string
     - name: v1beta1
       served: true
       storage: true
@@ -7313,7 +7287,7 @@ webhooks:
     rules:
       - operations: ["CREATE", "UPDATE", "DELETE"]
         apiGroups: ["crd.antrea.io"]
-        apiVersions: ["v1alpha1", "v1beta1"]
+        apiVersions: ["v1beta1"]
         resources: ["tiers"]
         scope: "Cluster"
     admissionReviewVersions: ["v1", "v1beta1"]

diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml
@@ -4467,32 +4467,6 @@ metadata:
 spec:
   group: crd.antrea.io
   versions:
-    - name: v1alpha1
-      served: true
-      storage: false
-      additionalPrinterColumns:
-        - name: Priority
-          type: integer
-          description: The Priority of this Tier relative to other Tiers.
-          jsonPath: .spec.priority
-        - name: Age
-          type: date
-          jsonPath: .metadata.creationTimestamp
-      schema:
-        openAPIV3Schema:
-          type: object
-          properties:
-            spec:
-              required:
-                - priority
-              type: object
-              properties:
-                priority:
-                  type: integer
-                  minimum: 0
-                  maximum: 255
-                description:
-                  type: string
     - name: v1beta1
       served: true
       storage: true
@@ -7254,7 +7228,7 @@ webhooks:
     rules:
       - operations: ["CREATE", "UPDATE", "DELETE"]
         apiGroups: ["crd.antrea.io"]
-        apiVersions: ["v1alpha1", "v1beta1"]
+        apiVersions: ["v1beta1"]
         resources: ["tiers"]
         scope: "Cluster"
     admissionReviewVersions: ["v1", "v1beta1"]

diff --git a/docs/api.md b/docs/api.md
@@ -30,7 +30,6 @@ These are the CRDs currently available in `crd.antrea.io`.
 | `AntreaControllerInfo` | v1beta1 | v1.0.0 | N/A | N/A |
 | `ClusterGroup` | v1alpha3 | v1.1.0 | v1.13.0 | N/A |
 | `ClusterGroup` | v1beta1 | v1.13.0 | N/A | N/A |
-| `ClusterNetworkPolicy` | v1alpha1 | v1.0.0 | v1.13.0 | N/A |
 | `ClusterNetworkPolicy` | v1beta1 | v1.13.0 | N/A | N/A |
 | `Egress` | v1alpha2 | v1.0.0 | N/A | N/A |
 | `Egress` | v1beta1 | v1.13.0 | N/A | N/A |
@@ -41,12 +40,9 @@ These are the CRDs currently available in `crd.antrea.io`.
 | `IPPool`| v1alpha2 | v1.4.0 | N/A | N/A |
 | `Group` | v1alpha3 | v1.8.0 | v1.13.0 | N/A |
 | `Group` | v1beta1 | v1.13.0 | N/A | N/A |
-| `NetworkPolicy` | v1alpha1 | v1.0.0 | v1.13.0 | N/A |
 | `NetworkPolicy` | v1beta1 | v1.13.0 | N/A | N/A |
 | `SupportBundleCollection` | v1alpha1 | v1.10.0 | N/A | N/A |
-| `Tier` | v1alpha1 | v1.0.0 | v1.13.0 | v2.0.0 |
 | `Tier` | v1beta1 | v1.13.0 | N/A | N/A |
-| `Traceflow` | v1alpha1 | v1.0.0 | v1.13.0 | N/A |
 | `Traceflow` | v1beta1 | v1.13.0 | N/A | N/A |
 
 ### Other API groups
@@ -81,4 +77,8 @@ These are the API group versions which are currently available when using Antrea
 | CRD | CRD version | Introduced in | Deprecated in | Removed in |
 |---|---|---|---|---|
 | `ClusterGroup` | v1alpha2 | v1.0.0 | v1.1.0 | v2.0.0 |
+| `ClusterNetworkPolicy` | v1alpha1 | v1.0.0 | v1.13.0 | v2.0.0 |
 | `ExternalEntity` | v1alpha1 | v0.10.0 | v0.11.0 | v2.0.0 |
+| `NetworkPolicy` | v1alpha1 | v1.0.0 | v1.13.0 | v2.0.0 |
+| `Tier` | v1alpha1 | v1.0.0 | v1.13.0 | v2.0.0 |
+| `Traceflow` | v1alpha1 | v1.0.0 | v1.13.0 | v2.0.0 |
diff --git a/pkg/apis/crd/v1alpha1/register.go b/pkg/apis/crd/v1alpha1/register.go
@@ -49,14 +49,6 @@ func Resource(resource string) schema.GroupResource {
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(
 		SchemeGroupVersion,
-		&Traceflow{},
-		&TraceflowList{},
-		&NetworkPolicy{},
-		&NetworkPolicyList{},
-		&ClusterNetworkPolicy{},
-		&ClusterNetworkPolicyList{},
-		&Tier{},
-		&TierList{},
 		&ExternalNode{},
 		&ExternalNodeList{},
 		&SupportBundleCollection{},