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 e1b26afaef63f6e0bc9d3997c089ea5e122efa00 Author: phantomjinx <[email protected]> AuthorDate: Wed May 5 11:09:52 2021 +0100 Migrates builder resources to resources directory * Builder service account and related roles are operand managed by the operator and so are resources rather than configuration/install time artifacts --- pkg/install/builder.go | 12 ++-- pkg/resources/resources.go | 79 +++++++++++++--------- .../builder/builder-role-binding-kubernetes.yaml | 4 +- .../builder/builder-role-binding-openshift.yaml | 4 +- .../builder}/builder-role-kubernetes.yaml | 2 +- .../builder}/builder-role-openshift.yaml | 2 +- .../builder}/builder-service-account.yaml | 0 7 files changed, 59 insertions(+), 44 deletions(-) diff --git a/pkg/install/builder.go b/pkg/install/builder.go index 3072e24..82f6752 100644 --- a/pkg/install/builder.go +++ b/pkg/install/builder.go @@ -40,16 +40,16 @@ 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, - "/manager/builder-service-account.yaml", - "/rbac/builder-role-openshift.yaml", - "/rbac/builder-role-binding.yaml", + "/builder/builder-service-account.yaml", + "/builder/builder-role-openshift.yaml", + "/builder/builder-role-binding-openshift.yaml", ) } func installBuilderServiceAccountRolesKubernetes(ctx context.Context, c client.Client, namespace string) error { return ResourcesOrCollect(ctx, c, namespace, nil, true, IdentityResourceCustomizer, - "/manager/builder-service-account.yaml", - "/rbac/builder-role-kubernetes.yaml", - "/rbac/builder-role-binding.yaml", + "/builder/builder-service-account.yaml", + "/builder/builder-role-kubernetes.yaml", + "/builder/builder-role-binding-kubernetes.yaml", ) } diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index 15cabbc..541214d 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -67,6 +67,45 @@ var assets = func() http.FileSystem { compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x8e\x31\x4e\xc4\x30\x10\x45\x7b\x9f\x62\x94\x3e\x41\x74\xc8\x17\xa0\xa3\xa0\xa0\x9f\xd8\x5f\xac\x15\xc7\x63\x8d\xed\x45\x62\xb5\x77\x47\xeb\x04\x69\x21\xdb\x7d\xff\x19\xbf\x79\x4b\x48\xde\xd2\xbb\x44\x18\xce\xe1\x03\x5a\x82\x24\x4b\x3a\xb3\x9b\xb8\xd5\x93\x68\xf8\xe6\x1a\x24\x4d\xcb\x4b\x99\x82\x3c\x9d\x9f\xcd\x8a\xca\x9e\x2b\x5b\x43\x94\x78\x85\xa5\xcb\x85\xa6\x37\x5e\x41\xd7\xeb\xde\x95\xcc\xee\x6e\xd0\x9f\xdb\x [...] }, + "/builder": &vfsgen۰DirInfo{ + 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{}, + uncompressedSize: 1222, + + 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", + modTime: time.Time{}, + uncompressedSize: 1462, + + 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 [...] + }, + "/builder/builder-role-openshift.yaml": &vfsgen۰CompressedFileInfo{ + name: "builder-role-openshift.yaml", + modTime: time.Time{}, + uncompressedSize: 2096, + + 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 [...] + }, + "/builder/builder-service-account.yaml": &vfsgen۰CompressedFileInfo{ + name: "builder-service-account.yaml", + modTime: time.Time{}, + uncompressedSize: 1038, + + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x3d\x6f\xdb\x30\x14\xdc\xf9\x2b\x0e\xd6\x92\x00\xfe\x68\x3b\xba\x93\x9a\xd8\xa8\xd0\xc0\x06\x22\xa7\x41\xc6\x67\xf1\x59\x7a\x08\x45\xaa\x24\x15\xc5\xff\xbe\xa0\x6c\x37\x09\xba\x86\x9b\xa0\xd3\x7d\xf0\x4e\x19\x66\x9f\x77\x54\x86\x3b\xa9\xd8\x06\xd6\x88\x0e\xb1\x61\xe4\x1d\x55\x0d\xa3\x74\x87\x38\x90\x67\xac\x5d\x6f\x35\x45\x71\x16\x57\x79\xb9\xbe\x46\x6f\x35\x7b\x38\xcb\x70\x1e\xad\xf3\xac\x32\x54\xce\x46\x2f\x [...] + }, "/crd": &vfsgen۰DirInfo{ name: "crd", modTime: time.Time{}, @@ -132,13 +171,6 @@ var assets = func() http.FileSystem { name: "manager", modTime: time.Time{}, }, - "/manager/builder-service-account.yaml": &vfsgen۰CompressedFileInfo{ - name: "builder-service-account.yaml", - modTime: time.Time{}, - uncompressedSize: 1038, - - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x3d\x6f\xdb\x30\x14\xdc\xf9\x2b\x0e\xd6\x92\x00\xfe\x68\x3b\xba\x93\x9a\xd8\xa8\xd0\xc0\x06\x22\xa7\x41\xc6\x67\xf1\x59\x7a\x08\x45\xaa\x24\x15\xc5\xff\xbe\xa0\x6c\x37\x09\xba\x86\x9b\xa0\xd3\x7d\xf0\x4e\x19\x66\x9f\x77\x54\x86\x3b\xa9\xd8\x06\xd6\x88\x0e\xb1\x61\xe4\x1d\x55\x0d\xa3\x74\x87\x38\x90\x67\xac\x5d\x6f\x35\x45\x71\x16\x57\x79\xb9\xbe\x46\x6f\x35\x7b\x38\xcb\x70\x1e\xad\xf3\xac\x32\x54\xce\x46\x2f\x [...] - }, "/manager/operator-deployment.yaml": &vfsgen۰CompressedFileInfo{ name: "operator-deployment.yaml", modTime: time.Time{}, @@ -175,27 +207,6 @@ var assets = func() http.FileSystem { name: "rbac", modTime: time.Time{}, }, - "/rbac/builder-role-binding.yaml": &vfsgen۰CompressedFileInfo{ - name: "builder-role-binding.yaml", - modTime: time.Time{}, - uncompressedSize: 1202, - - 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 [...] - }, - "/rbac/builder-role-kubernetes.yaml": &vfsgen۰CompressedFileInfo{ - name: "builder-role-kubernetes.yaml", - modTime: time.Time{}, - uncompressedSize: 1451, - - 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 [...] - }, - "/rbac/builder-role-openshift.yaml": &vfsgen۰CompressedFileInfo{ - name: "builder-role-openshift.yaml", - modTime: time.Time{}, - uncompressedSize: 2086, - - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x54\x4f\x8f\xdb\xb6\x13\xbd\xf3\x53\x3c\x48\x97\xe4\x87\xb5\xfc\x6b\x4f\x85\x7b\x72\x37\xbb\xad\xd1\xc0\x06\x56\x4e\x83\x1c\xc7\xd4\x58\x1a\x2c\x45\xb2\x24\xb5\xca\xf6\xd3\x17\xa2\xed\xae\x1d\xa7\xff\xd0\x00\xd1\xc5\xd4\xf0\xf1\xcd\x7b\x7c\x63\x95\x98\x7d\xb9\x47\x95\x78\x2b\x9a\x6d\xe4\x06\xc9\x21\x75\x8c\xa5\x27\xdd\x31\x6a\xb7\x4f\x23\x05\xc6\xbd\x1b\x6c\x43\x49\x9c\xc5\xab\x65\x7d\xff\x1a\x83\x6d\x38\xc0\x59\x [...] - }, "/rbac/operator-cluster-role-console-binding-openshift.yaml": &vfsgen۰CompressedFileInfo{ name: "operator-cluster-role-console-binding-openshift.yaml", modTime: time.Time{}, @@ -474,6 +485,7 @@ var assets = func() http.FileSystem { } fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ fs["/addons"].(os.FileInfo), + fs["/builder"].(os.FileInfo), fs["/camel-catalog-1.9.0.yaml"].(os.FileInfo), fs["/crd"].(os.FileInfo), fs["/default"].(os.FileInfo), @@ -493,6 +505,13 @@ var assets = func() http.FileSystem { fs["/addons/master/master-role-configmap.tmpl"].(os.FileInfo), 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-openshift.yaml"].(os.FileInfo), + fs["/builder/builder-service-account.yaml"].(os.FileInfo), + } fs["/crd"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ fs["/crd/bases"].(os.FileInfo), } @@ -506,7 +525,6 @@ var assets = func() http.FileSystem { fs["/crd/bases/camel.apache.org_kamelets.yaml"].(os.FileInfo), } fs["/manager"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ - fs["/manager/builder-service-account.yaml"].(os.FileInfo), fs["/manager/operator-deployment.yaml"].(os.FileInfo), fs["/manager/operator-service-account.yaml"].(os.FileInfo), } @@ -515,9 +533,6 @@ var assets = func() http.FileSystem { fs["/prometheus/operator-prometheus-rule.yaml"].(os.FileInfo), } fs["/rbac"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ - fs["/rbac/builder-role-binding.yaml"].(os.FileInfo), - fs["/rbac/builder-role-kubernetes.yaml"].(os.FileInfo), - fs["/rbac/builder-role-openshift.yaml"].(os.FileInfo), fs["/rbac/operator-cluster-role-console-binding-openshift.yaml"].(os.FileInfo), fs["/rbac/operator-cluster-role-console-openshift.yaml"].(os.FileInfo), fs["/rbac/operator-role-binding-events.yaml"].(os.FileInfo), diff --git a/config/rbac/builder-role-binding.yaml b/resources/builder/builder-role-binding-kubernetes.yaml similarity index 94% copy from config/rbac/builder-role-binding.yaml copy to resources/builder/builder-role-binding-kubernetes.yaml index 4487f6f..f8fbb5b 100644 --- a/config/rbac/builder-role-binding.yaml +++ b/resources/builder/builder-role-binding-kubernetes.yaml @@ -18,7 +18,7 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: camel-k-builder + name: camel-k-builder-kubernetes labels: app: "camel-k" subjects: @@ -26,5 +26,5 @@ subjects: name: camel-k-builder roleRef: kind: Role - name: camel-k-builder + name: camel-k-builder-kubernetes apiGroup: rbac.authorization.k8s.io diff --git a/config/rbac/builder-role-binding.yaml b/resources/builder/builder-role-binding-openshift.yaml similarity index 94% rename from config/rbac/builder-role-binding.yaml rename to resources/builder/builder-role-binding-openshift.yaml index 4487f6f..bf07180 100644 --- a/config/rbac/builder-role-binding.yaml +++ b/resources/builder/builder-role-binding-openshift.yaml @@ -18,7 +18,7 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: camel-k-builder + name: camel-k-builder-openshift labels: app: "camel-k" subjects: @@ -26,5 +26,5 @@ subjects: name: camel-k-builder roleRef: kind: Role - name: camel-k-builder + name: camel-k-builder-openshift apiGroup: rbac.authorization.k8s.io diff --git a/config/rbac/builder-role-kubernetes.yaml b/resources/builder/builder-role-kubernetes.yaml similarity index 97% rename from config/rbac/builder-role-kubernetes.yaml rename to resources/builder/builder-role-kubernetes.yaml index 172eca7..c496741 100644 --- a/config/rbac/builder-role-kubernetes.yaml +++ b/resources/builder/builder-role-kubernetes.yaml @@ -18,7 +18,7 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: camel-k-builder + name: camel-k-builder-kubernetes labels: app: "camel-k" rules: diff --git a/config/rbac/builder-role-openshift.yaml b/resources/builder/builder-role-openshift.yaml similarity index 98% rename from config/rbac/builder-role-openshift.yaml rename to resources/builder/builder-role-openshift.yaml index 251ab2d..f20911f 100644 --- a/config/rbac/builder-role-openshift.yaml +++ b/resources/builder/builder-role-openshift.yaml @@ -18,7 +18,7 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: camel-k-builder + name: camel-k-builder-openshift labels: app: "camel-k" rules: diff --git a/config/manager/builder-service-account.yaml b/resources/builder/builder-service-account.yaml similarity index 100% rename from config/manager/builder-service-account.yaml rename to resources/builder/builder-service-account.yaml
