Remove deprecated v1alpha1 Tier CRD

Signed-off-by: Lan Luo <luola@vmware.com>
antrea-io · Mar 28, 2024 · f9a0316 · f9a0316
1 parent ba63acb
commit f9a0316
Show file tree

Hide file tree

Showing 22 changed files with 13 additions and 768 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
@@ -4473,32 +4473,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
@@ -7262,7 +7236,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
@@ -4448,32 +4448,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
@@ -4473,32 +4473,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
@@ -7263,7 +7237,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
@@ -4473,32 +4473,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
@@ -7260,7 +7234,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
@@ -4473,32 +4473,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
@@ -7319,7 +7293,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
@@ -4473,32 +4473,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
@@ -7260,7 +7234,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
@@ -44,7 +44,6 @@ These are the CRDs currently available in `crd.antrea.io`.
 | `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 |
@@ -81,3 +80,4 @@ 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 |
+| `Tier` | 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
@@ -55,8 +55,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&NetworkPolicyList{},
 		&ClusterNetworkPolicy{},
 		&ClusterNetworkPolicyList{},
-		&Tier{},
-		&TierList{},
 		&ExternalNode{},
 		&ExternalNodeList{},
 		&SupportBundleCollection{},

diff --git a/pkg/apis/crd/v1alpha1/types.go b/pkg/apis/crd/v1alpha1/types.go
@@ -676,39 +676,6 @@ type ClusterNetworkPolicyList struct {
 	Items []ClusterNetworkPolicy `json:"items"`
 }
 
-// +genclient
-// +genclient:nonNamespaced
-// +genclient:noStatus
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-type Tier struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard metadata of the object.
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	// Specification of the desired behavior of Tier.
-	Spec TierSpec `json:"spec"`
-}
-
-// TierSpec defines the desired state for Tier.
-type TierSpec struct {
-	// Priority specfies the order of the Tier relative to other Tiers.
-	Priority int32 `json:"priority"`
-	// Description is an optional field to add more information regarding
-	// the purpose of this Tier.
-	Description string `json:"description,omitempty"`
-}
-
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-type TierList struct {
-	metav1.TypeMeta `json:",inline"`
-	// +optional
-	metav1.ListMeta `json:"metadata,omitempty"`
-
-	Items []Tier `json:"items"`
-}
-
 // NamespacedName refers to a Namespace scoped resource.
 // All fields must be used together.
 type NamespacedName struct {