diff --git a/pkg/tasks/prometheus_user_workload.go b/pkg/tasks/prometheus_user_workload.go index 073543b1e7..503e5035e2 100644 --- a/pkg/tasks/prometheus_user_workload.go +++ b/pkg/tasks/prometheus_user_workload.go @@ -215,17 +215,6 @@ func (t *PrometheusUserWorkloadTask) create(ctx context.Context) error { return errors.Wrap(err, "initializing UserWorkload CA bundle ConfigMap failed") } - cbs := &caBundleSyncer{ - client: t.client, - factory: t.factory, - prefix: "prometheus-user-workload", - } - - trustedCA, err = cbs.syncTrustedCABundle(ctx, trustedCA) - if err != nil { - return errors.Wrap(err, "syncing UserWorkload trusted CA bundle ConfigMap failed") - } - secret, err := t.factory.PrometheusUserWorkloadAdditionalAlertManagerConfigsSecret() if err != nil { return errors.Wrap(err, "initializing UserWorkload Prometheus additionalAlertmanagerConfigs secret failed") @@ -369,23 +358,12 @@ func (t *PrometheusUserWorkloadTask) destroy(ctx context.Context) error { return errors.Wrap(err, "initializing UserWorkload CA bundle ConfigMap failed") } - cbs := &caBundleSyncer{ - client: t.client, - factory: t.factory, - prefix: "prometheus-user-workload", - } - - hashedTrustedCA, err := cbs.syncTrustedCABundle(ctx, trustedCA) - if err != nil { - return errors.Wrap(err, "syncing UserWorkload trusted CA bundle ConfigMap failed") - } - err = t.client.DeleteConfigMap(ctx, trustedCA) if err != nil { return errors.Wrap(err, "deleting UserWorkload trusted CA Bundle ConfigMap failed") } - err = t.client.DeleteHashedConfigMap(ctx, hashedTrustedCA.GetNamespace(), "prometheus-user-workload", hashedTrustedCA.Labels["monitoring.openshift.io/hash"]) + err = t.client.DeleteHashedConfigMap(ctx, trustedCA.GetNamespace(), "prometheus-user-workload", "") if err != nil { return errors.Wrap(err, "deleting UserWorkload trusted CA Bundle ConfigMap failed") }