Skip to content

Commit

Permalink
fix(kubernetes_resource): do not copy annotations, last-applied-resou…
Browse files Browse the repository at this point in the history
…rce being templated (#2317)

* fix(kubernetes_resource): do not copy annotations, last-applied-resource being templated

* chore: address review comments
  • Loading branch information
yashmehrotra authored Nov 5, 2024
1 parent 173f8e8 commit 24e949f
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions checks/kubernetes_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ func (c *KubernetesResourceChecker) Check(ctx context.Context, check v1.Kubernet
var results pkg.Results
results = append(results, result)

// We do this before virtual check run in case the check times out
// and returns an err, the default templating requires 'display' in env
result.AddData(map[string]any{
"display": make(map[string]any),
})

if err := c.validate(ctx, check); err != nil {
return results.Failf("validation: %v", err)
}
Expand Down Expand Up @@ -113,8 +119,12 @@ func (c *KubernetesResourceChecker) Check(ctx context.Context, check v1.Kubernet
displayPerCheck := map[string]string{}
for _, c := range check.Checks {
virtualCanary := v1.Canary{
ObjectMeta: ctx.Canary.ObjectMeta,
Spec: c.CanarySpec,
ObjectMeta: metav1.ObjectMeta{
Name: ctx.Canary.ObjectMeta.Name,
Namespace: ctx.Canary.ObjectMeta.Namespace,
Labels: ctx.Canary.ObjectMeta.Labels,
},
Spec: c.CanarySpec,
}

templater := gomplate.StructTemplater{
Expand Down Expand Up @@ -152,12 +162,6 @@ func (c *KubernetesResourceChecker) Check(ctx context.Context, check v1.Kubernet
backoff = retry.WithMaxDuration(maxRetryTimeout, backoff)
}

// We do this before virtual check run in case the check times out
// and returns an err, the default templating requires 'display' in env
result.AddData(map[string]any{
"display": make(map[string]any),
})

retryErr := retry.Do(ctx, backoff, func(_ctx gocontext.Context) error {
ctx.Logger.V(4).Infof("running check: %s", virtualCanary.Name)

Expand Down

0 comments on commit 24e949f

Please sign in to comment.