Skip to content

Commit d427b61

Browse files
Merge pull request #16207 from juanvallejo/jvallejo/make-bootstrap-template-compatible-1.5-cluster
Automatic merge from submit-queue make bootstrap template compatible with 1.5 clusters Related BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1486775 `$ oc adm create-bootstrap-project-template` generates a template with group versioned resources that are incompatible when used against a 1.5 / 3.5 cluster. cc @openshift/cli-review @mfojtik @enj
2 parents 4aaca6a + 78c46a4 commit d427b61

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

pkg/project/registry/projectrequest/delegated/sample_template.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ func DefaultTemplate() *templateapi.Template {
4040
oapi.OpenShiftDisplayName: "${" + ProjectDisplayNameParam + "}",
4141
projectapi.ProjectRequester: "${" + ProjectRequesterParam + "}",
4242
}
43-
if err := templateapi.AddObjectsToTemplate(ret, []runtime.Object{project}, projectapiv1.SchemeGroupVersion); err != nil {
43+
if err := templateapi.AddObjectsToTemplate(ret, []runtime.Object{project}, projectapiv1.LegacySchemeGroupVersion); err != nil {
4444
panic(err)
4545
}
4646

4747
serviceAccountRoleBindings := bootstrappolicy.GetBootstrapServiceAccountProjectRoleBindings(ns)
4848
for i := range serviceAccountRoleBindings {
49-
if err := templateapi.AddObjectsToTemplate(ret, []runtime.Object{&serviceAccountRoleBindings[i]}, authorizationapiv1.SchemeGroupVersion); err != nil {
49+
if err := templateapi.AddObjectsToTemplate(ret, []runtime.Object{&serviceAccountRoleBindings[i]}, authorizationapiv1.LegacySchemeGroupVersion); err != nil {
5050
panic(err)
5151
}
5252
}
@@ -56,7 +56,7 @@ func DefaultTemplate() *templateapi.Template {
5656
binding.Namespace = ns
5757
binding.Subjects = []kapi.ObjectReference{{Kind: authorizationapi.UserKind, Name: "${" + ProjectAdminUserParam + "}"}}
5858
binding.RoleRef.Name = bootstrappolicy.AdminRoleName
59-
if err := templateapi.AddObjectsToTemplate(ret, []runtime.Object{binding}, authorizationapiv1.SchemeGroupVersion); err != nil {
59+
if err := templateapi.AddObjectsToTemplate(ret, []runtime.Object{binding}, authorizationapiv1.LegacySchemeGroupVersion); err != nil {
6060
// this should never happen because we're tightly controlling what goes in.
6161
panic(err)
6262
}

0 commit comments

Comments
 (0)