Skip to content

Commit cf0f223

Browse files
madanrajhari10madanrajhari10
authored
Merge pull request #30 from madanrajhari10/madan/releasemesh
New Release v1.1.4 for OCI Service Operator
2 parents 180b482 + 8da3f15 commit cf0f223

22 files changed

+94
-192
lines changed

‎apis/servicemesh.oci/v1beta1/accesspolicy_types.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ type AccessPolicySpec struct {
2323
// +optional
2424
Description *Description `json:"description,omitempty"`
2525
// Access Policy Rules
26+
// +kubebuilder:validation:MaxItems=50
2627
// +kubebuilder:validation:MinItems=1
27-
Rules []AccessPolicyRule `json:"rules,omitempty"`
28+
Rules []AccessPolicyRule `json:"rules"`
2829
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
2930
}
3031

‎apis/servicemesh.oci/v1beta1/ingressgateway_types.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ type IngressGatewaySpec struct {
2424
Description *Description `json:"description,omitempty"`
2525
// +optional
2626
AccessLogging *AccessLogging `json:"accessLogging,omitempty"`
27+
// +kubebuilder:validation:MaxItems=5
2728
// +kubebuilder:validation:MinItems=1
2829
Hosts []IngressGatewayHost `json:"hosts"`
2930
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
@@ -38,9 +39,11 @@ type IngressGatewayHost struct {
3839
// Wildcard hostnames are supported in the prefix form.
3940
// Examples of valid hostnames are www.example.com, *.example.com, *.com
4041
// Applicable only for HTTP and TLS_PASSTHROUGH listeners.
42+
// +kubebuilder:validation:MaxItems=10
4143
// +optional
4244
Hostnames []string `json:"hostnames,omitempty"`
4345
// The listeners for the ingress host
46+
// +kubebuilder:validation:MaxItems=10
4447
// +kubebuilder:validation:MinItems=1
4548
Listeners []IngressGatewayListener `json:"listeners"`
4649
}
@@ -105,6 +108,7 @@ type IngressHostClientValidationConfig struct {
105108
TrustedCaBundle *CaBundle `json:"trustedCaBundle,omitempty"`
106109

107110
// A list of alternate names to verify the subject identity in the certificate presented by the client.
111+
// +kubebuilder:validation:MaxItems=10
108112
// +optional
109113
SubjectAlternateNames []string `json:"subjectAlternateNames,omitempty"`
110114
}

‎apis/servicemesh.oci/v1beta1/ingressgatewayroutetable_types.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ type IngressGatewayRouteTableSpec struct {
2222
// +optional
2323
Description *Description `json:"description,omitempty"`
2424
IngressGateway RefOrId `json:"ingressGateway"`
25+
// +kubebuilder:validation:MaxItems=15
2526
// +kubebuilder:validation:MinItems=1
2627
RouteRules []IngressGatewayTrafficRouteRule `json:"routeRules"`
2728
// +optional
@@ -46,6 +47,7 @@ type HttpIngressGatewayTrafficRouteRule struct {
4647
IngressGatewayHost *IngressGatewayHostRef `json:"ingressGatewayHost,omitempty"`
4748

4849
// The destination of the request.
50+
// +kubebuilder:validation:MaxItems=1
4951
// +kubebuilder:validation:MinItems=1
5052
Destinations []VirtualServiceTrafficRuleTarget `json:"destinations"`
5153

@@ -81,6 +83,7 @@ type TcpIngressGatewayTrafficRouteRule struct {
8183
IngressGatewayHost *IngressGatewayHostRef `json:"ingressGatewayHost,omitempty"`
8284

8385
// The destination of the request.
86+
// +kubebuilder:validation:MaxItems=1
8487
// +kubebuilder:validation:MinItems=1
8588
Destinations []VirtualServiceTrafficRuleTarget `json:"destinations"`
8689
}
@@ -92,6 +95,7 @@ type TlsPassthroughIngressGatewayTrafficRouteRule struct {
9295
IngressGatewayHost *IngressGatewayHostRef `json:"ingressGatewayHost,omitempty"`
9396

9497
// The destination of the request.
98+
// +kubebuilder:validation:MaxItems=1
9599
// +kubebuilder:validation:MinItems=1
96100
Destinations []VirtualServiceTrafficRuleTarget `json:"destinations"`
97101
}

‎apis/servicemesh.oci/v1beta1/mesh_commons.go‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,27 +84,33 @@ type ExternalService struct {
8484

8585
type TcpExternalService struct {
8686
// IpAddresses of the external service in CIDR notation.
87+
// +kubebuilder:validation:MaxItems=10
8788
// +kubebuilder:validation:MinItems=1
88-
IpAddresses []string `json:"ipAddresses,omitempty"`
89+
IpAddresses []string `json:"ipAddresses"`
8990
// Ports exposed by the external service. If left empty all ports will be allowed.
91+
// +kubebuilder:validation:MaxItems=10
9092
// +optional
9193
Ports []Port `json:"ports,omitempty"`
9294
}
9395

9496
type HttpExternalService struct {
9597
// Host names of the external service.
98+
// +kubebuilder:validation:MaxItems=10
9699
// +kubebuilder:validation:MinItems=1
97-
Hostnames []string `json:"hostnames,omitempty"`
100+
Hostnames []string `json:"hostnames"`
98101
// Ports exposed by the external service. If left empty all ports will be allowed.
102+
// +kubebuilder:validation:MaxItems=10
99103
// +optional
100104
Ports []Port `json:"ports,omitempty"`
101105
}
102106

103107
type HttpsExternalService struct {
104108
// Host names of the external service.
109+
// +kubebuilder:validation:MaxItems=10
105110
// +kubebuilder:validation:MinItems=1
106-
Hostnames []string `json:"hostnames,omitempty"`
111+
Hostnames []string `json:"hostnames"`
107112
// Ports exposed by the external service. If left empty all ports will be allowed.
113+
// +kubebuilder:validation:MaxItems=10
108114
// +optional
109115
Ports []Port `json:"ports,omitempty"`
110116
}

‎apis/servicemesh.oci/v1beta1/mesh_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ type MeshSpec struct {
2121
// +optional
2222
Description *Description `json:"description,omitempty"`
2323
// +kubebuilder:validation:MinItems=1
24+
// +kubebuilder:validation:MaxItems=1
2425
CertificateAuthorities []CertificateAuthority `json:"certificateAuthorities"`
2526
// +optional
2627
Mtls *MeshMutualTransportLayerSecurity `json:"mtls,omitempty"`

‎apis/servicemesh.oci/v1beta1/virtualserviceroutetable_types.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ type VirtualServiceRouteTableSpec struct {
2323
// +optional
2424
Description *Description `json:"description,omitempty"`
2525
VirtualService RefOrId `json:"virtualService"`
26+
// +kubebuilder:validation:MaxItems=15
2627
// +kubebuilder:validation:MinItems=1
2728
RouteRules []VirtualServiceTrafficRouteRule `json:"routeRules"`
2829
// +optional
@@ -43,6 +44,7 @@ type VirtualServiceTrafficRouteRule struct {
4344
type HttpVirtualServiceTrafficRouteRule struct {
4445

4546
// The destination of the request.
47+
// +kubebuilder:validation:MaxItems=15
4648
// +kubebuilder:validation:MinItems=1
4749
Destinations []VirtualDeploymentTrafficRuleTarget `json:"destinations"`
4850

@@ -83,12 +85,14 @@ const (
8385

8486
type TcpVirtualServiceTrafficRouteRule struct {
8587
// The destination of the request.
88+
// +kubebuilder:validation:MaxItems=15
8689
// +kubebuilder:validation:MinItems=1
8790
Destinations []VirtualDeploymentTrafficRuleTarget `json:"destinations"`
8891
}
8992

9093
type TlsPassthroughVirtualServiceTrafficRouteRule struct {
9194
// The destination of the request.
95+
// +kubebuilder:validation:MaxItems=15
9296
// +kubebuilder:validation:MinItems=1
9397
Destinations []VirtualDeploymentTrafficRuleTarget `json:"destinations"`
9498
}

‎config/crd/bases/servicemesh.oci.oracle.com_accesspolicies.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ spec:
140140
description: Host names of the external service.
141141
items:
142142
type: string
143+
maxItems: 10
143144
minItems: 1
144145
type: array
145146
ports:
@@ -150,14 +151,18 @@ spec:
150151
maximum: 65535
151152
minimum: 1
152153
type: integer
154+
maxItems: 10
153155
type: array
156+
required:
157+
- hostnames
154158
type: object
155159
httpsExternalService:
156160
properties:
157161
hostnames:
158162
description: Host names of the external service.
159163
items:
160164
type: string
165+
maxItems: 10
161166
minItems: 1
162167
type: array
163168
ports:
@@ -168,7 +173,10 @@ spec:
168173
maximum: 65535
169174
minimum: 1
170175
type: integer
176+
maxItems: 10
171177
type: array
178+
required:
179+
- hostnames
172180
type: object
173181
tcpExternalService:
174182
properties:
@@ -177,6 +185,7 @@ spec:
177185
in CIDR notation.
178186
items:
179187
type: string
188+
maxItems: 10
180189
minItems: 1
181190
type: array
182191
ports:
@@ -187,7 +196,10 @@ spec:
187196
maximum: 65535
188197
minimum: 1
189198
type: integer
199+
maxItems: 10
190200
type: array
201+
required:
202+
- ipAddresses
191203
type: object
192204
type: object
193205
ingressGateway:
@@ -262,6 +274,7 @@ spec:
262274
description: Host names of the external service.
263275
items:
264276
type: string
277+
maxItems: 10
265278
minItems: 1
266279
type: array
267280
ports:
@@ -272,14 +285,18 @@ spec:
272285
maximum: 65535
273286
minimum: 1
274287
type: integer
288+
maxItems: 10
275289
type: array
290+
required:
291+
- hostnames
276292
type: object
277293
httpsExternalService:
278294
properties:
279295
hostnames:
280296
description: Host names of the external service.
281297
items:
282298
type: string
299+
maxItems: 10
283300
minItems: 1
284301
type: array
285302
ports:
@@ -290,7 +307,10 @@ spec:
290307
maximum: 65535
291308
minimum: 1
292309
type: integer
310+
maxItems: 10
293311
type: array
312+
required:
313+
- hostnames
294314
type: object
295315
tcpExternalService:
296316
properties:
@@ -299,6 +319,7 @@ spec:
299319
in CIDR notation.
300320
items:
301321
type: string
322+
maxItems: 10
302323
minItems: 1
303324
type: array
304325
ports:
@@ -309,7 +330,10 @@ spec:
309330
maximum: 65535
310331
minimum: 1
311332
type: integer
333+
maxItems: 10
312334
type: array
335+
required:
336+
- ipAddresses
313337
type: object
314338
type: object
315339
ingressGateway:
@@ -366,11 +390,13 @@ spec:
366390
- destination
367391
- source
368392
type: object
393+
maxItems: 50
369394
minItems: 1
370395
type: array
371396
required:
372397
- compartmentId
373398
- mesh
399+
- rules
374400
type: object
375401
status:
376402
properties:

‎config/crd/bases/servicemesh.oci.oracle.com_ingressgatewayroutetables.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ spec:
164164
required:
165165
- virtualService
166166
type: object
167+
maxItems: 1
167168
minItems: 1
168169
type: array
169170
ingressGatewayHost:
@@ -263,6 +264,7 @@ spec:
263264
required:
264265
- virtualService
265266
type: object
267+
maxItems: 1
266268
minItems: 1
267269
type: array
268270
ingressGatewayHost:
@@ -339,6 +341,7 @@ spec:
339341
required:
340342
- virtualService
341343
type: object
344+
maxItems: 1
342345
minItems: 1
343346
type: array
344347
ingressGatewayHost:
@@ -365,6 +368,7 @@ spec:
365368
- destinations
366369
type: object
367370
type: object
371+
maxItems: 15
368372
minItems: 1
369373
type: array
370374
required:

‎config/crd/bases/servicemesh.oci.oracle.com_ingressgateways.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ spec:
9595
listeners.
9696
items:
9797
type: string
98+
maxItems: 10
9899
type: array
99100
listeners:
100101
description: The listeners for the ingress host
@@ -129,6 +130,7 @@ spec:
129130
by the client.
130131
items:
131132
type: string
133+
maxItems: 10
132134
type: array
133135
trustedCaBundle:
134136
description: CaBundle Resource representing the
@@ -210,6 +212,7 @@ spec:
210212
- port
211213
- protocol
212214
type: object
215+
maxItems: 10
213216
minItems: 1
214217
type: array
215218
name:
@@ -224,6 +227,7 @@ spec:
224227
- listeners
225228
- name
226229
type: object
230+
maxItems: 5
227231
minItems: 1
228232
type: array
229233
mesh:

‎config/crd/bases/servicemesh.oci.oracle.com_meshes.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ spec:
7171
required:
7272
- id
7373
type: object
74+
maxItems: 1
7475
minItems: 1
7576
type: array
7677
compartmentId:

0 commit comments

Comments
 (0)