From f0fd44a586b84588ba864a96cdb1d861daecbb03 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Fri, 22 Apr 2016 11:19:40 -0400 Subject: [PATCH] Default role reconciliation to additive-only --- pkg/cmd/admin/policy/reconcile_clusterroles.go | 5 ++++- test/cmd/admin.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/cmd/admin/policy/reconcile_clusterroles.go b/pkg/cmd/admin/policy/reconcile_clusterroles.go index fe8c12ebf4cc..3f3ef6c81a13 100644 --- a/pkg/cmd/admin/policy/reconcile_clusterroles.go +++ b/pkg/cmd/admin/policy/reconcile_clusterroles.go @@ -60,7 +60,10 @@ You can see which cluster role have recommended changed by choosing an output ty // NewCmdReconcileClusterRoles implements the OpenShift cli reconcile-cluster-roles command func NewCmdReconcileClusterRoles(name, fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Command { - o := &ReconcileClusterRolesOptions{Out: out} + o := &ReconcileClusterRolesOptions{ + Out: out, + Union: true, + } cmd := &cobra.Command{ Use: name + " [ClusterRoleName]...", diff --git a/test/cmd/admin.sh b/test/cmd/admin.sh index 747e41434c03..672932c48f0b 100755 --- a/test/cmd/admin.sh +++ b/test/cmd/admin.sh @@ -185,7 +185,7 @@ os::cmd::expect_success 'oadm policy reconcile-cluster-roles --additive-only --c os::cmd::expect_success_and_text 'oc get clusterroles/basic-user -o json' 'custom-label' os::cmd::expect_success_and_text 'oc get clusterroles/basic-user -o json' 'custom-annotation' os::cmd::expect_success_and_text 'oc get clusterroles/basic-user -o json' 'groups' -os::cmd::expect_success 'oadm policy reconcile-cluster-roles --confirm' +os::cmd::expect_success 'oadm policy reconcile-cluster-roles --additive-only=false --confirm' os::cmd::expect_success_and_not_text 'oc get clusterroles/basic-user -o yaml' 'groups' echo "admin-reconcile-cluster-roles: ok" os::test::junit::declare_suite_end