From 17d809ef16de40ac6008a1bb8986ca303b2bdca1 Mon Sep 17 00:00:00 2001 From: Anik Bhattacharjee Date: Tue, 13 Sep 2022 13:57:28 -0400 Subject: [PATCH] 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](https://github.com/operator-framework/api/pull/261). Reverting #2848 so that the new v0.17.0 can be pulled in. See [this comment](https://github.com/operator-framework/operator-lifecycle-manager/pull/2848#issuecomment-1233172716) for more info. Signed-off-by: Anik Bhattacharjee Signed-off-by: Anik Bhattacharjee Upstream-repository: operator-lifecycle-manager Upstream-commit: bfeb1e46819bc840190f4d7d0720712683387973 --- pkg/manifests/csv.yaml | 4 ++-- .../deploy/chart/crds/0000_50_olm_00-catalogsources.crd.yaml | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkg/manifests/csv.yaml b/pkg/manifests/csv.yaml index 966cae3f21..c876c386b0 100644 --- a/pkg/manifests/csv.yaml +++ b/pkg/manifests/csv.yaml @@ -5,7 +5,7 @@ metadata: name: packageserver namespace: openshift-operator-lifecycle-manager labels: - olm.version: 0.0.0-1ebd6d6ad3904ce14b7bce4f06c470179324d100 + olm.version: 0.0.0-131fd665e52f3e20333e55f0b1e5f7ab38164803 olm.clusteroperator.name: operator-lifecycle-manager-packageserver annotations: include.release.openshift.io/self-managed-high-availability: "true" @@ -159,7 +159,7 @@ spec: - packageserver topologyKey: "kubernetes.io/hostname" maturity: alpha - version: 0.0.0-1ebd6d6ad3904ce14b7bce4f06c470179324d100 + version: 0.0.0-131fd665e52f3e20333e55f0b1e5f7ab38164803 apiservicedefinitions: owned: - group: packages.operators.coreos.com 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 index 6f03afbf22..169e1e8149 100644 --- 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