Skip to content

Commit ae40092

Browse files
grokspawntmshort
authored andcommitted
introduce spec.runAsRoot field (openshift#258)
Signed-off-by: Jordan <[email protected]> Signed-off-by: Jordan <[email protected]> Upstream-repository: api Upstream-commit: 7339a22050af53df7b6f97a652b8e2d73698765a
1 parent ecc922f commit ae40092

File tree

8 files changed

+23
-4
lines changed

8 files changed

+23
-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
@@ -129,6 +129,9 @@ spec:
129129
type: integer
130130
publisher:
131131
type: string
132+
runAsRoot:
133+
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.
134+
type: boolean
132135
secrets:
133136
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.
134137
type: array

pkg/manifests/csv.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: packageserver
66
namespace: openshift-operator-lifecycle-manager
77
labels:
8-
olm.version: 0.0.0-a87009eda5ab6baceb10a162bd7950bbefc16cf3
8+
olm.version: 0.0.0-6b31ee06559da60ff88865e23cbb6f2b4041571a
99
olm.clusteroperator.name: operator-lifecycle-manager-packageserver
1010
annotations:
1111
include.release.openshift.io/self-managed-high-availability: "true"
@@ -159,7 +159,7 @@ spec:
159159
- packageserver
160160
topologyKey: "kubernetes.io/hostname"
161161
maturity: alpha
162-
version: 0.0.0-a87009eda5ab6baceb10a162bd7950bbefc16cf3
162+
version: 0.0.0-6b31ee06559da60ff88865e23cbb6f2b4041571a
163163
apiservicedefinitions:
164164
owned:
165165
- group: packages.operators.coreos.com

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@ 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
130133
secrets:
131134
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.
132135
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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ type CatalogSourceSpec struct {
8989
// +optional
9090
Secrets []string `json:"secrets,omitempty"`
9191

92+
// RunAsRoot allows admins to indicate that they wish to run the CatalogSource pod in a privileged
93+
// pod as root. This should only be enabled when running older catalog images which could not be run as non-root.
94+
// +optional
95+
RunAsRoot bool `json:"runAsRoot,omitempty"`
96+
9297
// Metadata
9398
DisplayName string `json:"displayName,omitempty"`
9499
Description string `json:"description,omitempty"`

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: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)