diff --git a/crds/operators.coreos.com_catalogsources.yaml b/crds/operators.coreos.com_catalogsources.yaml index d3f1d6331..d8ae8d6f3 100644 --- a/crds/operators.coreos.com_catalogsources.yaml +++ b/crds/operators.coreos.com_catalogsources.yaml @@ -79,6 +79,9 @@ spec: priorityClassName: description: If specified, indicates the pod's priority. If not specified, the pod priority will be default or zero if there is no default. type: string + runAsRoot: + 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. + type: boolean tolerations: description: Tolerations are the catalog source's pod's tolerations. type: array @@ -120,9 +123,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/pkg/operators/v1alpha1/catalogsource_types.go b/pkg/operators/v1alpha1/catalogsource_types.go index ec2a19f6b..16cc3cee9 100644 --- a/pkg/operators/v1alpha1/catalogsource_types.go +++ b/pkg/operators/v1alpha1/catalogsource_types.go @@ -3,11 +3,12 @@ package v1alpha1 import ( "encoding/json" "fmt" + "time" + "github.com/sirupsen/logrus" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "time" ) const ( @@ -88,11 +89,6 @@ type CatalogSourceSpec struct { // +optional Secrets []string `json:"secrets,omitempty"` - // 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. - // +optional - RunAsRoot bool `json:"runAsRoot,omitempty"` - // Metadata DisplayName string `json:"displayName,omitempty"` Description string `json:"description,omitempty"` @@ -116,6 +112,11 @@ type GrpcPodConfig struct { // default. // +optional PriorityClassName *string `json:"priorityClassName,omitempty"` + + // 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. + // +optional + RunAsRoot bool `json:"runAsRoot,omitempty"` } // UpdateStrategy holds all the different types of catalog source update strategies