Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions component/main.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -129,17 +129,16 @@ local serviceAccount(mrName) = addKubernetesNameLabel({
});

local role(prefix, defaultNamespace) =
function(path) addKubernetesNameLabel({
function(path) {
local nsName = namespacedName(path, namespace=defaultNamespace),
local name = prefix + nsName.name,
assert std.length(name) <= 63 : "Resource name '%s' too long!" % name,
apiVersion: 'rbac.authorization.k8s.io/v1',
kind: 'Role',
metadata: {
name: name,
namespace: nsName.namespace,
},
});
};

local clusterRole(prefix) =
function(path)
Expand All @@ -151,7 +150,7 @@ local clusterRole(prefix) =
};

local roleBinding(roleNamePrefix) =
function(roleNs, roleName, saNs, saName) addKubernetesNameLabel({
function(roleNs, roleName, saNs, saName) {
local bindingName = std.join(':', std.prune([ 'esp', 'x', roleName, if saNs != roleNs then saNs, saName ])),
apiVersion: 'rbac.authorization.k8s.io/v1',
kind: 'RoleBinding',
Expand All @@ -171,7 +170,7 @@ local roleBinding(roleNamePrefix) =
namespace: saNs,
},
],
});
};

local clusterRoleBinding(roleNamePrefix) =
function(roleName, saNs, saName)
Expand Down
1 change: 0 additions & 1 deletion lib/espejote.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ local generateRolesForManagedResource(manifest) =
if clusterScoped(resource) || manifestMeta.namespace != resourceNs then manifestMeta.namespace,
manifestMeta.name,
] + suffixes));
assert std.length(name) <= 63 : "Resource name '%s' too long!" % name;
name,
},
rules: [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
app.kubernetes.io/name: esp-x-my-namespace-auto-roles-1-espejote-update-configmaps
name: esp:x:my-namespace:auto-roles-1:espejote-update-configmaps
namespace: my-namespace
rules:
Expand All @@ -18,8 +16,6 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app.kubernetes.io/name: esp-x-espejote-update-configmaps-espejote-auto-roles-1
name: esp:x:espejote-update-configmaps:espejote-auto-roles-1
namespace: my-namespace
roleRef:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
app.kubernetes.io/name: esp-x-my-namespace-copy-configmap-configmaps
name: esp:x:my-namespace:copy-configmap:configmaps
namespace: a
rules:
Expand All @@ -16,8 +14,6 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
app.kubernetes.io/name: esp-x-my-namespace-copy-configmap-configmaps
name: esp:x:my-namespace:copy-configmap:configmaps
namespace: b
rules:
Expand All @@ -31,8 +27,6 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
app.kubernetes.io/name: esp-x-my-namespace-copy-configmap-configmaps
name: esp:x:my-namespace:copy-configmap:configmaps
namespace: my-namespace
rules:
Expand All @@ -46,8 +40,6 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app.kubernetes.io/name: esp-x-configmaps-my-namespace-espejote-copy-configmap
name: esp:x:configmaps:my-namespace:espejote-copy-configmap
namespace: a
roleRef:
Expand All @@ -62,8 +54,6 @@ subjects:
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app.kubernetes.io/name: esp-x-configmaps-my-namespace-espejote-copy-configmap
name: esp:x:configmaps:my-namespace:espejote-copy-configmap
namespace: b
roleRef:
Expand All @@ -78,8 +68,6 @@ subjects:
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app.kubernetes.io/name: esp-x-configmaps-espejote-copy-configmap
name: esp:x:configmaps:espejote-copy-configmap
namespace: my-namespace
roleRef:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app.kubernetes.io/name: esp-x-admin-copy-configmap
name: esp:x:admin:copy-configmap
namespace: my-namespace
roleRef:
Expand All @@ -17,8 +15,6 @@ subjects:
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app.kubernetes.io/name: esp-x-argocd-manager-copy-configmap
name: esp:x:argocd-manager:copy-configmap
namespace: my-namespace
roleRef:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: esp-x-my-namespace-copy-configmap-namespace
name: esp:x:my-namespace:copy-configmap:namespace
rules:
- apiGroups:
Expand All @@ -15,8 +13,6 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
app.kubernetes.io/name: esp-x-namespace-my-namespace-espejote-copy-configmap
name: esp:x:namespace:my-namespace:espejote-copy-configmap
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
Loading