Skip to content

Commit

Permalink
Quickstart fixes
Browse files Browse the repository at this point in the history
* `jsonnet fmt` our jsonnet files
* Bug fixes for recent plugin changes
* Fixup the ksonnet that generates the quickstart
* Worker configuration is entirely through environment variables

Signed-off-by: Chuck Ha <chuck@heptio.com>
  • Loading branch information
Chuck Ha committed Nov 10, 2017
1 parent a0c3e42 commit 1a6a13d
Show file tree
Hide file tree
Showing 6 changed files with 219 additions and 293 deletions.
6 changes: 3 additions & 3 deletions examples/ksonnet/components/00-rbac.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ local clusterRoleBinding =
crb.new() +
crb.mixin.metadata.mixinInstance(conf.metadata) +
# TODO: replace with `crb.mixinroleRef.kind("ClusterRole") when https://github.com/ksonnet/ksonnet-lib/issues/53 closes.
{roleRef: {kind: "ClusterRole"}} +
{ roleRef: { kind: "ClusterRole" } } +
crb.mixin.roleRef.apiGroup("rbac.authorization.k8s.io") +
crb.mixin.roleRef.name(conf.serviceAccount.name) +
crb.subjects([
# TODO: replace with `crb.subjectsType.kind("ServiceAccount")` when https://github.com/ksonnet/ksonnet-lib/issues/43 closes.
{kind: "ServiceAccount"} +
{ kind: "ServiceAccount" } +
crb.subjectsType.name(conf.serviceAccount.name) +
crb.subjectsType.namespace(conf.namespace),
]);
Expand All @@ -75,5 +75,5 @@ local optRbacObj =

k.core.v1.list.new([
namespace,
serviceaccount
serviceaccount,
] + optRbacObj)
Loading

0 comments on commit 1a6a13d

Please sign in to comment.