Skip to content

Commit

Permalink
make oc adm create-bootstrap-project-template compatible w 1.5 cluster
Browse files Browse the repository at this point in the history
  • Loading branch information
juanvallejo committed Sep 7, 2017
1 parent fbbe981 commit 3195bc7
Showing 1 changed file with 4 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ import (
kapi "k8s.io/kubernetes/pkg/api"

oapi "github.com/openshift/origin/pkg/api"
"github.com/openshift/origin/pkg/api/latest"
authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
authorizationapiv1 "github.com/openshift/origin/pkg/authorization/apis/authorization/v1"
"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
projectapi "github.com/openshift/origin/pkg/project/apis/project"
projectapiv1 "github.com/openshift/origin/pkg/project/apis/project/v1"
templateapi "github.com/openshift/origin/pkg/template/apis/template"
)

Expand Down Expand Up @@ -40,13 +39,13 @@ func DefaultTemplate() *templateapi.Template {
oapi.OpenShiftDisplayName: "${" + ProjectDisplayNameParam + "}",
projectapi.ProjectRequester: "${" + ProjectRequesterParam + "}",
}
if err := templateapi.AddObjectsToTemplate(ret, []runtime.Object{project}, projectapiv1.SchemeGroupVersion); err != nil {
if err := templateapi.AddObjectsToTemplate(ret, []runtime.Object{project}, latest.Version); err != nil {
panic(err)
}

serviceAccountRoleBindings := bootstrappolicy.GetBootstrapServiceAccountProjectRoleBindings(ns)
for i := range serviceAccountRoleBindings {
if err := templateapi.AddObjectsToTemplate(ret, []runtime.Object{&serviceAccountRoleBindings[i]}, authorizationapiv1.SchemeGroupVersion); err != nil {
if err := templateapi.AddObjectsToTemplate(ret, []runtime.Object{&serviceAccountRoleBindings[i]}, latest.Version); err != nil {
panic(err)
}
}
Expand All @@ -56,7 +55,7 @@ func DefaultTemplate() *templateapi.Template {
binding.Namespace = ns
binding.Subjects = []kapi.ObjectReference{{Kind: authorizationapi.UserKind, Name: "${" + ProjectAdminUserParam + "}"}}
binding.RoleRef.Name = bootstrappolicy.AdminRoleName
if err := templateapi.AddObjectsToTemplate(ret, []runtime.Object{binding}, authorizationapiv1.SchemeGroupVersion); err != nil {
if err := templateapi.AddObjectsToTemplate(ret, []runtime.Object{binding}, latest.Version); err != nil {
// this should never happen because we're tightly controlling what goes in.
panic(err)
}
Expand Down

0 comments on commit 3195bc7

Please sign in to comment.