Skip to content

Commit 90c796c

Browse files
authored
*: set r/x permissions for bundle dirs
permissions for generated bundle directories now have r/x permissions for all users (0755).
1 parent efaf7c6 commit 90c796c

File tree

5 files changed

+18
-5
lines changed

5 files changed

+18
-5
lines changed

changelog/fragments/3129.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
entries:
2+
- description: >
3+
Set bundle dir permissions to 0755 so they can be read by in-cluster tooling.
4+
5+
kind: change
6+
7+
breaking: true
8+
9+
migration:
10+
header: Modify permissions on your bundle manifests directory
11+
body: >
12+
Run `chmod 0755 deploy/olm-catalog/<operator-name>/manifests` to update
13+
your operator's bundle directory permissions.

cmd/operator-sdk/generate/internal/genutil.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func WriteCRDs(w io.Writer, crds ...v1beta1.CustomResourceDefinition) error {
7979
// WriteCRDFiles creates dir then writes each CustomResourceDefinition in crds
8080
// to a file in dir.
8181
func WriteCRDFiles(dir string, crds ...v1beta1.CustomResourceDefinition) error {
82-
if err := os.MkdirAll(dir, 0700); err != nil {
82+
if err := os.MkdirAll(dir, 0755); err != nil {
8383
return err
8484
}
8585
for _, crd := range crds {
@@ -97,7 +97,7 @@ func makeCRDFileName(crd v1beta1.CustomResourceDefinition) string {
9797
// WriteCRDFilesLegacy creates dir then writes each CustomResourceDefinition
9898
// in crds to a file in legacy format in dir.
9999
func WriteCRDFilesLegacy(dir string, crds ...v1beta1.CustomResourceDefinition) error {
100-
if err := os.MkdirAll(dir, 0700); err != nil {
100+
if err := os.MkdirAll(dir, 0755); err != nil {
101101
return err
102102
}
103103
for _, crd := range crds {

internal/generate/internal/genutil.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ type File struct {
4848
// Open first creates dir then opens <dir>/<fileName> for reading and writing,
4949
// creating the file if it does not exist.
5050
func Open(dir, fileName string) (*File, error) {
51-
if err := os.MkdirAll(dir, 0700); err != nil {
51+
if err := os.MkdirAll(dir, 0755); err != nil {
5252
return nil, err
5353
}
5454
f, err := os.OpenFile(filepath.Join(dir, fileName), os.O_RDWR|os.O_CREATE, 0666)

internal/generate/olm-catalog/csv.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ func (g BundleGenerator) Generate() error {
200200
}
201201
}
202202

203-
if err := os.MkdirAll(g.toBundleDir, fileutil.DefaultDirFileMode); err != nil {
203+
if err := os.MkdirAll(g.toBundleDir, 0755); err != nil {
204204
return fmt.Errorf("error mkdir %s: %v", g.toBundleDir, err)
205205
}
206206

internal/generate/olm-catalog/package_manifest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func (g PkgGenerator) Generate() error {
7474
return errors.New("error generating package manifest: no generated file found")
7575
}
7676
pkgManifestOutputDir := filepath.Join(g.OutputDir, OLMCatalogChildDir, g.OperatorName)
77-
if err = os.MkdirAll(pkgManifestOutputDir, fileutil.DefaultDirFileMode); err != nil {
77+
if err = os.MkdirAll(pkgManifestOutputDir, 0755); err != nil {
7878
return fmt.Errorf("error mkdir %s: %v", pkgManifestOutputDir, err)
7979
}
8080
for fileName, b := range fileMap {

0 commit comments

Comments
 (0)