You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: manifests/0000_50_olm_00-clusterserviceversions.crd.yaml
+20Lines changed: 20 additions & 0 deletions
Original file line number
Diff line number
Diff line change
@@ -1700,7 +1700,11 @@ spec:
1700
1700
type: object
1701
1701
properties:
1702
1702
claims:
1703
+
<<<<<<< HEAD
1703
1704
description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers."
1705
+
=======
1706
+
description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable."
1707
+
>>>>>>> 07c80820c (bump golang-migrate to v4.16.1 (#1107))
1704
1708
type: array
1705
1709
items:
1706
1710
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -2544,7 +2548,11 @@ spec:
2544
2548
type: object
2545
2549
properties:
2546
2550
claims:
2551
+
<<<<<<< HEAD
2547
2552
description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers."
2553
+
=======
2554
+
description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable."
2555
+
>>>>>>> 07c80820c (bump golang-migrate to v4.16.1 (#1107))
2548
2556
type: array
2549
2557
items:
2550
2558
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -3399,7 +3407,11 @@ spec:
3399
3407
type: object
3400
3408
properties:
3401
3409
claims:
3410
+
<<<<<<< HEAD
3402
3411
description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers."
3412
+
=======
3413
+
description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable."
3414
+
>>>>>>> 07c80820c (bump golang-migrate to v4.16.1 (#1107))
3403
3415
type: array
3404
3416
items:
3405
3417
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -3766,7 +3778,11 @@ spec:
3766
3778
description: If specified, the pod will be dispatched by specified scheduler. If not specified, the pod will be dispatched by default scheduler.
3767
3779
type: string
3768
3780
schedulingGates:
3781
+
<<<<<<< HEAD
3769
3782
description: "SchedulingGates is an opaque list of values that if specified will block scheduling the pod. If schedulingGates is not empty, the pod will stay in the SchedulingGated state and the scheduler will not attempt to schedule the pod. \n SchedulingGates can only be set at pod creation time, and be removed only afterwards. \n This is a beta feature enabled by the PodSchedulingReadiness feature gate."
3783
+
=======
3784
+
description: "SchedulingGates is an opaque list of values that if specified will block scheduling the pod. More info: https://git.k8s.io/enhancements/keps/sig-scheduling/3521-pod-scheduling-readiness. \n This is an alpha-level feature enabled by PodSchedulingReadiness feature gate."
3785
+
>>>>>>> 07c80820c (bump golang-migrate to v4.16.1 (#1107))
3770
3786
type: array
3771
3787
items:
3772
3788
description: PodSchedulingGate is associated to a Pod to guard its scheduling.
@@ -4294,7 +4310,11 @@ spec:
4294
4310
type: object
4295
4311
properties:
4296
4312
claims:
4313
+
<<<<<<< HEAD
4297
4314
description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers."
4315
+
=======
4316
+
description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable."
4317
+
>>>>>>> 07c80820c (bump golang-migrate to v4.16.1 (#1107))
4298
4318
type: array
4299
4319
items:
4300
4320
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
Copy file name to clipboardExpand all lines: manifests/0000_50_olm_00-subscriptions.crd.yaml
+8Lines changed: 8 additions & 0 deletions
Original file line number
Diff line number
Diff line change
@@ -647,7 +647,11 @@ spec:
647
647
type: object
648
648
properties:
649
649
claims:
650
+
<<<<<<< HEAD
650
651
description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers."
652
+
=======
653
+
description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable."
654
+
>>>>>>> 07c80820c (bump golang-migrate to v4.16.1 (#1107))
651
655
type: array
652
656
items:
653
657
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -1073,7 +1077,11 @@ spec:
1073
1077
type: object
1074
1078
properties:
1075
1079
claims:
1080
+
<<<<<<< HEAD
1076
1081
description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers."
1082
+
=======
1083
+
description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable."
1084
+
>>>>>>> 07c80820c (bump golang-migrate to v4.16.1 (#1107))
1077
1085
type: array
1078
1086
items:
1079
1087
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
Copy file name to clipboardExpand all lines: scripts/README.md
+22-4Lines changed: 22 additions & 4 deletions
Original file line number
Diff line number
Diff line change
@@ -5,6 +5,17 @@ All of the staged repositories live in the top level `staging` directory.
5
5
The downstreaming process is complex and helper scripts have been written
6
6
to facilitate downstreaming.
7
7
8
+
## Automatic Downstreaming
9
+
10
+
There is now an automated downstreaming process for OLMv0 from the three
11
+
source repositories.
12
+
13
+
The "bumper" program is located in [openshift/operator-framework-tooling](https://github.com/openshift/operator-framework-tooling).
14
+
It is automatically run on a daily basis based on the following [openshift/release](https://github.com/openshift/release/blob/3bf0b3ae011debaefefb564ad6f233c380d033f7/ci-operator/jobs/infra-periodics.yaml#L926-L978) config.
15
+
16
+
If the bumper program fails to create a mergeable PR, manual intervention will be necessary.
17
+
This may require copying, modifying and resubmitting the PR.
18
+
8
19
## Assumptions
9
20
10
21
The helper scripts assume that the upstream remote repos are configured
@@ -19,6 +30,9 @@ remote repositories.
19
30
20
31
## Bulk Sync
21
32
33
+
**NOTE**: This should no longer be necessary, given the "bumper" program above.
34
+
The "bumper" program can be used instead of the following process.
35
+
22
36
To sync all current changes from upstream, simply run the sync script:
23
37
```sh
24
38
scripts/sync.sh
@@ -54,14 +68,18 @@ file in the repositry root directory with the repos and commit SHAs.
54
68
55
69
The format of the cherrypick file is:
56
70
```
57
-
<order> <repo> <commit-SHA>
71
+
<date-order> <commit-order> <repo> <commit-SHA>
58
72
```
59
73
74
+
* The `<date-order>` field is usually an ISO date without spaces.
75
+
* The `<commit-order>` field is a sequential number indicating the order of a commit within a pull request.
76
+
* For this _manual_ purpose, both can just be the same sequential number.
![openshift-ci[bot]](https://avatars.githubusercontent.com/in/91280?v=4&size=40){kind=avatar}
0 commit comments