Skip to content

Commit

Permalink
Remove additional deprecated CRD apis (#6239)
Browse files Browse the repository at this point in the history 
* Remove additional deprecated CRD APIs

This is a follow-up to #6162

We remove the following APIs in preparation for Antrea v2:
v1alpha3.ClusterGroup, v1alpha3.Group, v1alpha2.ExternalIPPool.

All 3 of them are Alpha APIs which have been deprecated since Antrea
v1.13.

* Remove invalid usage of v1alpha2.ExternalIPPool in e2e tests

It should have been v1beta1

* Remove v1alpha2.Egress API

While the API was not officially marked as deprecated in the
documentation (docs/api.md), we did mention its deprecation in the
CHANGELOG for the 1.13 release. It makes sense to delete this API at the
same time as the other deprecated Alpha APIs, for Antrea 2.0.

---------

Signed-off-by: Antonin Bas <antonin.bas@broadcom.com>
  • Loading branch information
@antoninbas
antoninbas authored Apr 22, 2024
1 parent b023f7b commit 7876c3f
Show file tree
Hide file tree
Showing 55 changed files with 32 additions and 6,253 deletions.
117 changes: 0 additions & 117 deletions build/charts/antrea/crds/clustergroup.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,123 +7,6 @@ metadata:
spec:
group: crd.antrea.io
versions:
- name: v1alpha3
served: true
storage: false
schema:
openAPIV3Schema:
type: object
properties:
spec:
type: object
properties:
childGroups:
type: array
items:
type: string
podSelector:
type: object
properties:
matchExpressions:
type: array
items:
type: object
properties:
key:
type: string
operator:
enum:
- In
- NotIn
- Exists
- DoesNotExist
type: string
values:
type: array
items:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?$"
matchLabels:
x-kubernetes-preserve-unknown-fields: true
namespaceSelector:
type: object
properties:
matchExpressions:
type: array
items:
type: object
properties:
key:
type: string
operator:
enum:
- In
- NotIn
- Exists
- DoesNotExist
type: string
values:
type: array
items:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?$"
matchLabels:
x-kubernetes-preserve-unknown-fields: true
externalEntitySelector:
type: object
properties:
matchExpressions:
type: array
items:
type: object
properties:
key:
type: string
operator:
enum:
- In
- NotIn
- Exists
- DoesNotExist
type: string
values:
type: array
items:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?$"
matchLabels:
x-kubernetes-preserve-unknown-fields: true
ipBlocks:
type: array
items:
type: object
properties:
cidr:
type: string
format: cidr
serviceReference:
type: object
properties:
name:
type: string
namespace:
type: string
status:
type: object
properties:
conditions:
type: array
items:
type: object
properties:
type:
type: string
status:
type: string
lastTransitionTime:
type: string
subresources:
status: {}
- name: v1beta1
served: true
storage: true
Expand Down
131 changes: 0 additions & 131 deletions build/charts/antrea/crds/egress.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,137 +7,6 @@ metadata:
spec:
group: crd.antrea.io
versions:
- name: v1alpha2
served: true
storage: false
schema:
openAPIV3Schema:
type: object
required:
- spec
properties:
spec:
type: object
required:
- appliedTo
oneOf:
- anyOf:
- required:
- egressIP
- required:
- externalIPPool
- anyOf:
- required:
- egressIPs
- required:
- externalIPPools
properties:
appliedTo:
type: object
properties:
podSelector:
type: object
properties:
matchExpressions:
type: array
items:
type: object
properties:
key:
type: string
operator:
enum:
- In
- NotIn
- Exists
- DoesNotExist
type: string
values:
type: array
items:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?$"
matchLabels:
x-kubernetes-preserve-unknown-fields: true
namespaceSelector:
type: object
properties:
matchExpressions:
type: array
items:
type: object
properties:
key:
type: string
operator:
enum:
- In
- NotIn
- Exists
- DoesNotExist
type: string
values:
type: array
items:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?$"
matchLabels:
x-kubernetes-preserve-unknown-fields: true
egressIP:
type: string
oneOf:
- format: ipv4
- format: ipv6
egressIPs:
type: array
items:
type: string
oneOf:
- maxLength: 0
- format: ipv4
- format: ipv6
externalIPPool:
type: string
externalIPPools:
type: array
items:
type: string
status:
type: object
properties:
egressNode:
type: string
egressIP:
type: string
conditions:
type: array
items:
type: object
properties:
type:
type: string
status:
type: string
lastTransitionTime:
type: string
reason:
type: string
message:
type: string
additionalPrinterColumns:
- description: The effective SNAT IP address for the selected workloads.
jsonPath: .status.egressIP
name: EgressIP
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
- description: The Owner Node of egress IP
jsonPath: .status.egressNode
name: Node
type: string
subresources:
status: {}
- name: v1beta1
served: true
storage: true
Expand Down
87 changes: 0 additions & 87 deletions build/charts/antrea/crds/externalippool.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,93 +7,6 @@ metadata:
spec:
group: crd.antrea.io
versions:
- name: v1alpha2
served: true
storage: false
schema:
openAPIV3Schema:
type: object
required:
- spec
properties:
spec:
type: object
required:
- ipRanges
- nodeSelector
properties:
ipRanges:
type: array
items:
type: object
oneOf:
- required:
- cidr
- required:
- start
- end
properties:
cidr:
type: string
format: cidr
start:
type: string
oneOf:
- format: ipv4
- format: ipv6
end:
type: string
oneOf:
- format: ipv4
- format: ipv6
nodeSelector:
type: object
properties:
matchExpressions:
items:
properties:
key:
type: string
operator:
enum:
- In
- NotIn
- Exists
- DoesNotExist
type: string
values:
items:
type: string
pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?$"
type: array
type: object
type: array
matchLabels:
x-kubernetes-preserve-unknown-fields: true
status:
type: object
properties:
usage:
type: object
properties:
total:
type: integer
used:
type: integer
additionalPrinterColumns:
- description: The number of total IPs
jsonPath: .status.usage.total
name: Total
type: integer
- description: The number of allocated IPs
jsonPath: .status.usage.used
name: Used
type: integer
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
subresources:
status: {}
- name: v1beta1
served: true
storage: true
Expand Down
Loading

0 comments on commit 7876c3f

Please sign in to comment.