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/09/22 14:57:23 UTC
[camel-k] 05/10: Make builder roles additive rather than duplicating
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 8fc82fb6b41525908229e1782206d1063cdfe800
Author: phantomjinx <p....@phantomjinx.co.uk>
AuthorDate: Tue Jul 27 17:54:10 2021 +0100
Make builder roles additive rather than duplicating
---
pkg/install/builder.go | 6 ++--
pkg/resources/resources.go | 30 +++++++++---------
...g-kubernetes.yaml => builder-role-binding.yaml} | 4 +--
resources/builder/builder-role-openshift.yaml | 36 ----------------------
...lder-role-kubernetes.yaml => builder-role.yaml} | 2 +-
5 files changed, 22 insertions(+), 56 deletions(-)
diff --git a/pkg/install/builder.go b/pkg/install/builder.go
index 82f6752..70926ad 100644
--- a/pkg/install/builder.go
+++ b/pkg/install/builder.go
@@ -41,6 +41,8 @@ func BuilderServiceAccountRoles(ctx context.Context, c client.Client, namespace
func installBuilderServiceAccountRolesOpenShift(ctx context.Context, c client.Client, namespace string) error {
return ResourcesOrCollect(ctx, c, namespace, nil, true, IdentityResourceCustomizer,
"/builder/builder-service-account.yaml",
+ "/builder/builder-role.yaml",
+ "/builder/builder-role-binding.yaml",
"/builder/builder-role-openshift.yaml",
"/builder/builder-role-binding-openshift.yaml",
)
@@ -49,7 +51,7 @@ func installBuilderServiceAccountRolesOpenShift(ctx context.Context, c client.Cl
func installBuilderServiceAccountRolesKubernetes(ctx context.Context, c client.Client, namespace string) error {
return ResourcesOrCollect(ctx, c, namespace, nil, true, IdentityResourceCustomizer,
"/builder/builder-service-account.yaml",
- "/builder/builder-role-kubernetes.yaml",
- "/builder/builder-role-binding-kubernetes.yaml",
+ "/builder/builder-role.yaml",
+ "/builder/builder-role-binding.yaml",
)
}
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 541214d..70d3da7 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -71,13 +71,6 @@ var assets = func() http.FileSystem {
name: "builder",
modTime: time.Time{},
},
- "/builder/builder-role-binding-kubernetes.yaml": &vfsgen۰CompressedFileInfo{
- name: "builder-role-binding-kubernetes.yaml",
- modTime: time.Time{},
- uncompressedSize: 1224,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x93\x41\x6f\xdb\x38\x14\x84\xef\xfc\x15\x03\xeb\x92\x00\xb6\xbc\xbb\xa7\x85\xf7\xa4\x24\xf6\xae\xb0\x81\x0d\x58\x4e\x83\x1c\x29\xea\x59\x7a\x35\x45\xaa\x24\x15\xc5\xfd\xf5\x05\x65\xbb\x49\x50\xb4\xe8\x21\xbc\x09\x7a\x7a\xf3\x0d\x67\x94\x60\xf6\x71\x47\x24\xb8\x67\x45\xc6\x53\x85\x60\x11\x1a\x42\xd6\x49\xd5\x10\x0a\xbb\x0f\x83\x74\x84\x95\xed\x4d\x25\x03\x5b\x83\xab\xac\x58\x5d\xa3\x37\x15\x39\x58\x43\xb0\x0e\xad\x [...]
- },
"/builder/builder-role-binding-openshift.yaml": &vfsgen۰CompressedFileInfo{
name: "builder-role-binding-openshift.yaml",
modTime: time.Time{},
@@ -85,19 +78,26 @@ var assets = func() http.FileSystem {
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\x94\xcd\xba\x15\x1a\xd8\x80\xe5\x34\xc8\x91\xa2\x46\xd2\xd4\x14\x47\x25\xa9\x55\xdc\x5f\x5f\x50\xb6\xbb\x1b\x14\x2d\x7a\x08\x6f\x82\x46\x6f\xbe\xc7\xf7\x94\x61\xfd\xed\x8e\xca\xf0\x81\x0d\xb9\x40\x0d\xa2\x20\xf6\x84\x62\xd4\xa6\x27\x54\xd2\xc6\x59\x7b\xc2\x4e\x26\xd7\xe8\xc8\xe2\xf0\xa6\xa8\x76\x6f\x31\xb9\x86\x3c\xc4\x11\xc4\x63\x10\x [...]
},
- "/builder/builder-role-kubernetes.yaml": &vfsgen۰CompressedFileInfo{
- name: "builder-role-kubernetes.yaml",
+ "/builder/builder-role-binding.yaml": &vfsgen۰CompressedFileInfo{
+ name: "builder-role-binding.yaml",
modTime: time.Time{},
- uncompressedSize: 1462,
+ uncompressedSize: 1202,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x54\xc1\x8e\xdb\x36\x10\xbd\xf3\x2b\x1e\xa4\x4b\x52\xac\xbd\x6d\x4f\x85\x7b\x72\x37\xbb\xad\xd1\xc0\x06\x56\x4e\x83\x1c\x29\x6a\x2c\x0d\x4c\x91\xec\x90\x5a\x65\xfb\xf5\x05\x69\xbb\xf1\x76\x2f\x09\x10\x5e\x34\xa4\x86\x6f\xde\x9b\x37\x52\x8d\xc5\xf7\x5b\xaa\xc6\x7b\x36\xe4\x22\x75\x48\x1e\x69\x20\xac\x83\x36\x03\xa1\xf1\x87\x34\x6b\x21\x3c\xf8\xc9\x75\x3a\xb1\x77\x78\xb3\x6e\x1e\xde\x62\x72\x1d\x09\xbc\x23\x78\xc1\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x93\x41\x6f\xe3\x36\x14\x84\xef\xfc\x15\x03\xeb\x92\x00\xb6\xdc\xf6\x54\xb8\x27\x25\xb1\x5b\xa1\x81\x0d\x58\xce\x06\x39\x52\xd4\xb3\xf4\xd6\x14\xa9\x25\xa9\x28\xde\x5f\xbf\xa0\x6c\x6f\x12\x2c\x36\xa7\xf0\x26\xe8\x69\xde\x37\x9c\x51\x82\xd9\xe7\x1d\x91\xe0\x9e\x15\x19\x4f\x15\x82\x45\x68\x08\x59\x27\x55\x43\x28\xec\x3e\x0c\xd2\x11\x56\xb6\x37\x95\x0c\x6c\x0d\xae\xb2\x62\x75\x8d\xde\x54\xe4\x60\x0d\xc1\x3a\xb4\xd6\x [...]
},
"/builder/builder-role-openshift.yaml": &vfsgen۰CompressedFileInfo{
name: "builder-role-openshift.yaml",
modTime: time.Time{},
- uncompressedSize: 2096,
+ uncompressedSize: 1706,
+
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x53\xc1\x8e\xdb\x36\x10\xbd\xeb\x2b\x1e\xac\x4b\x02\xac\xe5\xb6\xa7\xc2\x3d\xb9\x9b\xdd\xd6\x68\x60\x03\x2b\xa7\x41\x8e\x23\x6a\x2c\x0d\x4c\x91\x2c\x49\xad\xe2\x7e\x7d\x41\xda\x4e\xbc\x75\xd3\x5e\x16\xa8\x2e\x1a\x0f\x9f\xde\xbc\xc7\x37\x2e\x31\x7f\xbd\xa7\x28\xf1\x5e\x14\x9b\xc0\x2d\xa2\x45\xec\x19\x2b\x47\xaa\x67\xd4\x76\x1f\x27\xf2\x8c\x47\x3b\x9a\x96\xa2\x58\x83\x37\xab\xfa\xf1\x2d\x46\xd3\xb2\x87\x35\x0c\xeb\x [...]
+ },
+ "/builder/builder-role.yaml": &vfsgen۰CompressedFileInfo{
+ name: "builder-role.yaml",
+ modTime: time.Time{},
+ uncompressedSize: 1451,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x54\x4d\x8f\xdb\x36\x10\xbd\xf3\x57\x3c\x48\x97\xa4\x58\xcb\x6d\x4f\x85\x7b\x72\x93\xdd\xd6\x68\x60\x03\x2b\xa7\x41\x8e\x63\x6a\x2c\x0d\x96\x22\x59\x92\x5a\x65\xfb\xeb\x0b\xd1\x76\xd6\x8e\xd3\x2f\x34\x40\x74\x31\x35\x7c\x7c\xf3\x1e\xdf\x58\x25\x66\x5f\xee\x51\x25\xde\x88\x66\x1b\xb9\x41\x72\x48\x1d\x63\xe9\x49\x77\x8c\xda\xed\xd3\x48\x81\x71\xe7\x06\xdb\x50\x12\x67\xf1\x62\x59\xdf\xbd\xc4\x60\x1b\x0e\x70\x96\xe1\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x54\xc1\x6e\x1b\x37\x10\xbd\xf3\x2b\x1e\x76\x2f\x49\x61\x49\x6d\x4f\x85\x7a\x52\x1d\xbb\x5d\x34\x90\x00\xaf\xd2\x20\x47\x8a\x3b\xda\x1d\x98\x4b\xb2\x43\xae\x37\xee\xd7\x17\xa4\xa4\x46\xae\x2f\x09\x10\x5e\x34\xa4\x1e\xdf\xbc\xc7\x37\x52\x8d\xc5\xf7\x5b\xaa\xc6\x7b\x36\xe4\x22\x75\x48\x1e\x69\x20\x6c\x82\x36\x03\xa1\xf5\xc7\x34\x6b\x21\xdc\xfb\xc9\x75\x3a\xb1\x77\x78\xb3\x69\xef\xdf\x62\x72\x1d\x09\xbc\x23\x78\xc1\x [...]
},
"/builder/builder-service-account.yaml": &vfsgen۰CompressedFileInfo{
name: "builder-service-account.yaml",
@@ -506,10 +506,10 @@ var assets = func() http.FileSystem {
fs["/addons/master/master-role-lease.tmpl"].(os.FileInfo),
}
fs["/builder"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
- fs["/builder/builder-role-binding-kubernetes.yaml"].(os.FileInfo),
fs["/builder/builder-role-binding-openshift.yaml"].(os.FileInfo),
- fs["/builder/builder-role-kubernetes.yaml"].(os.FileInfo),
+ fs["/builder/builder-role-binding.yaml"].(os.FileInfo),
fs["/builder/builder-role-openshift.yaml"].(os.FileInfo),
+ fs["/builder/builder-role.yaml"].(os.FileInfo),
fs["/builder/builder-service-account.yaml"].(os.FileInfo),
}
fs["/crd"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
diff --git a/resources/builder/builder-role-binding-kubernetes.yaml b/resources/builder/builder-role-binding.yaml
similarity index 94%
rename from resources/builder/builder-role-binding-kubernetes.yaml
rename to resources/builder/builder-role-binding.yaml
index f8fbb5b..4487f6f 100644
--- a/resources/builder/builder-role-binding-kubernetes.yaml
+++ b/resources/builder/builder-role-binding.yaml
@@ -18,7 +18,7 @@
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
- name: camel-k-builder-kubernetes
+ name: camel-k-builder
labels:
app: "camel-k"
subjects:
@@ -26,5 +26,5 @@ subjects:
name: camel-k-builder
roleRef:
kind: Role
- name: camel-k-builder-kubernetes
+ name: camel-k-builder
apiGroup: rbac.authorization.k8s.io
diff --git a/resources/builder/builder-role-openshift.yaml b/resources/builder/builder-role-openshift.yaml
index f20911f..36af16c 100644
--- a/resources/builder/builder-role-openshift.yaml
+++ b/resources/builder/builder-role-openshift.yaml
@@ -23,42 +23,6 @@ metadata:
app: "camel-k"
rules:
- apiGroups:
- - camel.apache.org
- resources:
- - "*"
- verbs:
- - "*"
-- apiGroups:
- - ""
- resources:
- - pods
- verbs:
- - create
- - delete
- - deletecollection
- - get
- - list
- - patch
- - update
- - watch
-- apiGroups:
- - ""
- resources:
- - configmaps
- - secrets
- verbs:
- - get
- - list
- - watch
-- apiGroups:
- - ""
- resources:
- - events
- verbs:
- - get
- - list
- - watch
-- apiGroups:
- ""
- "build.openshift.io"
resources:
diff --git a/resources/builder/builder-role-kubernetes.yaml b/resources/builder/builder-role.yaml
similarity index 97%
rename from resources/builder/builder-role-kubernetes.yaml
rename to resources/builder/builder-role.yaml
index c496741..172eca7 100644
--- a/resources/builder/builder-role-kubernetes.yaml
+++ b/resources/builder/builder-role.yaml
@@ -18,7 +18,7 @@
kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
- name: camel-k-builder-kubernetes
+ name: camel-k-builder
labels:
app: "camel-k"
rules: