Skip to content

Commit 37529f3

Browse files
zirainzirain
committed
bump to rc.2
Signed-off-by: zirain <[email protected]>
1 parent 0efc299 commit 37529f3

File tree

62 files changed

+2895
-691
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2895
-691
lines changed

‎api/v1alpha1/backend_types.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ package v1alpha1
88
import (
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1010
gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
11-
gwapiv1a3 "sigs.k8s.io/gateway-api/apis/v1alpha3"
1211
)
1312

1413
const (
@@ -196,7 +195,7 @@ type BackendTLSSettings struct {
196195
// CACertificateRefs or WellKnownCACertificates may be specified, not both.
197196
//
198197
// +optional
199-
WellKnownCACertificates *gwapiv1a3.WellKnownCACertificatesType `json:"wellKnownCACertificates,omitempty"`
198+
WellKnownCACertificates *gwapiv1.WellKnownCACertificatesType `json:"wellKnownCACertificates,omitempty"`
200199

201200
// InsecureSkipVerify indicates whether the upstream's certificate verification
202201
// should be skipped. Defaults to "false".

‎api/v1alpha1/policy_helpers.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ const (
1919
//
2020
// * "Aggregated"
2121
//
22-
PolicyConditionAggregated gwapiv1a2.PolicyConditionType = "Aggregated"
22+
PolicyConditionAggregated gwapiv1.PolicyConditionType = "Aggregated"
2323

2424
// PolicyReasonAggregated is used with the "Aggregated" condition when the policy
2525
// is aggregated to satisfy CEL constraints in PolicyAncestorStatus (not exceeding 16).
26-
PolicyReasonAggregated gwapiv1a2.PolicyConditionReason = "Aggregated"
26+
PolicyReasonAggregated gwapiv1.PolicyConditionReason = "Aggregated"
2727
)
2828

2929
type PolicyTargetReferences struct {

‎api/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎charts/gateway-crds-helm/templates/experimental-gatewayapi-crds.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ kind: CustomResourceDefinition
2525
metadata:
2626
annotations:
2727
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
28-
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.1
28+
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.2
2929
gateway.networking.k8s.io/channel: experimental
3030
labels:
3131
gateway.networking.k8s.io/policy: Direct
@@ -1383,7 +1383,7 @@ kind: CustomResourceDefinition
13831383
metadata:
13841384
annotations:
13851385
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
1386-
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.1
1386+
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.2
13871387
gateway.networking.k8s.io/channel: experimental
13881388
name: gatewayclasses.gateway.networking.k8s.io
13891389
spec:
@@ -1902,7 +1902,7 @@ kind: CustomResourceDefinition
19021902
metadata:
19031903
annotations:
19041904
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
1905-
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.1
1905+
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.2
19061906
gateway.networking.k8s.io/channel: experimental
19071907
name: gateways.gateway.networking.k8s.io
19081908
spec:
@@ -5087,7 +5087,7 @@ kind: CustomResourceDefinition
50875087
metadata:
50885088
annotations:
50895089
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
5090-
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.1
5090+
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.2
50915091
gateway.networking.k8s.io/channel: experimental
50925092
name: grpcroutes.gateway.networking.k8s.io
50935093
spec:
@@ -7336,7 +7336,7 @@ kind: CustomResourceDefinition
73367336
metadata:
73377337
annotations:
73387338
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
7339-
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.1
7339+
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.2
73407340
gateway.networking.k8s.io/channel: experimental
73417341
name: httproutes.gateway.networking.k8s.io
73427342
spec:
@@ -15681,7 +15681,7 @@ kind: CustomResourceDefinition
1568115681
metadata:
1568215682
annotations:
1568315683
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
15684-
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.1
15684+
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.2
1568515685
gateway.networking.k8s.io/channel: experimental
1568615686
name: referencegrants.gateway.networking.k8s.io
1568715687
spec:
@@ -15875,7 +15875,7 @@ kind: CustomResourceDefinition
1587515875
metadata:
1587615876
annotations:
1587715877
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
15878-
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.1
15878+
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.2
1587915879
gateway.networking.k8s.io/channel: experimental
1588015880
name: tcproutes.gateway.networking.k8s.io
1588115881
spec:
@@ -16635,7 +16635,7 @@ kind: CustomResourceDefinition
1663516635
metadata:
1663616636
annotations:
1663716637
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
16638-
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.1
16638+
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.2
1663916639
gateway.networking.k8s.io/channel: experimental
1664016640
name: tlsroutes.gateway.networking.k8s.io
1664116641
spec:
@@ -18256,7 +18256,7 @@ kind: CustomResourceDefinition
1825618256
metadata:
1825718257
annotations:
1825818258
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
18259-
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.1
18259+
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.2
1826018260
gateway.networking.k8s.io/channel: experimental
1826118261
name: udproutes.gateway.networking.k8s.io
1826218262
spec:
@@ -19016,7 +19016,7 @@ kind: CustomResourceDefinition
1901619016
metadata:
1901719017
annotations:
1901819018
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
19019-
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.1
19019+
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.2
1902019020
gateway.networking.k8s.io/channel: experimental
1902119021
labels:
1902219022
gateway.networking.k8s.io/policy: Direct
@@ -19626,7 +19626,7 @@ kind: CustomResourceDefinition
1962619626
metadata:
1962719627
annotations:
1962819628
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
19629-
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.1
19629+
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.2
1963019630
gateway.networking.k8s.io/channel: experimental
1963119631
name: xlistenersets.gateway.networking.x-k8s.io
1963219632
spec:
@@ -20417,7 +20417,7 @@ kind: CustomResourceDefinition
2041720417
metadata:
2041820418
annotations:
2041920419
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328
20420-
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.1
20420+
gateway.networking.k8s.io/bundle-version: v1.4.0-rc.2
2042120421
gateway.networking.k8s.io/channel: experimental
2042220422
name: xmeshes.gateway.networking.x-k8s.io
2042320423
spec:

‎charts/gateway-crds-helm/templates/generated/gateway.envoyproxy.io_backendtrafficpolicies.yaml‎

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1508,8 +1508,6 @@ spec:
15081508
Port will not be added in the 'Location' header if scheme is HTTP and port is 80
15091509
or scheme is HTTPS and port is 443.
15101510
format: int32
1511-
maximum: 65535
1512-
minimum: 1
15131511
type: integer
15141512
scheme:
15151513
description: |-
@@ -2396,8 +2394,38 @@ spec:
23962394
- name
23972395
type: object
23982396
conditions:
2399-
description: Conditions describes the status of the Policy with
2400-
respect to the given Ancestor.
2397+
description: |-
2398+
Conditions describes the status of the Policy with respect to the given Ancestor.
2399+
2400+
<gateway:util:excludeFromCRD>
2401+
2402+
Notes for implementors:
2403+
2404+
Conditions are a listType `map`, which means that they function like a
2405+
map with a key of the `type` field _in the k8s apiserver_.
2406+
2407+
This means that implementations must obey some rules when updating this
2408+
section.
2409+
2410+
* Implementations MUST perform a read-modify-write cycle on this field
2411+
before modifying it. That is, when modifying this field, implementations
2412+
must be confident they have fetched the most recent version of this field,
2413+
and ensure that changes they make are on that recent version.
2414+
* Implementations MUST NOT remove or reorder Conditions that they are not
2415+
directly responsible for. For example, if an implementation sees a Condition
2416+
with type `special.io/SomeField`, it MUST NOT remove, change or update that
2417+
Condition.
2418+
* Implementations MUST always _merge_ changes into Conditions of the same Type,
2419+
rather than creating more than one Condition of the same Type.
2420+
* Implementations MUST always update the `observedGeneration` field of the
2421+
Condition to the `metadata.generation` of the Gateway at the time of update creation.
2422+
* If the `observedGeneration` of a Condition is _greater than_ the value the
2423+
implementation knows about, then it MUST NOT perform the update on that Condition,
2424+
but must wait for a future reconciliation and status update. (The assumption is that
2425+
the implementation's copy of the object is stale and an update will be re-triggered
2426+
if relevant.)
2427+
2428+
</gateway:util:excludeFromCRD>
24012429
items:
24022430
description: Condition contains details for one aspect of
24032431
the current state of this API Resource.
@@ -2480,10 +2508,12 @@ spec:
24802508
type: string
24812509
required:
24822510
- ancestorRef
2511+
- conditions
24832512
- controllerName
24842513
type: object
24852514
maxItems: 16
24862515
type: array
2516+
x-kubernetes-list-type: atomic
24872517
required:
24882518
- ancestors
24892519
type: object

‎charts/gateway-crds-helm/templates/generated/gateway.envoyproxy.io_clienttrafficpolicies.yaml‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,8 +1498,38 @@ spec:
14981498
- name
14991499
type: object
15001500
conditions:
1501-
description: Conditions describes the status of the Policy with
1502-
respect to the given Ancestor.
1501+
description: |-
1502+
Conditions describes the status of the Policy with respect to the given Ancestor.
1503+
1504+
<gateway:util:excludeFromCRD>
1505+
1506+
Notes for implementors:
1507+
1508+
Conditions are a listType `map`, which means that they function like a
1509+
map with a key of the `type` field _in the k8s apiserver_.
1510+
1511+
This means that implementations must obey some rules when updating this
1512+
section.
1513+
1514+
* Implementations MUST perform a read-modify-write cycle on this field
1515+
before modifying it. That is, when modifying this field, implementations
1516+
must be confident they have fetched the most recent version of this field,
1517+
and ensure that changes they make are on that recent version.
1518+
* Implementations MUST NOT remove or reorder Conditions that they are not
1519+
directly responsible for. For example, if an implementation sees a Condition
1520+
with type `special.io/SomeField`, it MUST NOT remove, change or update that
1521+
Condition.
1522+
* Implementations MUST always _merge_ changes into Conditions of the same Type,
1523+
rather than creating more than one Condition of the same Type.
1524+
* Implementations MUST always update the `observedGeneration` field of the
1525+
Condition to the `metadata.generation` of the Gateway at the time of update creation.
1526+
* If the `observedGeneration` of a Condition is _greater than_ the value the
1527+
implementation knows about, then it MUST NOT perform the update on that Condition,
1528+
but must wait for a future reconciliation and status update. (The assumption is that
1529+
the implementation's copy of the object is stale and an update will be re-triggered
1530+
if relevant.)
1531+
1532+
</gateway:util:excludeFromCRD>
15031533
items:
15041534
description: Condition contains details for one aspect of
15051535
the current state of this API Resource.
@@ -1582,10 +1612,12 @@ spec:
15821612
type: string
15831613
required:
15841614
- ancestorRef
1615+
- conditions
15851616
- controllerName
15861617
type: object
15871618
maxItems: 16
15881619
type: array
1620+
x-kubernetes-list-type: atomic
15891621
required:
15901622
- ancestors
15911623
type: object

‎charts/gateway-crds-helm/templates/generated/gateway.envoyproxy.io_envoyextensionpolicies.yaml‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1903,8 +1903,38 @@ spec:
19031903
- name
19041904
type: object
19051905
conditions:
1906-
description: Conditions describes the status of the Policy with
1907-
respect to the given Ancestor.
1906+
description: |-
1907+
Conditions describes the status of the Policy with respect to the given Ancestor.
1908+
1909+
<gateway:util:excludeFromCRD>
1910+
1911+
Notes for implementors:
1912+
1913+
Conditions are a listType `map`, which means that they function like a
1914+
map with a key of the `type` field _in the k8s apiserver_.
1915+
1916+
This means that implementations must obey some rules when updating this
1917+
section.
1918+
1919+
* Implementations MUST perform a read-modify-write cycle on this field
1920+
before modifying it. That is, when modifying this field, implementations
1921+
must be confident they have fetched the most recent version of this field,
1922+
and ensure that changes they make are on that recent version.
1923+
* Implementations MUST NOT remove or reorder Conditions that they are not
1924+
directly responsible for. For example, if an implementation sees a Condition
1925+
with type `special.io/SomeField`, it MUST NOT remove, change or update that
1926+
Condition.
1927+
* Implementations MUST always _merge_ changes into Conditions of the same Type,
1928+
rather than creating more than one Condition of the same Type.
1929+
* Implementations MUST always update the `observedGeneration` field of the
1930+
Condition to the `metadata.generation` of the Gateway at the time of update creation.
1931+
* If the `observedGeneration` of a Condition is _greater than_ the value the
1932+
implementation knows about, then it MUST NOT perform the update on that Condition,
1933+
but must wait for a future reconciliation and status update. (The assumption is that
1934+
the implementation's copy of the object is stale and an update will be re-triggered
1935+
if relevant.)
1936+
1937+
</gateway:util:excludeFromCRD>
19081938
items:
19091939
description: Condition contains details for one aspect of
19101940
the current state of this API Resource.
@@ -1987,10 +2017,12 @@ spec:
19872017
type: string
19882018
required:
19892019
- ancestorRef
2020+
- conditions
19902021
- controllerName
19912022
type: object
19922023
maxItems: 16
19932024
type: array
2025+
x-kubernetes-list-type: atomic
19942026
required:
19952027
- ancestors
19962028
type: object

‎charts/gateway-crds-helm/templates/generated/gateway.envoyproxy.io_envoypatchpolicies.yaml‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,8 +376,38 @@ spec:
376376
- name
377377
type: object
378378
conditions:
379-
description: Conditions describes the status of the Policy with
380-
respect to the given Ancestor.
379+
description: |-
380+
Conditions describes the status of the Policy with respect to the given Ancestor.
381+
382+
<gateway:util:excludeFromCRD>
383+
384+
Notes for implementors:
385+
386+
Conditions are a listType `map`, which means that they function like a
387+
map with a key of the `type` field _in the k8s apiserver_.
388+
389+
This means that implementations must obey some rules when updating this
390+
section.
391+
392+
* Implementations MUST perform a read-modify-write cycle on this field
393+
before modifying it. That is, when modifying this field, implementations
394+
must be confident they have fetched the most recent version of this field,
395+
and ensure that changes they make are on that recent version.
396+
* Implementations MUST NOT remove or reorder Conditions that they are not
397+
directly responsible for. For example, if an implementation sees a Condition
398+
with type `special.io/SomeField`, it MUST NOT remove, change or update that
399+
Condition.
400+
* Implementations MUST always _merge_ changes into Conditions of the same Type,
401+
rather than creating more than one Condition of the same Type.
402+
* Implementations MUST always update the `observedGeneration` field of the
403+
Condition to the `metadata.generation` of the Gateway at the time of update creation.
404+
* If the `observedGeneration` of a Condition is _greater than_ the value the
405+
implementation knows about, then it MUST NOT perform the update on that Condition,
406+
but must wait for a future reconciliation and status update. (The assumption is that
407+
the implementation's copy of the object is stale and an update will be re-triggered
408+
if relevant.)
409+
410+
</gateway:util:excludeFromCRD>
381411
items:
382412
description: Condition contains details for one aspect of
383413
the current state of this API Resource.
@@ -460,10 +490,12 @@ spec:
460490
type: string
461491
required:
462492
- ancestorRef
493+
- conditions
463494
- controllerName
464495
type: object
465496
maxItems: 16
466497
type: array
498+
x-kubernetes-list-type: atomic
467499
required:
468500
- ancestors
469501
type: object

0 commit comments

Comments
 (0)