Skip to content

Commit cbf6a8f

Browse files
anik120perdasilva
authored andcommitted
Revert "chore: update o-f/api dependency to v0.17 (#2848)" (#2858)
This reverts commit bd97e32644f5a6c5a2b87668df5261a4da62a2a6. An older v0.17.0 release of operator-framework/api had the spec.RunAsRoot field, which has [now been updated to be the spec.GrpcPodConfig.SecurityContextConfig field](operator-framework/api#261). Reverting #2848 so that the new v0.17.0 can be pulled in. See [this comment](operator-framework/operator-lifecycle-manager#2848 (comment)) for more info. Signed-off-by: Anik Bhattacharjee <[email protected]> Signed-off-by: Anik Bhattacharjee <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: bfeb1e46819bc840190f4d7d0720712683387973
1 parent 4b4a9fa commit cbf6a8f

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

Diff for: pkg/manifests/csv.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
namespace: openshift-operator-lifecycle-manager
77
labels:
88
<<<<<<< HEAD
9+
<<<<<<< HEAD
910
<<<<<<< HEAD
1011
olm.version: 0.0.0-99785dad2261fcfbd582e4d4b8abe3da99d14a51
1112
=======
@@ -14,6 +15,9 @@ metadata:
1415
=======
1516
olm.version: 0.0.0-a0c41eb1169a64eea5363db2dc5a1f1b7ca58119
1617
>>>>>>> cb0154b1d (chore: update o-f/api dependency to v0.17 (#2848))
18+
=======
19+
olm.version: 0.0.0-359569ef376f962789ba0a6d1503498d58bf3ad8
20+
>>>>>>> 87e02653c (Revert "chore: update o-f/api dependency to v0.17 (#2848)" (#2858))
1721
olm.clusteroperator.name: operator-lifecycle-manager-packageserver
1822
annotations:
1923
include.release.openshift.io/self-managed-high-availability: "true"
@@ -168,6 +172,7 @@ spec:
168172
topologyKey: "kubernetes.io/hostname"
169173
maturity: alpha
170174
<<<<<<< HEAD
175+
<<<<<<< HEAD
171176
<<<<<<< HEAD
172177
version: 0.0.0-99785dad2261fcfbd582e4d4b8abe3da99d14a51
173178
=======
@@ -176,6 +181,9 @@ spec:
176181
=======
177182
version: 0.0.0-a0c41eb1169a64eea5363db2dc5a1f1b7ca58119
178183
>>>>>>> cb0154b1d (chore: update o-f/api dependency to v0.17 (#2848))
184+
=======
185+
version: 0.0.0-359569ef376f962789ba0a6d1503498d58bf3ad8
186+
>>>>>>> 87e02653c (Revert "chore: update o-f/api dependency to v0.17 (#2848)" (#2858))
179187
apiservicedefinitions:
180188
owned:
181189
- group: packages.operators.coreos.com

Diff for: staging/operator-lifecycle-manager/deploy/chart/crds/0000_50_olm_00-catalogsources.crd.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,6 @@ spec:
127127
type: integer
128128
publisher:
129129
type: string
130-
runAsRoot:
131-
description: RunAsRoot allows admins to indicate that they wish to run the CatalogSource pod in a privileged pod as root. This should only be enabled when running older catalog images which could not be run as non-root.
132-
type: boolean
133130
secrets:
134131
description: Secrets represent set of secrets that can be used to access the contents of the catalog. It is best to keep this list small, since each will need to be tried for every catalog entry.
135132
type: array

Diff for: staging/operator-lifecycle-manager/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
github.com/openshift/api v0.0.0-20220525145417-ee5b62754c68
2626
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
2727
github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e3463245
28-
github.com/operator-framework/api v0.17.0
28+
github.com/operator-framework/api v0.16.0
2929
github.com/operator-framework/operator-registry v1.17.5
3030
github.com/otiai10/copy v1.2.0
3131
github.com/pkg/errors v0.9.1

Diff for: staging/operator-lifecycle-manager/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1081,8 +1081,8 @@ github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e346324
10811081
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
10821082
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
10831083
github.com/operator-framework/api v0.7.1/go.mod h1:L7IvLd/ckxJEJg/t4oTTlnHKAJIP/p51AvEslW3wYdY=
1084-
github.com/operator-framework/api v0.17.0 h1:OXpCP0XJzM7MYgr/zEZDqdOahUxHR9JSYAmmNUIj4W8=
1085-
github.com/operator-framework/api v0.17.0/go.mod h1:kk8xJahHJR3bKqrA+A+1VIrhOTmyV76k+ARv+iV+u1Q=
1084+
github.com/operator-framework/api v0.16.0 h1:swUOhVv7QDszxBTwYM8QAtyeqI4EQHNVAiKMS+xjakY=
1085+
github.com/operator-framework/api v0.16.0/go.mod h1:kk8xJahHJR3bKqrA+A+1VIrhOTmyV76k+ARv+iV+u1Q=
10861086
github.com/operator-framework/operator-registry v1.17.5 h1:LR8m1rFz5Gcyje8WK6iYt+gIhtzqo52zMRALdmTYHT0=
10871087
github.com/operator-framework/operator-registry v1.17.5/go.mod h1:sRQIgDMZZdUcmHltzyCnM6RUoDF+WS8Arj1BQIARDS8=
10881088
github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=

0 commit comments

Comments
 (0)