Skip to content

Commit

Permalink
Add crd/v1alpha3 for ClusterGroup
Browse files Browse the repository at this point in the history 
Add apiextensions-apiserver clientset and convert function for two versions of CRDs

Add convert function for the two versions of CRDs

Add controller logic to handle ipBlocks

Fix issues in webhook registration

Fix conversion logic

Add E2E test and fix UT
  • Loading branch information
@Dyanngg
Dyanngg committed Apr 16, 2021
1 parent eca5ff4 commit dcea255
Show file tree
Hide file tree
Showing 55 changed files with 2,415 additions and 329 deletions.
66 changes: 66 additions & 0 deletions build/yamls/antrea-aks.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,17 @@ metadata:
app: antrea
name: clustergroups.crd.antrea.io
spec:
conversion:
strategy: Webhook
webhook:
clientConfig:
service:
name: antrea
namespace: kube-system
path: /convert/clustergroup
conversionReviewVersions:
- v1
- v1beta1
group: crd.antrea.io
names:
kind: ClusterGroup
Expand Down Expand Up @@ -234,6 +245,53 @@ spec:
type: object
type: object
served: true
storage: false
- name: v1alpha3
schema:
openAPIV3Schema:
properties:
spec:
properties:
childGroups:
x-kubernetes-preserve-unknown-fields: true
externalEntitySelector:
x-kubernetes-preserve-unknown-fields: true
ipBlocks:
items:
properties:
cidr:
format: cidr
type: string
type: object
type: array
namespaceSelector:
x-kubernetes-preserve-unknown-fields: true
podSelector:
x-kubernetes-preserve-unknown-fields: true
serviceReference:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
status:
properties:
conditions:
items:
properties:
lastTransitionTime:
type: string
status:
type: string
type:
type: string
type: object
type: array
type: object
type: object
served: true
storage: true
subresources:
status: {}
Expand Down Expand Up @@ -2138,6 +2196,14 @@ rules:
- subjectaccessreviews
verbs:
- create
- apiGroups:
- apiextensions.k8s.io
resources:
- customresourcedefinitions
verbs:
- get
- create
- update
- apiGroups:
- ""
resourceNames:
Expand Down
66 changes: 66 additions & 0 deletions build/yamls/antrea-eks.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,17 @@ metadata:
app: antrea
name: clustergroups.crd.antrea.io
spec:
conversion:
strategy: Webhook
webhook:
clientConfig:
service:
name: antrea
namespace: kube-system
path: /convert/clustergroup
conversionReviewVersions:
- v1
- v1beta1
group: crd.antrea.io
names:
kind: ClusterGroup
Expand Down Expand Up @@ -234,6 +245,53 @@ spec:
type: object
type: object
served: true
storage: false
- name: v1alpha3
schema:
openAPIV3Schema:
properties:
spec:
properties:
childGroups:
x-kubernetes-preserve-unknown-fields: true
externalEntitySelector:
x-kubernetes-preserve-unknown-fields: true
ipBlocks:
items:
properties:
cidr:
format: cidr
type: string
type: object
type: array
namespaceSelector:
x-kubernetes-preserve-unknown-fields: true
podSelector:
x-kubernetes-preserve-unknown-fields: true
serviceReference:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
status:
properties:
conditions:
items:
properties:
lastTransitionTime:
type: string
status:
type: string
type:
type: string
type: object
type: array
type: object
type: object
served: true
storage: true
subresources:
status: {}
Expand Down Expand Up @@ -2138,6 +2196,14 @@ rules:
- subjectaccessreviews
verbs:
- create
- apiGroups:
- apiextensions.k8s.io
resources:
- customresourcedefinitions
verbs:
- get
- create
- update
- apiGroups:
- ""
resourceNames:
Expand Down
66 changes: 66 additions & 0 deletions build/yamls/antrea-gke.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,17 @@ metadata:
app: antrea
name: clustergroups.crd.antrea.io
spec:
conversion:
strategy: Webhook
webhook:
clientConfig:
service:
name: antrea
namespace: kube-system
path: /convert/clustergroup
conversionReviewVersions:
- v1
- v1beta1
group: crd.antrea.io
names:
kind: ClusterGroup
Expand Down Expand Up @@ -234,6 +245,53 @@ spec:
type: object
type: object
served: true
storage: false
- name: v1alpha3
schema:
openAPIV3Schema:
properties:
spec:
properties:
childGroups:
x-kubernetes-preserve-unknown-fields: true
externalEntitySelector:
x-kubernetes-preserve-unknown-fields: true
ipBlocks:
items:
properties:
cidr:
format: cidr
type: string
type: object
type: array
namespaceSelector:
x-kubernetes-preserve-unknown-fields: true
podSelector:
x-kubernetes-preserve-unknown-fields: true
serviceReference:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
status:
properties:
conditions:
items:
properties:
lastTransitionTime:
type: string
status:
type: string
type:
type: string
type: object
type: array
type: object
type: object
served: true
storage: true
subresources:
status: {}
Expand Down Expand Up @@ -2138,6 +2196,14 @@ rules:
- subjectaccessreviews
verbs:
- create
- apiGroups:
- apiextensions.k8s.io
resources:
- customresourcedefinitions
verbs:
- get
- create
- update
- apiGroups:
- ""
resourceNames:
Expand Down
66 changes: 66 additions & 0 deletions build/yamls/antrea-ipsec.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,17 @@ metadata:
app: antrea
name: clustergroups.crd.antrea.io
spec:
conversion:
strategy: Webhook
webhook:
clientConfig:
service:
name: antrea
namespace: kube-system
path: /convert/clustergroup
conversionReviewVersions:
- v1
- v1beta1
group: crd.antrea.io
names:
kind: ClusterGroup
Expand Down Expand Up @@ -234,6 +245,53 @@ spec:
type: object
type: object
served: true
storage: false
- name: v1alpha3
schema:
openAPIV3Schema:
properties:
spec:
properties:
childGroups:
x-kubernetes-preserve-unknown-fields: true
externalEntitySelector:
x-kubernetes-preserve-unknown-fields: true
ipBlocks:
items:
properties:
cidr:
format: cidr
type: string
type: object
type: array
namespaceSelector:
x-kubernetes-preserve-unknown-fields: true
podSelector:
x-kubernetes-preserve-unknown-fields: true
serviceReference:
properties:
name:
type: string
namespace:
type: string
type: object
type: object
status:
properties:
conditions:
items:
properties:
lastTransitionTime:
type: string
status:
type: string
type:
type: string
type: object
type: array
type: object
type: object
served: true
storage: true
subresources:
status: {}
Expand Down Expand Up @@ -2138,6 +2196,14 @@ rules:
- subjectaccessreviews
verbs:
- create
- apiGroups:
- apiextensions.k8s.io
resources:
- customresourcedefinitions
verbs:
- get
- create
- update
- apiGroups:
- ""
resourceNames:
Expand Down
Loading

0 comments on commit dcea255

Please sign in to comment.