Skip to content

Commit 02c2654

Browse files
committed
(catsrc) move runAsRoot to spec.GrpcConfig from top level spec (openshift#259)
Upstream-commit: c6d2f45bf2e87da37ba1abd19a969faa7975e582 Upstream-repository: api
1 parent 7bc5831 commit 02c2654

File tree

7 files changed

+25
-4
lines changed

7 files changed

+25
-4
lines changed

manifests/0000_50_olm_00-catalogsources.crd.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ spec:
8181
priorityClassName:
8282
description: If specified, indicates the pod's priority. If not specified, the pod priority will be default or zero if there is no default.
8383
type: string
84+
runAsRoot:
85+
description: RunAsRoot allows admins to indicate that they wish to run the container inside the CatalogSource pod in a privileged mode as root. This should only be enabled when running older catalog images which could not be run as non-root.
86+
type: boolean
8487
tolerations:
8588
description: Tolerations are the catalog source's pod's tolerations.
8689
type: array

staging/api/crds/operators.coreos.com_catalogsources.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ spec:
7979
priorityClassName:
8080
description: If specified, indicates the pod's priority. If not specified, the pod priority will be default or zero if there is no default.
8181
type: string
82+
runAsRoot:
83+
description: RunAsRoot allows admins to indicate that they wish to run the container inside the CatalogSource pod in a privileged mode as root. This should only be enabled when running older catalog images which could not be run as non-root.
84+
type: boolean
8285
tolerations:
8386
description: Tolerations are the catalog source's pod's tolerations.
8487
type: array

staging/api/crds/zz_defs.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/api/pkg/operators/v1alpha1/catalogsource_types.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ package v1alpha1
33
import (
44
"encoding/json"
55
"fmt"
6+
"time"
7+
68
"github.com/sirupsen/logrus"
79
corev1 "k8s.io/api/core/v1"
810
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
911
"k8s.io/apimachinery/pkg/types"
10-
"time"
1112
)
1213

1314
const (
@@ -111,6 +112,11 @@ type GrpcPodConfig struct {
111112
// default.
112113
// +optional
113114
PriorityClassName *string `json:"priorityClassName,omitempty"`
115+
116+
// RunAsRoot allows admins to indicate that they wish to run the container inside the CatalogSource pod in a privileged
117+
// mode as root. This should only be enabled when running older catalog images which could not be run as non-root.
118+
// +optional
119+
RunAsRoot bool `json:"runAsRoot,omitempty"`
114120
}
115121

116122
// UpdateStrategy holds all the different types of catalog source update strategies

vendor/github.com/operator-framework/api/crds/operators.coreos.com_catalogsources.yaml

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

vendor/github.com/operator-framework/api/crds/zz_defs.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/operator-framework/api/pkg/operators/v1alpha1/catalogsource_types.go

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)