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 <anikbhattacharya93@gmail.com> Signed-off-by: Anik Bhattacharjee <anikbhattacharya93@gmail.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: bfeb1e46819bc840190f4d7d0720712683387973
tmshort · Mar 15, 2023 · 0b624b4 · 0b624b4
1 parent 25929f9
commit 0b624b4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/staging/operator-lifecycle-manager/deploy/chart/crds/0000_50_olm_00-catalogsources.crd.yaml b/staging/operator-lifecycle-manager/deploy/chart/crds/0000_50_olm_00-catalogsources.crd.yaml
@@ -127,9 +127,6 @@ spec:
                   type: integer
                 publisher:
                   type: string
-                runAsRoot:
-                  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.
-                  type: boolean
                 secrets:
                   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.
                   type: array

diff --git a/staging/operator-lifecycle-manager/go.mod b/staging/operator-lifecycle-manager/go.mod
@@ -25,7 +25,7 @@ require (
 	github.com/openshift/api v0.0.0-20220525145417-ee5b62754c68
 	github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
 	github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e3463245
-	github.com/operator-framework/api v0.17.0
+	github.com/operator-framework/api v0.16.0
 	github.com/operator-framework/operator-registry v1.17.5
 	github.com/otiai10/copy v1.2.0
 	github.com/pkg/errors v0.9.1

diff --git a/staging/operator-lifecycle-manager/go.sum b/staging/operator-lifecycle-manager/go.sum
@@ -1081,8 +1081,8 @@ github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e346324
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/operator-framework/api v0.7.1/go.mod h1:L7IvLd/ckxJEJg/t4oTTlnHKAJIP/p51AvEslW3wYdY=
-github.com/operator-framework/api v0.17.0 h1:OXpCP0XJzM7MYgr/zEZDqdOahUxHR9JSYAmmNUIj4W8=
-github.com/operator-framework/api v0.17.0/go.mod h1:kk8xJahHJR3bKqrA+A+1VIrhOTmyV76k+ARv+iV+u1Q=
+github.com/operator-framework/api v0.16.0 h1:swUOhVv7QDszxBTwYM8QAtyeqI4EQHNVAiKMS+xjakY=
+github.com/operator-framework/api v0.16.0/go.mod h1:kk8xJahHJR3bKqrA+A+1VIrhOTmyV76k+ARv+iV+u1Q=
 github.com/operator-framework/operator-registry v1.17.5 h1:LR8m1rFz5Gcyje8WK6iYt+gIhtzqo52zMRALdmTYHT0=
 github.com/operator-framework/operator-registry v1.17.5/go.mod h1:sRQIgDMZZdUcmHltzyCnM6RUoDF+WS8Arj1BQIARDS8=
 github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=