Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Nov 5, 2024
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2757285
fix(kubernetes_resource): do not copy annotations, last-applied-resou…
yashmehrotra Nov 5, 2024
87fc7c5
chore: address review comments
yashmehrotra Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions checks/kubernetes_resource.go
View file
Open in desktop
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,
},
yashmehrotra marked this conversation as resolved.
Show resolved Hide resolved
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
Loading