This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 14db339c4a18d5ee6410eebd7c5080f99cf57170 Author: Antonin Stefanutti <[email protected]> AuthorDate: Tue Feb 9 11:06:06 2021 +0100 chore(install): Move global Kamelets viewer RBAC into the config directory --- .../user-global-kamelet-viewer-role-binding.yaml | 0 .../rbac}/user-global-kamelet-viewer-role.yaml | 0 pkg/install/kamelets.go | 4 +-- pkg/resources/resources.go | 32 +++++++++++----------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/deploy/user-global-kamelet-viewer-role-binding.yaml b/config/rbac/user-global-kamelet-viewer-role-binding.yaml similarity index 100% rename from deploy/user-global-kamelet-viewer-role-binding.yaml rename to config/rbac/user-global-kamelet-viewer-role-binding.yaml diff --git a/deploy/user-global-kamelet-viewer-role.yaml b/config/rbac/user-global-kamelet-viewer-role.yaml similarity index 100% rename from deploy/user-global-kamelet-viewer-role.yaml rename to config/rbac/user-global-kamelet-viewer-role.yaml diff --git a/pkg/install/kamelets.go b/pkg/install/kamelets.go index e10330f..b3f23f0 100644 --- a/pkg/install/kamelets.go +++ b/pkg/install/kamelets.go @@ -90,8 +90,8 @@ func KameletCatalog(ctx context.Context, c client.Client, namespace string) erro // KameletViewerRole installs the role that allows any user ro access kamelets in the global namespace func KameletViewerRole(ctx context.Context, c client.Client, namespace string) error { - if err := Resource(ctx, c, namespace, true, IdentityResourceCustomizer, "user-global-kamelet-viewer-role.yaml"); err != nil { + if err := Resource(ctx, c, namespace, true, IdentityResourceCustomizer, "/rbac/user-global-kamelet-viewer-role.yaml"); err != nil { return err } - return Resource(ctx, c, namespace, true, IdentityResourceCustomizer, "user-global-kamelet-viewer-role-binding.yaml") + return Resource(ctx, c, namespace, true, IdentityResourceCustomizer, "/rbac/user-global-kamelet-viewer-role-binding.yaml") } diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index 401eeb2..a46f892 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -330,6 +330,20 @@ var assets = func() http.FileSystem { compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\xc1\x8e\xdb\x36\x10\xbd\xf3\x2b\x1e\xa4\x4b\x52\xac\xe5\xb6\xa7\x42\x3d\xb9\x9b\xdd\x56\x68\x60\x03\x2b\xa7\x41\x50\xf4\x40\x8b\x63\x69\xb0\x14\xa9\x0e\xa9\x55\xb6\x5f\x5f\x90\xb6\x37\x5e\x14\x3d\x04\x08\x6f\x24\x87\x6f\xde\x9b\xf7\x58\x62\xf5\xed\x96\x2a\xf1\x9e\x3b\x72\x81\x0c\xa2\x47\x1c\x08\x9b\x49\x77\x03\xa1\xf5\xc7\xb8\x68\x21\xdc\xfb\xd9\x19\x1d\xd9\x3b\xbc\xd9\xb4\xf7\x6f\x31\x3b\x43\x02\xef\x08\x5e\x [...] }, + "/rbac/user-global-kamelet-viewer-role-binding.yaml": &vfsgen۰CompressedFileInfo{ + name: "user-global-kamelet-viewer-role-binding.yaml", + modTime: time.Time{}, + uncompressedSize: 1250, + + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\xcd\x6e\xda\x4c\x14\xdd\xcf\x53\x1c\xe1\x4d\x22\x81\xf9\xbe\xae\x2a\x77\x45\x12\x68\xad\x46\x20\x61\xd2\x28\xcb\x8b\x7d\xb1\x6f\xb1\x67\xdc\x99\x71\x1c\xfa\xf4\xd5\x18\xc8\x8f\x2a\xb5\xaa\x94\xd9\x20\x34\x77\xce\xcf\x3d\xc7\x11\x26\xef\x77\x54\x84\x5b\xc9\x59\x3b\x2e\xe0\x0d\x7c\xc5\x98\xb5\x94\x57\x8c\xcc\xec\x7c\x4f\x96\xb1\x30\x9d\x2e\xc8\x8b\xd1\xb8\x98\x65\x8b\x4b\x74\xba\x60\x0b\xa3\x19\xc6\xa2\x31\x96\x [...] + }, + "/rbac/user-global-kamelet-viewer-role.yaml": &vfsgen۰CompressedFileInfo{ + name: "user-global-kamelet-viewer-role.yaml", + modTime: time.Time{}, + uncompressedSize: 1166, + + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4f\x6f\xfa\x46\x14\xbc\xef\xa7\x18\xe1\x4b\x22\x81\x69\x7b\xaa\xe8\x89\x26\xd0\x5a\x8d\x40\xc2\xa4\x51\x8e\x8b\xfd\xb0\x9f\x58\xef\xba\x6f\xd7\x38\xf4\xd3\x57\x6b\x4c\x43\xf4\xbb\x66\x2f\xeb\x3f\xe3\x37\x33\x3b\xe3\x04\xb3\xef\x5b\x2a\xc1\x0b\x17\x64\x3d\x95\x08\x0e\xa1\x26\x2c\x5b\x5d\xd4\x84\xdc\x1d\x43\xaf\x85\xb0\x76\x9d\x2d\x75\x60\x67\xf1\xb0\xcc\xd7\x8f\xe8\x6c\x49\x02\x67\x09\x4e\xd0\x38\x21\x95\xa0\x [...] + }, "/samples": &vfsgen۰DirInfo{ name: "samples", modTime: time.Time{}, @@ -514,20 +528,6 @@ var assets = func() http.FileSystem { compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3d\xfd\x6f\x1b\x37\x96\xbf\xf7\xaf\x20\x74\x07\xd8\x32\xa4\xb1\xd3\x45\xb7\x5d\xdf\xf5\x0a\x37\x49\x77\xdd\xe6\xc3\x17\xa7\x5d\x1c\x7a\x8b\x15\x35\xf3\x24\x31\xe6\x90\xb3\x24\x47\x8e\x7a\xb8\xff\xfd\xc0\xc7\xcf\x19\x8d\xed\x71\x62\x17\x5e\xe0\x90\x1f\x62\x49\x43\xf2\xf1\xf1\x7d\x7f\x70\x8c\xa2\xcc\xe8\xd3\x2f\xe6\x44\xd0\x1a\x4e\x09\x5d\xad\x98\x60\x66\xf7\x05\x21\x0d\xa7\x66\x25\x55\x7d\x4a\x56\x94\x6b\xb0\xdf\x [...] }, - "/user-global-kamelet-viewer-role-binding.yaml": &vfsgen۰CompressedFileInfo{ - name: "user-global-kamelet-viewer-role-binding.yaml", - modTime: time.Time{}, - uncompressedSize: 1250, - - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\xcd\x6e\xda\x4c\x14\xdd\xcf\x53\x1c\xe1\x4d\x22\x81\xf9\xbe\xae\x2a\x77\x45\x12\x68\xad\x46\x20\x61\xd2\x28\xcb\x8b\x7d\xb1\x6f\xb1\x67\xdc\x99\x71\x1c\xfa\xf4\xd5\x18\xc8\x8f\x2a\xb5\xaa\x94\xd9\x20\x34\x77\xce\xcf\x3d\xc7\x11\x26\xef\x77\x54\x84\x5b\xc9\x59\x3b\x2e\xe0\x0d\x7c\xc5\x98\xb5\x94\x57\x8c\xcc\xec\x7c\x4f\x96\xb1\x30\x9d\x2e\xc8\x8b\xd1\xb8\x98\x65\x8b\x4b\x74\xba\x60\x0b\xa3\x19\xc6\xa2\x31\x96\x [...] - }, - "/user-global-kamelet-viewer-role.yaml": &vfsgen۰CompressedFileInfo{ - name: "user-global-kamelet-viewer-role.yaml", - modTime: time.Time{}, - uncompressedSize: 1166, - - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4f\x6f\xfa\x46\x14\xbc\xef\xa7\x18\xe1\x4b\x22\x81\x69\x7b\xaa\xe8\x89\x26\xd0\x5a\x8d\x40\xc2\xa4\x51\x8e\x8b\xfd\xb0\x9f\x58\xef\xba\x6f\xd7\x38\xf4\xd3\x57\x6b\x4c\x43\xf4\xbb\x66\x2f\xeb\x3f\xe3\x37\x33\x3b\xe3\x04\xb3\xef\x5b\x2a\xc1\x0b\x17\x64\x3d\x95\x08\x0e\xa1\x26\x2c\x5b\x5d\xd4\x84\xdc\x1d\x43\xaf\x85\xb0\x76\x9d\x2d\x75\x60\x67\xf1\xb0\xcc\xd7\x8f\xe8\x6c\x49\x02\x67\x09\x4e\xd0\x38\x21\x95\xa0\x [...] - }, } fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ fs["/addons"].(os.FileInfo), @@ -542,8 +542,6 @@ var assets = func() http.FileSystem { fs["/scorecard"].(os.FileInfo), fs["/templates"].(os.FileInfo), fs["/traits.yaml"].(os.FileInfo), - fs["/user-global-kamelet-viewer-role-binding.yaml"].(os.FileInfo), - fs["/user-global-kamelet-viewer-role.yaml"].(os.FileInfo), } fs["/addons"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ fs["/addons/master"].(os.FileInfo), @@ -601,6 +599,8 @@ var assets = func() http.FileSystem { fs["/rbac/operator-role-servicemonitors.yaml"].(os.FileInfo), fs["/rbac/operator-role-strimzi.yaml"].(os.FileInfo), fs["/rbac/user-cluster-role.yaml"].(os.FileInfo), + fs["/rbac/user-global-kamelet-viewer-role-binding.yaml"].(os.FileInfo), + fs["/rbac/user-global-kamelet-viewer-role.yaml"].(os.FileInfo), } fs["/samples"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ fs["/samples/bases"].(os.FileInfo),
