Merge pull request #8783 from liggitt/remove-deployments

Merged by openshift-bot

Author: OpenShift Bot

pkg/authorization/api/types.go

@@ -80,7 +80,7 @@ var (
 	GroupsToResources = map[string][]string{
 		BuildGroupName:       {"builds", "buildconfigs", "buildlogs", "buildconfigs/instantiate", "buildconfigs/instantiatebinary", "builds/log", "builds/clone", "buildconfigs/webhooks"},
 		ImageGroupName:       {"imagestreams", "imagestreammappings", "imagestreamtags", "imagestreamimages", "imagestreamimports"},
-		DeploymentGroupName:  {"deployments", "deploymentconfigs", "generatedeploymentconfigs", "deploymentconfigrollbacks", "deploymentconfigs/log", "deploymentconfigs/scale"},
+		DeploymentGroupName:  {"deploymentconfigs", "generatedeploymentconfigs", "deploymentconfigrollbacks", "deploymentconfigs/log", "deploymentconfigs/scale"},
 		SDNGroupName:         {"clusternetworks", "hostsubnets", "netnamespaces"},
 		TemplateGroupName:    {"templates", "templateconfigs", "processedtemplates"},
 		UserGroupName:        {"identities", "users", "useridentitymappings", "groups"},

test/fixtures/bootstrappolicy/bootstrap_cluster_roles.yaml

@@ -64,7 +64,6 @@ items:
     - deploymentconfigs
     - deploymentconfigs/log
     - deploymentconfigs/scale
-    - deployments
     - endpoints
     - events
     - generatedeploymentconfigs
@@ -283,7 +282,6 @@ items:
     - deploymentconfigs
     - deploymentconfigs/log
     - deploymentconfigs/scale
-    - deployments
     - generatedeploymentconfigs
     - imagestreamimages
     - imagestreamimports
@@ -467,7 +465,6 @@ items:
     - deploymentconfigs
     - deploymentconfigs/log
     - deploymentconfigs/scale
-    - deployments
     - generatedeploymentconfigs
     - imagestreamimages
     - imagestreamimports
@@ -603,7 +600,6 @@ items:
     - deploymentconfigs
     - deploymentconfigs/log
     - deploymentconfigs/scale
-    - deployments
     - endpoints
     - events
     - generatedeploymentconfigs

test/integration/authorization_test.go

@@ -328,19 +328,19 @@ func TestAuthorizationResourceAccessReview(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	requestWhoCanViewDeployments := &authorizationapi.ResourceAccessReview{
-		Action: authorizationapi.AuthorizationAttributes{Verb: "get", Resource: "deployments"},
+	requestWhoCanViewDeploymentConfigs := &authorizationapi.ResourceAccessReview{
+		Action: authorizationapi.AuthorizationAttributes{Verb: "get", Resource: "deploymentconfigs"},
 	}
 
-	localRequestWhoCanViewDeployments := &authorizationapi.LocalResourceAccessReview{
-		Action: authorizationapi.AuthorizationAttributes{Verb: "get", Resource: "deployments"},
+	localRequestWhoCanViewDeploymentConfigs := &authorizationapi.LocalResourceAccessReview{
+		Action: authorizationapi.AuthorizationAttributes{Verb: "get", Resource: "deploymentconfigs"},
 	}
 
 	{
 		test := localResourceAccessReviewTest{
-			description:     "who can view deployments in hammer by harold",
+			description:     "who can view deploymentconfigs in hammer by harold",
 			clientInterface: haroldClient.LocalResourceAccessReviews("hammer-project"),
-			review:          localRequestWhoCanViewDeployments,
+			review:          localRequestWhoCanViewDeploymentConfigs,
 			response: authorizationapi.ResourceAccessReviewResponse{
 				Users:     sets.NewString("harold", "valerie"),
 				Groups:    sets.NewString(),
@@ -353,9 +353,9 @@ func TestAuthorizationResourceAccessReview(t *testing.T) {
 	}
 	{
 		test := localResourceAccessReviewTest{
-			description:     "who can view deployments in mallet by mark",
+			description:     "who can view deploymentconfigs in mallet by mark",
 			clientInterface: markClient.LocalResourceAccessReviews("mallet-project"),
-			review:          localRequestWhoCanViewDeployments,
+			review:          localRequestWhoCanViewDeploymentConfigs,
 			response: authorizationapi.ResourceAccessReviewResponse{
 				Users:     sets.NewString("mark", "edgar"),
 				Groups:    sets.NewString(),
@@ -370,9 +370,9 @@ func TestAuthorizationResourceAccessReview(t *testing.T) {
 	// mark should not be able to make global access review requests
 	{
 		test := resourceAccessReviewTest{
-			description:     "who can view deployments in all by mark",
+			description:     "who can view deploymentconfigs in all by mark",
 			clientInterface: markClient.ResourceAccessReviews(),
-			review:          requestWhoCanViewDeployments,
+			review:          requestWhoCanViewDeploymentConfigs,
 			err:             "cannot ",
 		}
 		test.run(t)
@@ -381,9 +381,9 @@ func TestAuthorizationResourceAccessReview(t *testing.T) {
 	// a cluster-admin should be able to make global access review requests
 	{
 		test := resourceAccessReviewTest{
-			description:     "who can view deployments in all by cluster-admin",
+			description:     "who can view deploymentconfigs in all by cluster-admin",
 			clientInterface: clusterAdminClient.ResourceAccessReviews(),
-			review:          requestWhoCanViewDeployments,
+			review:          requestWhoCanViewDeploymentConfigs,
 			response: authorizationapi.ResourceAccessReviewResponse{
 				Users:  sets.NewString(),
 				Groups: sets.NewString(),
@@ -399,9 +399,9 @@ func TestAuthorizationResourceAccessReview(t *testing.T) {
 			t.Errorf("unexpected error: %v", err)
 		}
 		test := localResourceAccessReviewTest{
-			description:     "who can view deployments in mallet by cluster-admin",
+			description:     "who can view deploymentconfigs in mallet by cluster-admin",
 			clientInterface: clusterAdminClient.LocalResourceAccessReviews("mallet-project"),
-			review:          localRequestWhoCanViewDeployments,
+			review:          localRequestWhoCanViewDeploymentConfigs,
 			response: authorizationapi.ResourceAccessReviewResponse{
 				Users:     sets.NewString("edgar"),
 				Groups:    sets.NewString(),