Merge pull request #18782 from coreydaley/bugzilla_1549832_cannot_delete_builds_in_namespace

Automatic merge from submit-queue.

Fixes: cannot prune builds on buildConfig change

Author: openshift-merge-robot

pkg/cmd/server/bootstrappolicy/controller_policy.go

@@ -120,6 +120,7 @@ func init() {
 		Rules: []rbac.PolicyRule{
 			rbac.NewRule("get", "list", "watch").Groups(buildGroup, legacyBuildGroup).Resources("buildconfigs").RuleOrDie(),
 			rbac.NewRule("create").Groups(buildGroup, legacyBuildGroup).Resources("buildconfigs/instantiate").RuleOrDie(),
+			rbac.NewRule("delete").Groups(buildGroup, legacyBuildGroup).Resources("builds").RuleOrDie(),
 			eventsRule(),
 		},
 	})

test/extended/builds/build_pruning.go

@@ -240,6 +240,57 @@ var _ = g.Describe("[Feature:Builds][pruning] prune builds based on settings in
 
 		})
 
+		g.It("should prune builds after a buildConfig change", func() {
+
+			g.By("creating test failed build config")
+			err := oc.Run("create").Args("-f", failedBuildConfig).Execute()
+			o.Expect(err).NotTo(o.HaveOccurred())
+
+			g.By("patching the build config to leave 5 builds")
+			err = oc.Run("patch").Args("bc/myphp", "-p", `{"spec":{"failedBuildsHistoryLimit": 5}}`).Execute()
+
+			g.By("starting and canceling three test builds")
+			for i := 1; i < 4; i++ {
+				_, _, _ = exutil.StartBuild(oc, "myphp")
+				err = oc.Run("cancel-build").Args(fmt.Sprintf("myphp-%d", i)).Execute()
+			}
+
+			g.By("patching the build config to leave 1 build")
+			err = oc.Run("patch").Args("bc/myphp", "-p", `{"spec":{"failedBuildsHistoryLimit": 1}}`).Execute()
+
+			buildConfig, err := oc.BuildClient().Build().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
+			if err != nil {
+				fmt.Fprintf(g.GinkgoWriter, "%v", err)
+			}
+
+			var builds *buildapi.BuildList
+
+			g.By("waiting up to one minute for pruning to complete")
+			err = wait.PollImmediate(pollingInterval, timeout, func() (bool, error) {
+				builds, err = oc.BuildClient().Build().Builds(oc.Namespace()).List(metav1.ListOptions{})
+				if err != nil {
+					fmt.Fprintf(g.GinkgoWriter, "%v", err)
+					return false, err
+				}
+				if int32(len(builds.Items)) == *buildConfig.Spec.FailedBuildsHistoryLimit {
+					fmt.Fprintf(g.GinkgoWriter, "%v builds exist, retrying...", len(builds.Items))
+					return true, nil
+				}
+				return false, nil
+			})
+
+			if err != nil {
+				fmt.Fprintf(g.GinkgoWriter, "%v", err)
+			}
+
+			passed := false
+			if int32(len(builds.Items)) == 1 || int32(len(builds.Items)) == 2 {
+				passed = true
+			}
+			o.Expect(passed).To(o.BeTrue(), "there should be 1-2 completed builds left after pruning, but instead there were %v", len(builds.Items))
+
+		})
+
 		g.It("[Conformance] buildconfigs should have a default history limit set when created via the group api", func() {
 
 			g.By("creating a build config with the group api")

test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml

@@ -2710,6 +2710,13 @@ items:
     - buildconfigs/instantiate
     verbs:
     - create
+  - apiGroups:
+    - ""
+    - build.openshift.io
+    resources:
+    - builds
+    verbs:
+    - delete
   - apiGroups:
     - ""
     resources:

test/testdata/bootstrappolicy/bootstrap_policy_file.yaml

@@ -2962,6 +2962,14 @@ items:
     - buildconfigs/instantiate
     verbs:
     - create
+  - apiGroups:
+    - ""
+    - build.openshift.io
+    attributeRestrictions: null
+    resources:
+    - builds
+    verbs:
+    - delete
   - apiGroups:
     - ""
     attributeRestrictions: null