Skip to content

Commit 7adb4cf

Browse files
zhiying-linzhiying-lin
authored
test: update the e2e test to use v1beta1 imc (#188)
1 parent 65dc872 commit 7adb4cf

File tree

15 files changed

+495
-427
lines changed

15 files changed

+495
-427
lines changed

‎charts/mcs-controller-manager/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ tolerations: []
5151

5252
affinity: {}
5353

54-
enableV1Alpha1APIs: true
55-
enableV1Beta1APIs: false
54+
enableV1Alpha1APIs: false
55+
enableV1Beta1APIs: true

‎charts/member-net-controller-manager/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ tolerations: []
5151

5252
affinity: {}
5353

54-
enableV1Alpha1APIs: true
55-
enableV1Beta1APIs: false
54+
enableV1Alpha1APIs: false
55+
enableV1Beta1APIs: true

‎config/crd/bases/networking.fleet.azure.com_endpointsliceexports.yaml‎

Lines changed: 66 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.7.0
8-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.15.0
97
name: endpointsliceexports.networking.fleet.azure.com
108
spec:
119
group: networking.fleet.azure.com
@@ -21,18 +19,24 @@ spec:
2119
- name: v1alpha1
2220
schema:
2321
openAPIV3Schema:
24-
description: EndpointSliceExport is a data transport type that member clusters
25-
in the fleet use to upload the spec of an EndpointSlice to the hub cluster.
22+
description: |-
23+
EndpointSliceExport is a data transport type that member clusters in the fleet use to upload the spec of an
24+
EndpointSlice to the hub cluster.
2625
properties:
2726
apiVersion:
28-
description: 'APIVersion defines the versioned schema of this representation
29-
of an object. Servers should convert recognized schemas to the latest
30-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
27+
description: |-
28+
APIVersion defines the versioned schema of this representation of an object.
29+
Servers should convert recognized schemas to the latest internal value, and
30+
may reject unrecognized values.
31+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3132
type: string
3233
kind:
33-
description: 'Kind is a string value representing the REST resource this
34-
object represents. Servers may infer this from the endpoint the client
35-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
34+
description: |-
35+
Kind is a string value representing the REST resource this object represents.
36+
Servers may infer this from the endpoint the client submits requests to.
37+
Cannot be updated.
38+
In CamelCase.
39+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3640
type: string
3741
metadata:
3842
type: object
@@ -42,7 +46,8 @@ spec:
4246
properties:
4347
addressType:
4448
default: IPv4
45-
description: The type of addresses carried by this EndpointSliceExport.
49+
description: |-
50+
The type of addresses carried by this EndpointSliceExport.
4651
At this stage only IPv4 addresses are supported.
4752
enum:
4853
- IPv4
@@ -57,9 +62,9 @@ spec:
5762
description: The ID of the cluster where the object is exported.
5863
type: string
5964
exportedSince:
60-
description: The timestamp from a local clock when the generation
61-
of the object is exported. This field is marked as optional
62-
for backwards compatibility reasons.
65+
description: |-
66+
The timestamp from a local clock when the generation of the object is exported.
67+
This field is marked as optional for backwards compatibility reasons.
6368
format: date-time
6469
type: string
6570
generation:
@@ -94,17 +99,19 @@ spec:
9499
- resourceVersion
95100
- uid
96101
type: object
102+
x-kubernetes-map-type: atomic
97103
endpoints:
98104
description: A list of unique endpoints in the exported EndpointSlice.
99105
items:
100106
description: Endpoint includes all exported addresses from a logical
101107
backend.
102108
properties:
103109
addresses:
104-
description: Addresses of the Endpoint. Addresses should be
105-
interpreted per its owner EndpointSliceExport's addressType
106-
field. This field contains at least one address and at maximum
107-
100; for more information about this constraint, see https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#endpoint-v1beta1-discovery-k8s-io.
110+
description: |-
111+
Addresses of the Endpoint.
112+
Addresses should be interpreted per its owner EndpointSliceExport's addressType field. This field contains
113+
at least one address and at maximum 100; for more information about this constraint,
114+
see https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#endpoint-v1beta1-discovery-k8s-io.
108115
items:
109116
type: string
110117
type: array
@@ -131,51 +138,60 @@ spec:
131138
- namespacedName
132139
type: object
133140
ports:
134-
description: The list of ports exported by each endpoint in this EndpointSliceExport.
135-
Each port must have a unique name. When the field is empty, it indicates
136-
that there are no defined ports. When a port is defined with a nil
137-
port value, it indicates that all ports are exported. Each slice
138-
may include a maximum of 100 ports.
141+
description: |-
142+
The list of ports exported by each endpoint in this EndpointSliceExport. Each port must have a unique name.
143+
When the field is empty, it indicates that there are no defined ports. When a port is defined with a nil
144+
port value, it indicates that all ports are exported. Each slice may include a maximum of 100 ports.
139145
items:
140146
description: EndpointPort represents a Port used by an EndpointSlice
141147
properties:
142148
appProtocol:
143-
description: "The application protocol for this port. This is
144-
used as a hint for implementations to offer richer behavior
145-
for protocols that they understand. This field follows standard
146-
Kubernetes label syntax. Valid values are either: \n * Un-prefixed
147-
protocol names - reserved for IANA standard service names
148-
(as per RFC-6335 and https://www.iana.org/assignments/service-names).
149-
\n * Kubernetes-defined prefixed names: * 'kubernetes.io/h2c'
150-
- HTTP/2 over cleartext as described in https://www.rfc-editor.org/rfc/rfc7540
151-
\ * 'kubernetes.io/ws' - WebSocket over cleartext as described
152-
in https://www.rfc-editor.org/rfc/rfc6455 * 'kubernetes.io/wss'
153-
- WebSocket over TLS as described in https://www.rfc-editor.org/rfc/rfc6455
154-
\n * Other protocols should use implementation-defined prefixed
155-
names such as mycompany.com/my-custom-protocol."
149+
description: |-
150+
The application protocol for this port.
151+
This is used as a hint for implementations to offer richer behavior for protocols that they understand.
152+
This field follows standard Kubernetes label syntax.
153+
Valid values are either:
154+
155+
156+
* Un-prefixed protocol names - reserved for IANA standard service names (as per
157+
RFC-6335 and https://www.iana.org/assignments/service-names).
158+
159+
160+
* Kubernetes-defined prefixed names:
161+
* 'kubernetes.io/h2c' - HTTP/2 prior knowledge over cleartext as described in https://www.rfc-editor.org/rfc/rfc9113.html#name-starting-http-2-with-prior-
162+
* 'kubernetes.io/ws' - WebSocket over cleartext as described in https://www.rfc-editor.org/rfc/rfc6455
163+
* 'kubernetes.io/wss' - WebSocket over TLS as described in https://www.rfc-editor.org/rfc/rfc6455
164+
165+
166+
* Other protocols should use implementation-defined prefixed names such as
167+
mycompany.com/my-custom-protocol.
156168
type: string
157169
name:
158-
description: 'name represents the name of this port. All ports
159-
in an EndpointSlice must have a unique name. If the EndpointSlice
160-
is dervied from a Kubernetes service, this corresponds to
161-
the Service.ports[].name. Name must either be an empty string
162-
or pass DNS_LABEL validation: * must be no more than 63 characters
163-
long. * must consist of lower case alphanumeric characters
164-
or ''-''. * must start and end with an alphanumeric character.
165-
Default is empty string.'
170+
description: |-
171+
name represents the name of this port. All ports in an EndpointSlice must have a unique name.
172+
If the EndpointSlice is derived from a Kubernetes service, this corresponds to the Service.ports[].name.
173+
Name must either be an empty string or pass DNS_LABEL validation:
174+
* must be no more than 63 characters long.
175+
* must consist of lower case alphanumeric characters or '-'.
176+
* must start and end with an alphanumeric character.
177+
Default is empty string.
166178
type: string
167179
port:
168-
description: port represents the port number of the endpoint.
169-
If this is not specified, ports are not restricted and must
170-
be interpreted in the context of the specific consumer.
180+
description: |-
181+
port represents the port number of the endpoint.
182+
If this is not specified, ports are not restricted and must be
183+
interpreted in the context of the specific consumer.
171184
format: int32
172185
type: integer
173186
protocol:
174187
default: TCP
175-
description: protocol represents the IP protocol for this port.
176-
Must be UDP, TCP, or SCTP. Default is TCP.
188+
description: |-
189+
protocol represents the IP protocol for this port.
190+
Must be UDP, TCP, or SCTP.
191+
Default is TCP.
177192
type: string
178193
type: object
194+
x-kubernetes-map-type: atomic
179195
type: array
180196
x-kubernetes-list-type: atomic
181197
required:
@@ -191,9 +207,3 @@ spec:
191207
storage: true
192208
subresources:
193209
status: {}
194-
status:
195-
acceptedNames:
196-
kind: ""
197-
plural: ""
198-
conditions: []
199-
storedVersions: []

0 commit comments

Comments
 (0)