Merge pull request #14323 from smarterclayton/give_users_optimized_build

Merged by openshift-bot
openshift · May 25, 2017 · 5ef63e6 · 5ef63e6
2 parents df5a465 + 5ea255f
commit 5ef63e6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 26 deletions.
diff --git a/pkg/cmd/server/bootstrappolicy/policy.go b/pkg/cmd/server/bootstrappolicy/policy.go
@@ -253,7 +253,7 @@ func GetOpenshiftBootstrapClusterRoles() []authorizationapi.ClusterRole {
 				},
 			},
 			Rules: []authorizationapi.PolicyRule{
-				authorizationapi.NewRule("create").Groups(buildGroup, legacyBuildGroup).Resources(authorizationapi.DockerBuildResource).RuleOrDie(),
+				authorizationapi.NewRule("create").Groups(buildGroup, legacyBuildGroup).Resources(authorizationapi.DockerBuildResource, authorizationapi.OptimizedDockerBuildResource).RuleOrDie(),
 			},
 		},
 		{

diff --git a/test/extended/builds/optimized.go b/test/extended/builds/optimized.go
@@ -7,7 +7,6 @@ import (
 	g "github.com/onsi/ginkgo"
 	o "github.com/onsi/gomega"
 
-	kapierrs "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	e2e "k8s.io/kubernetes/test/e2e/framework"
 
@@ -34,7 +33,7 @@ USER 1001
 		oc.SetOutputDir(exutil.TestContext.OutputDir)
 	})
 
-	g.It("should succeed as an admin [Conformance]", func() {
+	g.It("should succeed [Conformance]", func() {
 		g.By("creating a build directly")
 		build, err := oc.AdminClient().Builds(oc.Namespace()).Create(&buildapi.Build{
 			ObjectMeta: metav1.ObjectMeta{
@@ -74,27 +73,4 @@ USER 1001
 		o.Expect(s).To(o.ContainSubstring("Build complete, no image push requested"))
 		e2e.Logf("Build logs:\n%s", result)
 	})
-
-	g.It("should fail as a normal user [Conformance]", func() {
-		g.By("creating a build directly")
-		_, err := oc.Client().Builds(oc.Namespace()).Create(&buildapi.Build{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: "optimized",
-			},
-			Spec: buildapi.BuildSpec{
-				CommonSpec: buildapi.CommonSpec{
-					Source: buildapi.BuildSource{
-						Dockerfile: &testDockerfile,
-					},
-					Strategy: buildapi.BuildStrategy{
-						DockerStrategy: &buildapi.DockerBuildStrategy{
-							ImageOptimizationPolicy: &skipLayers,
-						},
-					},
-				},
-			},
-		})
-		o.Expect(err).To(o.HaveOccurred())
-		o.Expect(kapierrs.IsForbidden(err)).To(o.BeTrue(), "Unexpected error: %v", err)
-	})
 })
diff --git a/test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml b/test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml
@@ -467,6 +467,7 @@ items:
     attributeRestrictions: null
     resources:
     - builds/docker
+    - builds/optimizeddocker
     verbs:
     - create
 - apiVersion: v1