From 20aac928cdd9cac9b70d24c754c85e0041944224 Mon Sep 17 00:00:00 2001 From: Yi Rae Kim Date: Thu, 29 Jun 2023 21:22:43 -0400 Subject: [PATCH 1/2] Hosted mode e2e tests fix on GRC PRs reusable GitHub workflow for running the Kind E2E tests in hosted mode was added. We need to now trigger these tests from the component repos as part of the PR CI in releases 2.7+. Modify the governance-policy-framework release-2.7, release-2.8, and main branches to consolidate this as a new job in the existing reusable workflow file. Ref: https://issues.redhat.com/browse/ACM-5211 Signed-off-by: Yi Rae Kim (cherry picked from commit 226529921aca0586cb755b6fa6c09c56a0748994) (cherry picked from commit 96526b16d7baa13f3e85795aecf8acb8584555a2) From f98d8b2ce17e9d15d3404c202a43a03c2bcc13e2 Mon Sep 17 00:00:00 2001 From: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com> Date: Thu, 21 Mar 2024 13:22:27 -0400 Subject: [PATCH 2/2] Log "Forbidden" update errors ref: https://issues.redhat.com/browse/ACM-10612 Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com> (cherry picked from commit b5b610b08a4a0b2c0fea0e5763962345f7b9aa60) --- controllers/configurationpolicy_controller.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/controllers/configurationpolicy_controller.go b/controllers/configurationpolicy_controller.go index b96bc546..995d99c3 100644 --- a/controllers/configurationpolicy_controller.go +++ b/controllers/configurationpolicy_controller.go @@ -2628,6 +2628,8 @@ func (r *ConfigurationPolicyReconciler) checkAndUpdateResource( // If an inform policy and the update is forbidden (i.e. modifying Pod spec fields), then return // noncompliant since that confirms some fields don't match. if k8serrors.IsForbidden(err) { + log.Info(fmt.Sprintf("Dry run update failed with error: %s", err.Error())) + r.setEvaluatedObject(obj.policy, obj.existingObj, false) return true, "", false, false