From 3195bc78c0095b2fc66f6a9be4646c551cba6c1c Mon Sep 17 00:00:00 2001 From: juanvallejo Date: Thu, 7 Sep 2017 10:42:19 -0400 Subject: [PATCH] make `oc adm create-bootstrap-project-template` compatible w 1.5 cluster --- .../registry/projectrequest/delegated/sample_template.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/project/registry/projectrequest/delegated/sample_template.go b/pkg/project/registry/projectrequest/delegated/sample_template.go index 030fa3938307..a7d8fc553ff5 100644 --- a/pkg/project/registry/projectrequest/delegated/sample_template.go +++ b/pkg/project/registry/projectrequest/delegated/sample_template.go @@ -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" ) @@ -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) } } @@ -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) }