fix: update deployment if routerConfig changes (#45)

raffis · web-flow · commit 8897af8c7880 · 2026-01-06T10:46:12.000+01:00
* fix: update deployment if routerConfig changes

* test: fix race

* test: typo

* fix: remove scale
diff --git a/api/v1beta1/subgraph_types.go b/api/v1beta1/subgraph_types.go
@@ -51,7 +51,8 @@ type SchemaHTTP struct {
 }
 
 type SubGraphStatus struct {
-	SHA256Checksum string `json:"sha256Checksum,omitempty"`
+	// ObservedSHA256Checksum is a checksum of the discovered schema
+	ObservedSHA256Checksum string `json:"observedSHA256Checksum,omitempty"`
 
 	// Schema
 	Schema string `json:"schema,omitempty"`
diff --git a/api/v1beta1/supergraph_types.go b/api/v1beta1/supergraph_types.go
@@ -142,6 +142,9 @@ type SuperGraphStatus struct {
 	// ConfigMap reference
 	ConfigMap corev1.LocalObjectReference `json:"configMap,omitempty"`
 
+	// ObservedSHA256Checksum is a checksum of the discovered schema
+	ObservedSHA256Checksum string `json:"observedSHA256Checksum,omitempty"`
+
 	// ObservedGeneration is the last generation reconciled by the controller
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 }
diff --git a/api/v1beta1/supergraphschema_types.go b/api/v1beta1/supergraphschema_types.go
@@ -93,6 +93,7 @@ type SuperGraphSchemaStatus struct {
 
 	ComposeErrors []ComposeError `json:"composeErrors,omitempty"`
 
+	// ObservedSHA256Checksum is a checkum across all subgraph resources discovered by this resource
 	ObservedSHA256Checksum string `json:"observedSHA256Checksum,omitempty"`
 
 	// ConfigMap reference
diff --git a/chart/apollo-controller/crds/apollo.infra.doodle.com_subgraphs.yaml b/chart/apollo-controller/crds/apollo.infra.doodle.com_subgraphs.yaml
@@ -137,11 +137,13 @@ spec:
                   by the controller
                 format: int64
                 type: integer
+              observedSHA256Checksum:
+                description: ObservedSHA256Checksum is a checksum of the discovered
+                  schema
+                type: string
               schema:
                 description: Schema
                 type: string
-              sha256Checksum:
-                type: string
             type: object
         type: object
     served: true
diff --git a/chart/apollo-controller/crds/apollo.infra.doodle.com_supergraphs.yaml b/chart/apollo-controller/crds/apollo.infra.doodle.com_supergraphs.yaml
@@ -8894,6 +8894,10 @@ spec:
                   by the controller
                 format: int64
                 type: integer
+              observedSHA256Checksum:
+                description: ObservedSHA256Checksum is a checksum of the discovered
+                  schema
+                type: string
             type: object
         type: object
     served: true
diff --git a/chart/apollo-controller/crds/apollo.infra.doodle.com_supergraphschemas.yaml b/chart/apollo-controller/crds/apollo.infra.doodle.com_supergraphschemas.yaml
@@ -8738,6 +8738,8 @@ spec:
                 format: int64
                 type: integer
               observedSHA256Checksum:
+                description: ObservedSHA256Checksum is a checkum across all subgraph
+                  resources discovered by this resource
                 type: string
               reconciler:
                 description: |-
diff --git a/config/base/crd/bases/apollo.infra.doodle.com_subgraphs.yaml b/config/base/crd/bases/apollo.infra.doodle.com_subgraphs.yaml
@@ -137,11 +137,13 @@ spec:
                   by the controller
                 format: int64
                 type: integer
+              observedSHA256Checksum:
+                description: ObservedSHA256Checksum is a checksum of the discovered
+                  schema
+                type: string
               schema:
                 description: Schema
                 type: string
-              sha256Checksum:
-                type: string
             type: object
         type: object
     served: true
diff --git a/config/base/crd/bases/apollo.infra.doodle.com_supergraphs.yaml b/config/base/crd/bases/apollo.infra.doodle.com_supergraphs.yaml
@@ -8894,6 +8894,10 @@ spec:
                   by the controller
                 format: int64
                 type: integer
+              observedSHA256Checksum:
+                description: ObservedSHA256Checksum is a checksum of the discovered
+                  schema
+                type: string
             type: object
         type: object
     served: true
diff --git a/config/base/crd/bases/apollo.infra.doodle.com_supergraphschemas.yaml b/config/base/crd/bases/apollo.infra.doodle.com_supergraphschemas.yaml
@@ -8738,6 +8738,8 @@ spec:
                 format: int64
                 type: integer
               observedSHA256Checksum:
+                description: ObservedSHA256Checksum is a checkum across all subgraph
+                  resources discovered by this resource
                 type: string
               reconciler:
                 description: |-
diff --git a/internal/controllers/subgraph_controller.go b/internal/controllers/subgraph_controller.go
@@ -175,7 +175,7 @@ func (r *SubGraphReconciler) reconcile(ctx context.Context, subgraph infrav1beta
 	checksumSha := sha256.New()
 	checksumSha.Write([]byte(schema))
 	checksum := fmt.Sprintf("%x", checksumSha.Sum(nil))
-	subgraph.Status.SHA256Checksum = checksum
+	subgraph.Status.ObservedSHA256Checksum = checksum
 	subgraph.Status.Schema = schema
 
 	subgraph = infrav1beta1.SubGraphReady(subgraph, metav1.ConditionTrue, "ReconciliationSuccessful", "schema available")
diff --git a/internal/controllers/supergraph_controller.go b/internal/controllers/supergraph_controller.go
@@ -18,6 +18,7 @@ package controllers
 
 import (
 	"context"
+	"crypto/sha256"
 	"encoding/json"
 	"fmt"
 
@@ -220,11 +221,15 @@ func (r *SuperGraphReconciler) reconcile(ctx context.Context, supergraph infrav1
 		return supergraph, result, err
 	}
 
+	checksumSha := sha256.New()
+	checksumSha.Write(supergraph.Spec.RouterConfig.Raw)
+	configChecksum := fmt.Sprintf("%x", checksumSha.Sum(nil))
+	supergraph.Status.ObservedSHA256Checksum = configChecksum
+
 	var (
 		gid          int64 = 10000
 		uid          int64 = 10000
 		runAsNonRoot       = true
-		replicas     int32 = 1
 	)
 
 	controllerOwner := true
@@ -288,11 +293,7 @@ func (r *SuperGraphReconciler) reconcile(ctx context.Context, supergraph infrav1
 	}
 
 	deploymentTemplate.Spec.Template.Annotations["apollo-controller/schema-checksum"] = graphschema.Status.ObservedSHA256Checksum
-
-	if deploymentTemplate.Spec.Replicas == nil {
-		deploymentTemplate.Spec.Replicas = &replicas
-	}
-
+	deploymentTemplate.Spec.Template.Annotations["apollo-controller/config-checksum"] = supergraph.Status.ObservedSHA256Checksum
 	deploymentTemplate.Spec.Template.Labels["app.kubernetes.io/instance"] = "apollo-router"
 	deploymentTemplate.Spec.Template.Labels["app.kubernetes.io/name"] = "apollo-router"
 	deploymentTemplate.Spec.Template.Labels["apollo-controller/supergraph"] = supergraph.Name
@@ -327,12 +328,12 @@ func (r *SuperGraphReconciler) reconcile(ctx context.Context, supergraph infrav1
 	containers := []corev1.Container{
 		{
 			Name:  "router",
-			Image: "ghcr.io/apollographql/router:v2.9.0",
+			Image: "ghcr.io/apollographql/router:v2.10.0",
 			Args: []string{
 				"--config",
-				"/config/router.yaml",
+				"/router.yaml",
 				"--supergraph",
-				"/schema/schema.graphql",
+				"/schema.graphql",
 				"--listen",
 				"0.0.0.0:4000",
 			},
@@ -365,11 +366,13 @@ func (r *SuperGraphReconciler) reconcile(ctx context.Context, supergraph infrav1
 			VolumeMounts: []corev1.VolumeMount{
 				{
 					Name:      "schema",
-					MountPath: "/schema",
+					MountPath: "/schema.graphql",
+					SubPath:   "schema.graphql",
 				},
 				{
 					Name:      "config",
-					MountPath: "/config",
+					MountPath: "/router.yaml",
+					SubPath:   "router.yaml",
 				},
 			},
 		},
diff --git a/internal/controllers/supergraph_controller_test.go b/internal/controllers/supergraph_controller_test.go
diff --git a/internal/controllers/supergraphschema_controller.go b/internal/controllers/supergraphschema_controller.go
diff --git a/internal/controllers/supergraphschema_controller_test.go b/internal/controllers/supergraphschema_controller_test.go

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ type SchemaHTTP struct {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`type SubGraphStatus struct {`
`54`		- SHA256Checksum string `json:"sha256Checksum,omitempty"`
	`54`	`+ // ObservedSHA256Checksum is a checksum of the discovered schema`
	`55`	+ ObservedSHA256Checksum string `json:"observedSHA256Checksum,omitempty"`
`55`	`56`
`56`	`57`	`// Schema`
`57`	`58`	Schema string `json:"schema,omitempty"`
Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,9 @@ type SuperGraphStatus struct {`
`142`	`142`	`// ConfigMap reference`
`143`	`143`	ConfigMap corev1.LocalObjectReference `json:"configMap,omitempty"`
`144`	`144`
	`145`	`+ // ObservedSHA256Checksum is a checksum of the discovered schema`
	`146`	+ ObservedSHA256Checksum string `json:"observedSHA256Checksum,omitempty"`
	`147`	`+`
`145`	`148`	`// ObservedGeneration is the last generation reconciled by the controller`
`146`	`149`	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
`147`	`150`	`}`