Skip to content

🌱 Summary template path fix + prometheus skip #2536

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

Open
dtfranz wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −7
Open

🌱 Summary template path fix + prometheus skip #2536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,11 @@ test-experimental-e2e: run-internal image-registry prometheus e2e e2e-coverage k
prometheus: PROMETHEUS_NAMESPACE := olmv1-system
prometheus: PROMETHEUS_VERSION := v0.83.0
prometheus: $(KUSTOMIZE) #EXHELP Deploy Prometheus into specified namespace
ifeq ($(strip $(E2E_SUMMARY_OUTPUT)),)
@echo "E2E_SUMMARY_OUTPUT unset; skipping prometheus deployment"
else
./hack/test/install-prometheus.sh $(PROMETHEUS_NAMESPACE) $(PROMETHEUS_VERSION) $(VERSION) $(PROMETHEUS_VALUES)
endif

.PHONY: test-extension-developer-e2e
test-extension-developer-e2e: SOURCE_MANIFEST := $(STANDARD_E2E_MANIFEST)
Expand Down
10 changes: 5 additions & 5 deletions ...theus/templates/servicemonitor-operator-controller-controller-manager-metrics-monitor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ spec:
name: prometheus-metrics-token
interval: 10s
path: /metrics
port: https
port: metrics
scheme: https
tlsConfig:
ca:
secret:
key: ca.crt
name: olmv1-cert
name: operator-controller-cert
cert:
secret:
key: tls.crt
name: olmv1-cert
name: operator-controller-cert
insecureSkipVerify: false
keySecret:
key: tls.key
name: olmv1-cert
name: operator-controller-cert
serverName: operator-controller-service.{{ .Values.namespaces.olmv1.name }}.svc
selector:
matchLabels:
control-plane: operator-controller-controller-manager
app.kubernetes.io/name: operator-controller
4 changes: 2 additions & 2 deletions internal/shared/util/test/summary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func (s *githubSummary) PerformanceQuery(title, pod, query, yLabel string, scale
matrix, ok := result.(model.Matrix)
if !ok {
return "", fmt.Errorf("typecast for metrics samples failed; aborting")
} else if len(matrix) > 1 {
} else if len(matrix) != 1 {
return "", fmt.Errorf("expected 1 set of results; got: %d", len(matrix))
}
chart := xychart{
Expand Down Expand Up @@ -160,7 +160,7 @@ func executeTemplate(templateFile string, obj any) (string, error) {
if err != nil {
return "", fmt.Errorf("failed to get working directory: %w", err)
}
tmpl, err := template.New(templateFile).ParseGlob(filepath.Join(wd, "../../internal/shared/util/testutils/templates", templateFile))
tmpl, err := template.New(templateFile).ParseGlob(filepath.Join(wd, "../../internal/shared/util/test/templates", templateFile))
if err != nil {
return "", err
}
Expand Down
Loading