Merge pull request #22 from phalski/fix-utils

Fixed broken expression concatenation
This commit is contained in:
Carlos Eduardo 2019-10-11 17:13:40 -03:00 committed by GitHub
commit 3202c3fe26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -49,7 +49,7 @@ local vars = import 'vars.jsonnet';
local c = clusterRole.new() local c = clusterRole.new()
+ (if labels != null then clusterRole.mixin.metadata.withLabels(labels) else {}) + (if labels != null then clusterRole.mixin.metadata.withLabels(labels) else {})
+ clusterRole.mixin.metadata.withName(name) + + clusterRole.mixin.metadata.withName(name)
+ clusterRole.withRules(rules); + clusterRole.withRules(rules);
c c
), ),
@ -59,7 +59,7 @@ local vars = import 'vars.jsonnet';
local clusterRoleBinding = k.rbac.v1.clusterRoleBinding; local clusterRoleBinding = k.rbac.v1.clusterRoleBinding;
clusterRoleBinding.new() clusterRoleBinding.new()
+ clusterRoleBinding.mixin.metadata.withName(name) + + clusterRoleBinding.mixin.metadata.withName(name)
+ (if labels != null then clusterRoleBinding.mixin.metadata.withLabels(labels) else {}) + (if labels != null then clusterRoleBinding.mixin.metadata.withLabels(labels) else {})
+ clusterRoleBinding.mixin.roleRef.withApiGroup('rbac.authorization.k8s.io') + clusterRoleBinding.mixin.roleRef.withApiGroup('rbac.authorization.k8s.io')
+ clusterRoleBinding.mixin.roleRef.withName(clusterRole) + clusterRoleBinding.mixin.roleRef.withName(clusterRole)