Merge pull request #1650 from openshift-cherrypick-robot/cherry-pick-…

…1647-to-release-4.14 [release-4.14] OCPBUGS-29722: webhookcontroller: report when a webhook resource is missing a caBundle provided by the service-ca-operator
openshift · Mar 6, 2024 · 052be42 · 052be42
2 parents 9aae543 + eeead4e
commit 052be42
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pkg/operator/webhooksupportabilitycontroller/degraded_webhook.go b/pkg/operator/webhooksupportabilitycontroller/degraded_webhook.go
@@ -116,7 +116,7 @@ func (c *webhookSupportabilityController) assertConnect(ctx context.Context, web
 	if len(caBundle) > 0 {
 		rootCAs.AppendCertsFromPEM(caBundle)
 	} else if caBundleProvidedByServiceCA {
-		err := fmt.Errorf("skipping checking the webhook via %q service because the caBundle (provided by the service-ca-operator) is empty. Please check the service-ca's logs if the issue persists", net.JoinHostPort(host, port))
+		err := fmt.Errorf("skipping checking the webhook %q via %q service because the caBundle (provided by the service-ca-operator) is empty. Please check the service-ca's logs if the issue persists", webhookName, net.JoinHostPort(host, port))
 		return err
 	}
 	timeout := 10 * time.Second

diff --git a/pkg/operator/webhooksupportabilitycontroller/degraded_webhook_admission_test.go b/pkg/operator/webhooksupportabilitycontroller/degraded_webhook_admission_test.go
@@ -197,7 +197,7 @@ func TestUpdateMutatingAdmissionWebhookConfigurationDegraded(t *testing.T) {
 				Type:    MutatingAdmissionWebhookConfigurationErrorType,
 				Status:  operatorv1.ConditionTrue,
 				Reason:  WebhookServiceConnectionErrorReason,
-				Message: `mw10: skipping checking the webhook via \"([^"]+)\" service because the caBundle \(provided by the service-ca-operator\) is empty. Please check the service-ca's logs if the issue persists`,
+				Message: `mw10: skipping checking the webhook \"mw10\" via \"([^"]+)\" service because the caBundle \(provided by the service-ca-operator\) is empty. Please check the service-ca's logs if the issue persists`,
 			},
 		},
 	}
@@ -424,7 +424,7 @@ func TestUpdateValidatingAdmissionWebhookConfigurationDegradedStatus(t *testing.
 				Type:    ValidatingAdmissionWebhookConfigurationErrorType,
 				Status:  operatorv1.ConditionTrue,
 				Reason:  WebhookServiceConnectionErrorReason,
-				Message: `mw10: skipping checking the webhook via \"([^"]+)\" service because the caBundle \(provided by the service-ca-operator\) is empty. Please check the service-ca's logs if the issue persists`,
+				Message: `mw10: skipping checking the webhook \"mw10\" via \"([^"]+)\" service because the caBundle \(provided by the service-ca-operator\) is empty. Please check the service-ca's logs if the issue persists`,
 			},
 		},
 	}

diff --git a/pkg/operator/webhooksupportabilitycontroller/degraded_webhook_conversion_test.go b/pkg/operator/webhooksupportabilitycontroller/degraded_webhook_conversion_test.go
@@ -165,7 +165,7 @@ func TestUpdateCRDConversionWebhookConfigurationDegraded(t *testing.T) {
 				Type:    CRDConversionWebhookConfigurationErrorType,
 				Status:  operatorv1.ConditionTrue,
 				Reason:  WebhookServiceConnectionErrorReason,
-				Message: `crd10: skipping checking the webhook via \"([^"]+)\" service because the caBundle \(provided by the service-ca-operator\) is empty. Please check the service-ca's logs if the issue persists`,
+				Message: `crd10: skipping checking the webhook \"crd10\" via \"([^"]+)\" service because the caBundle \(provided by the service-ca-operator\) is empty. Please check the service-ca's logs if the issue persists`,
 			},
 		},
 	}