diff --git a/.gitignore b/.gitignore index 7dc8e90f5..b5f81bee7 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,7 @@ tmp/ ginkgo.report __debug* test-results.xml +coverprofile.out +junit-report.xml +canary-checker.properties +*.code-workspace diff --git a/checks/common.go b/checks/common.go index 14978b7ae..33cedae42 100644 --- a/checks/common.go +++ b/checks/common.go @@ -141,7 +141,7 @@ func transform(ctx *context.Context, in *pkg.CheckResult) ([]*pkg.CheckResult, b results = append(results, &r) } if ctx.IsTrace() { - ctx.Tracef("transformed %s into %v", in, results) + ctx.Tracef("transformed %s into %d results", in, len(results)) } return results, hasTransformer, nil } else if len(transformed) == 1 && t.Name == "" { diff --git a/fixtures/git/_setup.sh b/fixtures/git/_setup.sh index 18af209fb..0b820ff7b 100755 --- a/fixtures/git/_setup.sh +++ b/fixtures/git/_setup.sh @@ -38,4 +38,4 @@ curl -vvv -u gitea_admin:admin -H "Content-Type: application/json" http://lo kill $PID -kubectl create secret generic gitea --from-literal=username=gitea_admin --from-literal=password=admin --from-literal=url=http:///gitea-http.gitea.svc:3000/gitea_admin/test_repo.git +kubectl create secret generic gitea --from-literal=username=gitea_admin --from-literal=password=admin --from-literal=url=http:///gitea-http.gitea.svc:3000/gitea_admin/test_repo.git --namespace canaries diff --git a/fixtures/k8s/kubernetes_bundle.yaml b/fixtures/k8s/kubernetes_bundle.yaml index e6c30451b..e5f402837 100644 --- a/fixtures/k8s/kubernetes_bundle.yaml +++ b/fixtures/k8s/kubernetes_bundle.yaml @@ -12,6 +12,7 @@ spec: expr: | dyn(results).map(r, { 'name': r.Object.metadata.name, + 'namespace': r.Object.metadata.?namespace.orValue(null), 'labels': r.Object.metadata.labels, 'pass': k8s.isHealthy(r.Object), 'message': k8s.getHealth(r.Object).message, @@ -20,10 +21,13 @@ spec: - kind: Pod ready: true name: pod-bundle + resource: + labelSelector: app != k8s-not-ready, Expected-Fail != true, canary-checker.flanksource.com/generated != true transform: expr: | dyn(results).map(r, { 'name': r.Object.metadata.name, + 'namespace': r.Object.metadata.namespace, 'labels': r.Object.metadata.labels, 'pass': k8s.isHealthy(r.Object), 'message': k8s.getHealth(r.Object).message,