Skip to content

fix: update dashboard; use full fqdn #15

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

Merged
user-cube merged 4 commits into from
Mar 1, 2026
Merged

fix: update dashboard; use full fqdn #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fff9c08
fix: update dashboard
user-cube Mar 1, 2026
83a354e
fix: use full fqdn
user-cube Mar 1, 2026
2979c6d
fix: fix slow test
user-cube Mar 1, 2026
d80f3a9
fix: update board name
user-cube Mar 1, 2026
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
115 changes: 72 additions & 43 deletions charts/bootchain-operator/templates/grafana-dashboard.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,12 @@ data:
"datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },
"fieldConfig": {
"defaults": {
"color": { "mode": "thresholds" },
"color": { "mode": "fixed", "fixedColor": "green" },
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{ "color": "green", "value": null },
{ "color": "red", "value": 1 }
{ "color": "green", "value": null }
]
},
"unit": "short"
Expand All @@ -89,7 +88,7 @@ data:
"targets": [
{
"datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },
"expr": "count(bootchain_dependencies_total{namespace=~\"$namespace\"})",
"expr": "count(bootchain_dependencies_total{namespace=~\"$namespace\"}) or vector(0)",
"instant": true,
"legendFormat": "",
"refId": "A"
Expand All @@ -107,8 +106,7 @@ data:
"thresholds": {
"mode": "absolute",
"steps": [
{ "color": "red", "value": null },
{ "color": "green", "value": 1 }
{ "color": "green", "value": null }
]
},
"unit": "short"
Expand All @@ -129,7 +127,7 @@ data:
"targets": [
{
"datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },
"expr": "sum(bootchain_dependencies_ready{namespace=~\"$namespace\"})",
"expr": "sum(bootchain_dependencies_ready{namespace=~\"$namespace\"}) or vector(0)",
"instant": true,
"legendFormat": "",
"refId": "A"
Expand All @@ -148,8 +146,7 @@ data:
"mode": "absolute",
"steps": [
{ "color": "green", "value": null },
{ "color": "yellow", "value": 1 },
{ "color": "red", "value": 5 }
{ "color": "red", "value": 1 }
]
},
"unit": "short"
Expand All @@ -170,7 +167,7 @@ data:
"targets": [
{
"datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },
"expr": "sum(bootchain_dependencies_total{namespace=~\"$namespace\"}) - sum(bootchain_dependencies_ready{namespace=~\"$namespace\"})",
"expr": "(sum(bootchain_dependencies_total{namespace=~\"$namespace\"}) or vector(0)) - (sum(bootchain_dependencies_ready{namespace=~\"$namespace\"}) or vector(0))",
"instant": true,
"legendFormat": "",
"refId": "A"
Expand All @@ -184,7 +181,9 @@ data:
"fieldConfig": {
"defaults": {
"color": { "mode": "thresholds" },
"mappings": [],
"mappings": [
{ "options": { "match": "null", "result": { "color": "green", "index": 0, "text": "0%" } }, "type": "special" }
],
"thresholds": {
"mode": "absolute",
"steps": [
Expand All @@ -201,7 +200,7 @@ data:
"id": 4,
"options": {
"colorMode": "background",
"graphMode": "area",
"graphMode": "none",
"justifyMode": "auto",
"orientation": "auto",
"reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },
Expand All @@ -211,8 +210,8 @@ data:
"targets": [
{
"datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },
"expr": "rate(bootchain_reconcile_total{result=\"error\"}[$__rate_interval]) / rate(bootchain_reconcile_total[$__rate_interval])",
"instant": false,
"expr": "(sum(rate(bootchain_reconcile_total{result=\"error\"}[5m])) or vector(0)) / ((sum(rate(bootchain_reconcile_total[5m])) or vector(0)) > 0)",
"instant": true,
"legendFormat": "",
"refId": "A"
}
Expand Down Expand Up @@ -388,10 +387,36 @@ data:
}
},
"overrides": [
{ "matcher": { "id": "byName", "options": "namespace" }, "properties": [{ "id": "custom.width", "value": 120 }] },
{ "matcher": { "id": "byName", "options": "name" }, "properties": [{ "id": "custom.width", "value": 200 }] },
{ "matcher": { "id": "byName", "options": "ready" }, "properties": [{ "id": "custom.width", "value": 80 }] },
{ "matcher": { "id": "byName", "options": "total" }, "properties": [{ "id": "custom.width", "value": 70 }] }
{ "matcher": { "id": "byName", "options": "namespace" }, "properties": [{ "id": "custom.width", "value": 160 }] },
{ "matcher": { "id": "byName", "options": "name" }, "properties": [{ "id": "custom.width", "value": 220 }] },
{
"matcher": { "id": "byName", "options": "ready" },
"properties": [
{ "id": "custom.width", "value": 80 },
{ "id": "custom.cellOptions", "value": { "type": "auto" } }
]
},
{
"matcher": { "id": "byName", "options": "total" },
"properties": [
{ "id": "custom.width", "value": 80 },
{ "id": "custom.cellOptions", "value": { "type": "auto" } }
]
},
{
"matcher": { "id": "byName", "options": "Value #A" },
"properties": [
{ "id": "displayName", "value": "ready" },
{ "id": "custom.width", "value": 80 }
]
},
{
"matcher": { "id": "byName", "options": "Value #B" },
"properties": [
{ "id": "displayName", "value": "total" },
{ "id": "custom.width", "value": 80 }
]
}
]
},
"gridPos": { "h": 8, "w": 24, "x": 0, "y": 14 },
Expand All @@ -404,53 +429,57 @@ data:
},
"pluginVersion": "10.0.0",
"targets": [
{
"datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },
"expr": "label_replace(\n bootchain_dependencies_ready{namespace=~\"$namespace\", name=~\"$bootdependency\"}\n == bootchain_dependencies_total{namespace=~\"$namespace\", name=~\"$bootdependency\"},\n \"status\", \"1\", \"\", \"\"\n) or label_replace(\n bootchain_dependencies_ready{namespace=~\"$namespace\", name=~\"$bootdependency\"}\n != bootchain_dependencies_total{namespace=~\"$namespace\", name=~\"$bootdependency\"},\n \"status\", \"0\", \"\", \"\"\n)",
"format": "table",
"instant": true,
"legendFormat": "",
"refId": "A"
},
{
"datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },
"expr": "bootchain_dependencies_ready{namespace=~\"$namespace\", name=~\"$bootdependency\"}",
"format": "table",
"instant": true,
"legendFormat": "",
"refId": "B"
"refId": "A"
},
{
"datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },
"expr": "bootchain_dependencies_total{namespace=~\"$namespace\", name=~\"$bootdependency\"}",
"format": "table",
"instant": true,
"legendFormat": "",
"refId": "C"
"refId": "B"
}
],
"title": "BootDependency Status Table",
"transformations": [
{ "id": "joinByField", "options": { "byField": "name", "mode": "outer" } },
{
"id": "joinByLabels",
"options": { "labels": ["namespace", "name"] }
},
{
"id": "organize",
"options": {
"excludeByName": {
"Time": true, "Time 1": true, "Time 2": true, "Time 3": true,
"namespace 2": true, "namespace 3": true,
"__name__ 1": true, "__name__ 2": true, "__name__ 3": true,
"job 1": true, "job 2": true, "job 3": true,
"instance 1": true, "instance 2": true, "instance 3": true,
"status": true
"excludeByName": {},
"indexByName": {
"namespace": 0,
"name": 1,
"Value #A": 2,
"Value #B": 3
},
"renameByName": {
"namespace 1": "namespace",
"name": "name",
"Value #B": "ready",
"Value #C": "total",
"Value #A": "all_ready"
"Value #A": "ready",
"Value #B": "total"
}
}
},
{
"id": "calculateField",
"options": {
"alias": "status",
"binary": {
"left": "ready",
"operator": "==",
"right": "total"
},
"mode": "reduceRow",
"reduce": { "reducer": "sum" }
}
}
],
"type": "table"
Expand Down Expand Up @@ -751,8 +780,8 @@ data:
"time": { "from": "now-1h", "to": "now" },
"timepicker": {},
"timezone": "browser",
"title": "bootchain-operator",
"title": "Bootchain Operator",
"uid": "bootchain-operator-v1",
"version": 1
"version": 3
}
{{- end }}
16 changes: 12 additions & 4 deletions internal/controller/bootdependency_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (r *BootDependencyReconciler) Reconcile(ctx context.Context, req ctrl.Reque
if scheme == "" {
scheme = "http"
}
url := fmt.Sprintf("%s://%s:%d%s", scheme, depLabel(dep), dep.Port, dep.HTTPPath)
url := fmt.Sprintf("%s://%s:%d%s", scheme, depHost(dep, bd.Namespace), dep.Port, dep.HTTPPath)
httpClient := secureClient
if dep.Insecure {
httpClient = insecureClient
Expand Down Expand Up @@ -177,13 +177,21 @@ func (r *BootDependencyReconciler) Reconcile(ctx context.Context, req ctrl.Reque
return ctrl.Result{RequeueAfter: requeueAfterNotReady}, nil
}

// depAddress returns the dial address for a dependency.
// depAddress returns the dial address (host:port) for a dependency.
// For in-cluster services it resolves to the FQDN; for external hosts it uses the host directly.
func depAddress(dep corev1alpha1.ServiceDependency, namespace string) string {
return fmt.Sprintf("%s:%d", depHost(dep, namespace), dep.Port)
}

// depHost returns the hostname for a dependency.
// For in-cluster services it builds the FQDN <service>.<namespace>.svc.cluster.local so that
// the controller — which runs in a different namespace — can always resolve the service correctly.
// For external dependencies (host field set) it returns the host directly.
func depHost(dep corev1alpha1.ServiceDependency, namespace string) string {
if dep.Host != "" {
return fmt.Sprintf("%s:%d", dep.Host, dep.Port)
return dep.Host
}
return fmt.Sprintf("%s.%s.svc.cluster.local:%d", dep.Service, namespace, dep.Port)
return fmt.Sprintf("%s.%s.svc.cluster.local", dep.Service, namespace)
}

// statusAccepted returns true when code is in the accepted list.
Expand Down
13 changes: 13 additions & 0 deletions internal/controller/bootdependency_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,19 @@ var _ = Describe("BootDependency Controller", func() {
Expect(<-probed).To(Equal("/ready"))
})

It("should build FQDN from service name and BootDependency namespace for HTTP probes", func() {
// Unit-test depHost directly to guard against the regression where service-based
// HTTP probes used the bare service name instead of the FQDN, causing DNS lookup
// failures when the controller runs in a different namespace than the target service.
dep := corev1alpha1.ServiceDependency{Service: "my-svc", Port: 8080}
Expect(depHost(dep, "my-namespace")).To(Equal("my-svc.my-namespace.svc.cluster.local"))
})

It("should use the host field directly when set, not build a FQDN", func() {
dep := corev1alpha1.ServiceDependency{Host: "external.example.com", Port: 443}
Expect(depHost(dep, "any-namespace")).To(Equal("external.example.com"))
})

It("should resolve an HTTPS dependency when insecure=true and server has a self-signed cert", func() {
srv := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
w.WriteHeader(http.StatusOK)
Expand Down
Loading