You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2021/02/09 11:18:03 UTC
[camel-k] branch master updated (9b4fbc2 -> 50a2bbd)
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from 9b4fbc2 chore: Remove dependency on sigs.k8s.io/yaml
new 7ec3c79 chore(install): Remove duplicated Leases RBAC resources
new 14db339 chore(install): Move global Kamelets viewer RBAC into the config directory
new 50a2bbd chore: Rebuild resources
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../user-global-kamelet-viewer-role-binding.yaml | 0
.../rbac}/user-global-kamelet-viewer-role.yaml | 0
deploy/operator-role-binding-leases.yaml | 30 ------
deploy/operator-role-leases.yaml | 37 --------
pkg/install/kamelets.go | 4 +-
pkg/install/operator.go | 10 +-
pkg/resources/resources.go | 105 +++++----------------
7 files changed, 28 insertions(+), 158 deletions(-)
rename {deploy => config/rbac}/user-global-kamelet-viewer-role-binding.yaml (100%)
rename {deploy => config/rbac}/user-global-kamelet-viewer-role.yaml (100%)
delete mode 100644 deploy/operator-role-binding-leases.yaml
delete mode 100644 deploy/operator-role-leases.yaml
[camel-k] 02/03: chore(install): Move global Kamelets viewer RBAC
into the config directory
Posted by as...@apache.org.
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 <an...@stefanutti.fr>
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),
[camel-k] 03/03: chore: Rebuild resources
Posted by as...@apache.org.
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 50a2bbda65b3f108a9f6814a5c2fd041d829e963
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Tue Feb 9 11:08:06 2021 +0100
chore: Rebuild resources
---
pkg/resources/resources.go | 71 ++++++----------------------------------------
1 file changed, 8 insertions(+), 63 deletions(-)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index a46f892..a313d1c 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -430,6 +430,13 @@ var assets = func() http.FileSystem {
compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x34\x8e\xb1\x6a\xc3\x30\x14\x45\x77\x7d\xc5\x1d\x0a\x92\xa1\xad\xdc\x55\x60\x0a\xed\xd2\xd2\x0f\xe8\x2c\xe2\x67\x47\x8e\xe4\x67\x9e\x64\x88\x09\xf9\xf7\xa0\x24\x1e\xef\x81\x73\xb8\xd6\xe2\xe0\x13\xc5\xb7\x93\x43\xf4\xf3\xb8\xfa\x91\xba\x29\x2b\x65\x2d\xfe\x25\x14\xc2\xc6\xab\x40\x78\x2d\x94\x71\x24\xa1\x57\x0c\x2c\xa0\xb3\x4f\x4b\x24\xa7\x06\xe1\x64\x74\x09\x89\xc4\x4d\xf9\x73\x21\x09\xdc\x77\x1f\x6d\xdb\xea\x46\x01\x [...]
},
+ "/templates/kamelet.tmpl": &vfsgen۰CompressedFileInfo{
+ name: "kamelet.tmpl",
+ modTime: time.Time{},
+ uncompressedSize: 876,
+
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x74\x52\x4b\x8e\xdb\x30\x0c\xdd\xfb\x14\x84\xbb\x4e\x26\xd9\x0a\xe8\x09\x8a\x16\xb3\x08\xba\x1e\x46\x62\x6c\xd6\xfa\x55\xa2\x93\x06\x46\xee\x5e\x58\x96\x93\xcc\x4c\xbb\xe4\xf3\xfb\x99\xe2\x17\xd0\xe8\xc8\x6e\x06\x05\x16\x7d\x37\x62\x47\x5f\x87\x19\x21\x69\x1a\x8c\xfc\x93\x52\xe6\xe0\xd5\x42\xdb\x62\x44\xdd\xd3\x36\xa4\xee\xe5\xbc\x47\x1b\x7b\xdc\x37\x03\x7b\xa3\xe0\x5b\x15\x39\x12\x34\x28\xa8\x1a\x00\x8f\x8e\x14\x4c\x [...]
+ },
"/templates/kts.tmpl": &vfsgen۰CompressedFileInfo{
name: "kts.tmpl",
modTime: time.Time{},
@@ -458,69 +465,6 @@ var assets = func() http.FileSystem {
compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x4b\x77\xdb\x3a\xb2\xee\x3c\xbf\x82\x6b\x67\x72\xce\xba\xcd\xea\xbd\x93\xd3\xbd\xef\xca\x1d\xd9\x72\xec\xd8\xb1\x1d\x27\x72\x27\xe9\x9e\xec\x05\x91\x90\x04\x8b\x24\x68\x00\x92\xed\xfc\xfa\xbb\xf0\xe0\x4b\x92\x8b\x22\x0d\xf8\x78\x60\x52\x44\xe1\x2b\xa0\xf0\x06\x0a\x55\x6f\xa3\xd8\xdf\xdf\x9b\xb7\xd1\x25\x4b\x68\x21\x69\x1a\x29\x1e\xa9\x25\x8d\x8e\x4a\x92\x2c\x69\x34\xe5\x73\xf5\x40\x04\x8d\x4e\xf9\xba\x48\x89\x [...]
},
- "/crd-build.yaml": &vfsgen۰CompressedFileInfo{
- name: "crd-build.yaml",
- modTime: time.Time{},
- uncompressedSize: 315173,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\xfd\x73\x1b\x37\x92\x30\x8e\xff\x9e\xbf\x02\xa5\x6c\x95\xa4\x8b\x48\xd9\x77\xf9\xee\xed\x69\xaf\x2e\xa5\x58\x72\x4e\x95\xd8\xd6\x63\xca\xc9\xf7\x2a\x9b\xdb\x02\x67\x40\x12\xab\x19\x60\x02\x60\x28\x73\x9f\x3c\xff\xfb\xa7\xd0\x00\xe6\x85\x2f\x62\x63\x48\xca\x72\x32\xf8\xc5\x16\xc9\xe9\x01\x1a\x8d\x46\xbf\xf7\x97\x64\xb0\xbf\xf1\xc5\x97\xe4\x07\x9e\x30\xa1\x59\x4a\x8c\x24\x66\xc6\xc8\x65\x41\x93\x19\x23\x23\x39\x [...]
- },
- "/crd-camel-catalog.yaml": &vfsgen۰CompressedFileInfo{
- name: "crd-camel-catalog.yaml",
- modTime: time.Time{},
- uncompressedSize: 13133,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5a\x5f\x93\xe2\xb8\x11\x7f\xf7\xa7\xe8\x1a\x1e\xf6\xae\x6a\x30\xb7\x49\x1e\x52\xe4\x89\xb0\xb3\x15\x6a\xf7\x66\xa6\x06\x6e\xaf\xee\x51\xd8\x8d\xd1\x8e\x2c\x39\x92\x0c\x4b\x52\xf9\xee\x29\x49\x36\xb6\x01\xdb\xf2\x1c\x5b\x93\x3f\xd3\x4f\x60\xb5\xbb\x5b\xbf\xfe\x6b\x5b\x23\x18\x5f\x8f\x82\x11\x7c\xa6\x11\x72\x85\x31\x68\x01\x7a\x8b\x30\xcb\x48\xb4\x45\x58\x8a\x8d\xde\x13\x89\xf0\x51\xe4\x3c\x26\x9a\x0a\x0e\x3f\xcc\x [...]
- },
- "/crd-integration-kit.yaml": &vfsgen۰CompressedFileInfo{
- name: "crd-integration-kit.yaml",
- modTime: time.Time{},
- uncompressedSize: 7815,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x58\x5f\x93\xe2\xb8\x11\x7f\xf7\xa7\xe8\x1a\x1e\xf6\xae\x6a\x30\xb7\x49\x1e\x52\xe4\x89\xb0\x3b\x15\x6a\x77\x67\xa6\x06\xf6\xae\xae\x6a\x5f\x1a\xbb\x31\x7d\xc8\x92\x23\xc9\x30\x93\x54\xbe\x7b\x4a\x92\x0d\xf6\x60\x03\xc3\xed\xfa\x09\x2c\xa9\xfb\xd7\xff\x7e\xdd\xd6\x00\x86\xdf\xef\x89\x06\xf0\x99\x13\x92\x86\x52\xb0\x0a\xec\x9a\x60\x52\x60\xb2\x26\x98\xab\x95\xdd\xa1\x26\xb8\x53\xa5\x4c\xd1\xb2\x92\xf0\xd3\x64\x7e\x [...]
- },
- "/crd-integration-platform.yaml": &vfsgen۰CompressedFileInfo{
- name: "crd-integration-platform.yaml",
- modTime: time.Time{},
- uncompressedSize: 16886,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5b\xdf\x8f\xe2\x38\xf2\x7f\xcf\x5f\x51\x1a\x1e\x66\x57\x6a\x60\xe7\xfb\xbd\x87\x13\xf7\x70\xea\x65\x66\x74\x68\x66\xba\x5b\x0d\x33\xab\x7d\x34\x49\x11\xbc\x38\x76\xce\x3f\x9a\x61\x4f\xf7\xbf\x9f\x5c\x4e\x20\x40\x12\x42\x77\xaf\x4e\xba\x8d\x5f\xba\x21\x76\xf9\x53\x55\xae\x8f\xcb\x2e\x32\x80\xe1\xeb\xb5\x68\x00\x9f\x79\x8c\xd2\x60\x02\x56\x81\x5d\x23\xdc\xe6\x2c\x5e\x23\xcc\xd5\xca\x6e\x99\x46\xf8\xa8\x9c\x4c\x98\x [...]
- },
- "/crd-integration.yaml": &vfsgen۰CompressedFileInfo{
- name: "crd-integration.yaml",
- modTime: time.Time{},
- uncompressedSize: 14485,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x1b\x4d\x73\xe2\x38\xf6\xee\x5f\xf1\x2a\x1c\xba\xbb\x2a\x98\xe9\x99\x3d\x6c\xb1\x27\x96\xee\xd4\xb2\x9d\x4e\x52\x81\x9e\xa9\x3e\x0a\xfb\x61\x34\x91\x25\xaf\x24\x43\x98\xad\xfd\xef\x5b\x7a\xb2\xc1\x06\xdb\x10\xd2\xb3\x33\x3b\x83\x4f\x89\xa5\xa7\xf7\xfd\x29\xd3\x83\xfe\xb7\x7b\x82\x1e\xdc\xf2\x08\xa5\xc1\x18\xac\x02\xbb\x44\x18\x65\x2c\x5a\x22\x4c\xd5\xc2\xae\x99\x46\xb8\x51\xb9\x8c\x99\xe5\x4a\xc2\xdb\xd1\xf4\xe6\x [...]
- },
- "/crd-kamelet-binding.yaml": &vfsgen۰CompressedFileInfo{
- name: "crd-kamelet-binding.yaml",
- modTime: time.Time{},
- uncompressedSize: 36347,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6b\x4f\x23\xb9\xd2\xf0\xf7\xfc\x8a\x12\xac\x34\x20\xd1\xb9\x10\x98\x9d\xc9\xfb\x61\xc4\xc2\xb0\x6f\xce\xce\x00\x22\x70\x8e\xf6\x81\x39\x92\xd3\x5d\x49\xbc\x74\xdb\x7d\x6c\x77\x42\x9e\x85\xff\xfe\xc8\x76\x77\xd2\xb9\xf4\x25\x04\xe6\xcc\x48\x6d\x69\x34\x49\xb7\x5d\xae\xbb\xcb\x65\x17\xd9\x05\xe7\xf5\x5a\x6d\x17\xbe\x50\x17\x99\x44\x0f\x14\x07\x35\x42\x38\x09\x89\x3b\x42\xe8\xf1\x81\x9a\x10\x81\x70\xce\x23\xe6\x [...]
- },
- "/crd-kamelet.yaml": &vfsgen۰CompressedFileInfo{
- name: "crd-kamelet.yaml",
- modTime: time.Time{},
- uncompressedSize: 24019,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\x7d\x4f\xe3\x3a\xba\xff\xbf\x9f\xe2\x11\x1c\xe9\x30\x12\x29\x2d\x85\x39\x33\xbd\x7f\x20\x0e\x0c\x7b\x7b\x0f\x07\x10\x85\x5d\x9d\x0b\xb3\x92\x9b\x3c\x6d\xbd\x24\x76\xd6\x76\x28\xec\x81\xef\x7e\x65\x3b\x69\xd3\x97\x24\x4e\x29\xec\xe8\x6a\x2d\x8d\xa6\x4d\xed\x9f\x9f\x37\x3f\x7e\xfb\x91\x6d\xf0\x36\x57\x1a\xdb\x70\x4e\x7d\x64\x12\x03\x50\x1c\xd4\x18\xe1\x38\x26\xfe\x18\xa1\xcf\x87\x6a\x42\x04\xc2\x19\x4f\x58\x40\x [...]
- },
- "/operator-role-binding-leases.yaml": &vfsgen۰CompressedFileInfo{
- name: "operator-role-binding-leases.yaml",
- modTime: time.Time{},
- uncompressedSize: 1219,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x93\x41\x8f\xdb\x36\x10\x85\xef\xfc\x15\x0f\xd6\x25\x01\xd6\x72\xdb\x53\xe1\x9e\x9c\xcd\x6e\x2b\x34\xb0\x01\xcb\x69\x90\xe3\x98\x1a\x4b\xd3\xa5\x38\x2a\x49\xad\xe2\xfe\xfa\x82\xb2\xdd\xdd\xa0\x68\xd1\x43\x78\x13\x34\x7a\xf3\x3d\xbe\xa7\x02\xcb\x6f\x77\x4c\x81\x0f\x62\xd9\x47\x6e\x90\x14\xa9\x63\x6c\x06\xb2\x1d\xa3\xd6\x53\x9a\x28\x30\x1e\x75\xf4\x0d\x25\x51\x8f\x37\x9b\xfa\xf1\x2d\x46\xdf\x70\x80\x7a\x86\x06\xf4\x [...]
- },
- "/operator-role-leases.yaml": &vfsgen۰CompressedFileInfo{
- name: "operator-role-leases.yaml",
- modTime: time.Time{},
- uncompressedSize: 1232,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4d\x6f\xdb\x46\x10\xbd\xef\xaf\x78\x10\x2f\x09\x60\xd1\x6d\x4f\x85\x7a\x52\x1d\xbb\x25\x1a\x48\x80\xa9\x34\xc8\x71\xb5\x1c\x91\x03\x2f\x77\xb6\xb3\x4b\x33\xee\xaf\x2f\x96\x92\x12\x1b\xbd\x86\xa7\xd1\xea\xf1\x7d\xec\x1b\x56\x58\xff\xb8\xc7\x54\xf8\xc8\x8e\x42\xa2\x0e\x59\x90\x07\xc2\x36\x5a\x37\x10\x5a\x39\xe5\xd9\x2a\xe1\x41\xa6\xd0\xd9\xcc\x12\xf0\x6e\xdb\x3e\xbc\xc7\x14\x3a\x52\x48\x20\x88\x62\x14\x25\x53\x [...]
- },
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
modTime: time.Time{},
@@ -618,6 +562,7 @@ var assets = func() http.FileSystem {
fs["/templates/groovy.tmpl"].(os.FileInfo),
fs["/templates/java.tmpl"].(os.FileInfo),
fs["/templates/js.tmpl"].(os.FileInfo),
+ fs["/templates/kamelet.tmpl"].(os.FileInfo),
fs["/templates/kts.tmpl"].(os.FileInfo),
fs["/templates/xml.tmpl"].(os.FileInfo),
fs["/templates/yaml.tmpl"].(os.FileInfo),
[camel-k] 01/03: chore(install): Remove duplicated Leases RBAC
resources
Posted by as...@apache.org.
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 7ec3c799704018ddd092968c7af9b94fc31319c8
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Tue Feb 9 10:58:28 2021 +0100
chore(install): Remove duplicated Leases RBAC resources
---
deploy/operator-role-binding-leases.yaml | 30 --------------------------
deploy/operator-role-leases.yaml | 37 --------------------------------
pkg/install/operator.go | 10 ++-------
pkg/resources/resources.go | 2 --
4 files changed, 2 insertions(+), 77 deletions(-)
diff --git a/deploy/operator-role-binding-leases.yaml b/deploy/operator-role-binding-leases.yaml
deleted file mode 100644
index 5bbc4ef..0000000
--- a/deploy/operator-role-binding-leases.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
- name: camel-k-operator-leases
- labels:
- app: "camel-k"
-subjects:
-- kind: ServiceAccount
- name: camel-k-operator
-roleRef:
- kind: Role
- name: camel-k-operator-leases
- apiGroup: rbac.authorization.k8s.io
diff --git a/deploy/operator-role-leases.yaml b/deploy/operator-role-leases.yaml
deleted file mode 100644
index 4223e8e..0000000
--- a/deploy/operator-role-leases.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-kind: Role
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
- name: camel-k-operator-leases
- labels:
- app: "camel-k"
-rules:
-- apiGroups:
- - "coordination.k8s.io"
- resources:
- - leases
- verbs:
- - create
- - delete
- - deletecollection
- - get
- - list
- - patch
- - update
- - watch
diff --git a/pkg/install/operator.go b/pkg/install/operator.go
index cd58afa..d4e503d 100644
--- a/pkg/install/operator.go
+++ b/pkg/install/operator.go
@@ -267,17 +267,11 @@ func installMonitoringResources(ctx context.Context, c client.Client, namespace
func installLeaseBindings(ctx context.Context, c client.Client, namespace string, customizer ResourceCustomizer, collection *kubernetes.Collection, force bool) error {
return ResourcesOrCollect(ctx, c, namespace, collection, force, customizer,
- "operator-role-leases.yaml",
- "operator-role-binding-leases.yaml",
+ "/rbac/operator-role-leases.yaml",
+ "/rbac/operator-role-binding-leases.yaml",
)
}
-// Platform installs the platform custom resource
-// nolint: lll
-func Platform(ctx context.Context, c client.Client, clusterType string, namespace string, registry v1.IntegrationPlatformRegistrySpec) (*v1.IntegrationPlatform, error) {
- return PlatformOrCollect(ctx, c, clusterType, namespace, registry, nil)
-}
-
// PlatformOrCollect --
// nolint: lll
func PlatformOrCollect(ctx context.Context, c client.Client, clusterType string, namespace string, registry v1.IntegrationPlatformRegistrySpec, collection *kubernetes.Collection) (*v1.IntegrationPlatform, error) {
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 1f31b0c..401eeb2 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -536,8 +536,6 @@ var assets = func() http.FileSystem {
fs["/default"].(os.FileInfo),
fs["/manager"].(os.FileInfo),
fs["/manifests"].(os.FileInfo),
- fs["/operator-role-binding-leases.yaml"].(os.FileInfo),
- fs["/operator-role-leases.yaml"].(os.FileInfo),
fs["/prometheus"].(os.FileInfo),
fs["/rbac"].(os.FileInfo),
fs["/samples"].(os.FileInfo),