Adjust metric creation to be akin to other reconciled entities. #4895
Conversation
- Adjust the reconcile method to act as if the reconciliation was actually backed by an API. It needs to base the update entity on the actual entity it got earlier to be able to successfully update once we have the Metric entities backed by an API. - Adjust the Metric's metadata to only pick the needed values from PA's metadata. resourceVersion and friends are not to be copied over. Also add an owner reference.
knative-prow-robot
added
size/M
There was a problem hiding this comment.
@markusthoemmes: 0 warnings.
In response to this:
Proposed Changes
- Adjust the reconcile method to act as if the reconciliation was actually backed by an API. It needs to base the update entity on the actual entity it got earlier to be able to successfully update once we have the Metric entities backed by an API.
- Adjust the Metric's metadata to only pick the needed values from PA's metadata. resourceVersion and friends are not to be copied over. Also add an owner reference.
Release Note
NONE/assign @vagababov
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: markusthoemmes The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
knative-prow-robot
added
the
approved
| @@ -175,19 +175,21 @@ func (c *Base) ReconcileMetric(ctx context.Context, pa *pav1alpha1.PodAutoscaler | |||
| desiredMetric := resources.MakeMetric(ctx, pa, metricSN, config.FromContext(ctx).Autoscaler) | |||
| metric, err := c.Metrics.Get(ctx, desiredMetric.Namespace, desiredMetric.Name) | |||
| if errors.IsNotFound(err) { | |||
| metric, err = c.Metrics.Create(ctx, desiredMetric) | |||
| _, err = c.Metrics.Create(ctx, desiredMetric) | |||
There was a problem hiding this comment.
Because the variable is used nowere after moving the else block in.
| want := metric.DeepCopy() | ||
| want.Spec = desiredMetric.Spec | ||
| if _, err = c.Metrics.Update(ctx, desiredMetric); err != nil { | ||
| return perrors.Wrap(err, "error updating metric") |
There was a problem hiding this comment.
Just envisioning: fmt.Errorf("error updating metric: %w", err)
😆
|
/test pull-knative-serving-integration-tests Weird error. |
Proposed Changes
Release Note
/assign @vagababov