Merge branch 'main' of github.com:user-cube/bootchain-operator

user-cube · user-cube · commit 21824a41ee7e · 2026-03-01T01:59:02.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [1.3.1](https://github.com/user-cube/bootchain-operator/compare/v1.3.0...v1.3.1) (2026-03-01)
+
+
+### Bug Fixes
+
+* update dashboard; use full fqdn ([#15](https://github.com/user-cube/bootchain-operator/issues/15)) ([dfe671b](https://github.com/user-cube/bootchain-operator/commit/dfe671b9076b49da34c7eb99891b149afcdf9f29))
+
 # [1.3.0](https://github.com/user-cube/bootchain-operator/compare/v1.2.4...v1.3.0) (2026-03-01)
 
 
diff --git a/charts/bootchain-operator/CHANGELOG.md b/charts/bootchain-operator/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [1.3.1](https://github.com/user-cube/bootchain-operator/compare/v1.3.0...v1.3.1) (2026-03-01)
+
+
+### Bug Fixes
+
+* update dashboard; use full fqdn ([#15](https://github.com/user-cube/bootchain-operator/issues/15)) ([dfe671b](https://github.com/user-cube/bootchain-operator/commit/dfe671b9076b49da34c7eb99891b149afcdf9f29))
+
 # [1.3.0](https://github.com/user-cube/bootchain-operator/compare/v1.2.4...v1.3.0) (2026-03-01)
 
 
diff --git a/charts/bootchain-operator/Chart.yaml b/charts/bootchain-operator/Chart.yaml
@@ -4,8 +4,8 @@ description: >-
   A Kubernetes operator that makes service boot dependencies declarative and
   automatic, eliminating hand-written init containers.
 type: application
-version: 1.3.0
-appVersion: v1.3.0
+version: 1.3.1
+appVersion: v1.3.1
 keywords:
   - kubernetes
   - operator
diff --git a/charts/bootchain-operator/README.md b/charts/bootchain-operator/README.md
@@ -1,6 +1,6 @@
 # bootchain-operator
 
-![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.3.0](https://img.shields.io/badge/AppVersion-v1.3.0-informational?style=flat-square)
+![Version: 1.3.1](https://img.shields.io/badge/Version-1.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.3.1](https://img.shields.io/badge/AppVersion-v1.3.1-informational?style=flat-square)
 
 A Kubernetes operator that makes service boot dependencies declarative and automatic, eliminating hand-written init containers.
 
diff --git a/charts/bootchain-operator/artifacthub-pkg.yml b/charts/bootchain-operator/artifacthub-pkg.yml
@@ -1,4 +1,4 @@
-version: 1.3.0
+version: 1.3.1
 name: bootchain-operator
 displayName: Bootchain Operator
 description: Helm chart that deploys the Bootchain Operator.
@@ -17,10 +17,10 @@ annotations:
   artifacthub.io/category: kubernetes
   artifacthub.io/license: Apache-2.0
   artifacthub.io/maintainers: user-cube
-createdAt: '2026-03-01T01:06:47Z'
+createdAt: '2026-03-01T01:50:31Z'
 changes:
-- kind: added
-  description: add grafana dashboard ([#14](https://github.com/user-cube/bootchain-operator/issues/14))
+- kind: fixed
+  description: update dashboard; use full fqdn ([#15](https://github.com/user-cube/bootchain-operator/issues/15))
   links:
-  - name: Commit 5505a10
-    url: https://github.com/user-cube/bootchain-operator/commit/5505a104ee234e5f63f09af3231068c110014155
+  - name: Commit dfe671b
+    url: https://github.com/user-cube/bootchain-operator/commit/dfe671b9076b49da34c7eb99891b149afcdf9f29
diff --git a/charts/bootchain-operator/templates/grafana-dashboard.yaml b/charts/bootchain-operator/templates/grafana-dashboard.yaml
@@ -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"
@@ -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"
@@ -107,8 +106,7 @@ data:
               "thresholds": {
                 "mode": "absolute",
                 "steps": [
-                  { "color": "red", "value": null },
-                  { "color": "green", "value": 1 }
+                  { "color": "green", "value": null }
                 ]
               },
               "unit": "short"
@@ -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"
@@ -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"
@@ -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"
@@ -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": [
@@ -201,7 +200,7 @@ data:
           "id": 4,
           "options": {
             "colorMode": "background",
-            "graphMode": "area",
+            "graphMode": "none",
             "justifyMode": "auto",
             "orientation": "auto",
             "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },
@@ -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"
             }
@@ -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 },
@@ -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"
@@ -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 }}
diff --git a/internal/controller/bootdependency_controller_test.go b/internal/controller/bootdependency_controller_test.go
@@ -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)
