actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-20 14:41:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix tenant service account binding

Browse source 
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
This commit is contained in:
Stefan Prodan 2020-11-29 13:59:40 +02:00
parent 182928002b
commit ffdaa9dfe9
No known key found for this signature in database
GPG key ID: 3299AEB0E4085BAF
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cmd/flux/create_tenant.go
View file

@ -55,8 +55,7 @@ reconcilers scope to the tenant namespaces.`,
} }
const ( const (
tenantLabel = "toolkit.fluxcd.io/tenant" tenantLabel = "toolkit.fluxcd.io/tenant"
tenantRoleBinding = "gotk-reconciler"
) )
var ( var (
@ -123,18 +122,20 @@ func createTenantCmdRun(cmd *cobra.Command, args []string) error {
roleBinding := rbacv1.RoleBinding{ roleBinding := rbacv1.RoleBinding{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: tenantRoleBinding, Name: fmt.Sprintf("%s-reconciler", tenant),
Namespace: ns, Namespace: ns,
Labels: objLabels, Labels: objLabels,
}, },
Subjects: []rbacv1.Subject{ Subjects: []rbacv1.Subject{
{ {
Kind: "User", APIGroup: "rbac.authorization.k8s.io",
Name: fmt.Sprintf("gotk:%s:reconciler", ns), Kind: "User",
Name: fmt.Sprintf("gotk:%s:reconciler", ns),
}, },
{ {
Kind: "ServiceAccount", Kind: "ServiceAccount",
Name: tenant, Name: tenant,
Namespace: ns,
}, },
}, },
RoleRef: rbacv1.RoleRef{ RoleRef: rbacv1.RoleRef{
@ -290,7 +291,7 @@ func exportTenant(namespace corev1.Namespace, account corev1.ServiceAccount, rol
fmt.Println(resourceToString(data)) fmt.Println(resourceToString(data))
account.TypeMeta = metav1.TypeMeta{ account.TypeMeta = metav1.TypeMeta{
APIVersion: "", APIVersion: "v1",
Kind: "ServiceAccount", Kind: "ServiceAccount",
} }
data, err = yaml.Marshal(account) data, err = yaml.Marshal(account)