Set datalayer http daemon port to not conflict with main chia container

Chia-Network · Jan 11, 2025 · 1a6bca4 · 1a6bca4
1 parent fc45bab
commit 1a6bca4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/api/v1/chiadatalayer_types.go b/api/v1/chiadatalayer_types.go
@@ -17,6 +17,7 @@ type ChiaDataLayerSpec struct {
 	ChiaConfig ChiaDataLayerSpecChia `json:"chia"`
 
 	// DataLayerHTTPConfig defines the desired state of an optional data_layer_http sidecar
+	// +optional
 	DataLayerHTTPConfig ChiaDataLayerHTTPSpecChia `json:"dataLayerHTTP"`
 
 	// Strategy describes how to replace existing pods with new ones.

diff --git a/config/crd/bases/k8s.chia.net_chiadatalayers.yaml b/config/crd/bases/k8s.chia.net_chiadatalayers.yaml
@@ -10656,7 +10656,6 @@ spec:
                 type: array
             required:
             - chia
-            - dataLayerHTTP
             type: object
           status:
             description: ChiaDataLayerStatus defines the observed state of ChiaDataLayer

diff --git a/config/samples/k8s_v1_chiadatalayer.yaml → config/samples/chiadatalayer.yaml b/config/samples/k8s_v1_chiadatalayer.yaml → config/samples/chiadatalayer.yaml
diff --git a/internal/controller/chiadatalayer/assemblers.go b/internal/controller/chiadatalayer/assemblers.go
@@ -399,6 +399,10 @@ func assembleDatalayerHTTPContainer(datalayer k8schianetv1.ChiaDataLayer) corev1
 				Name:  "chia.data_layer.server_files_location",
 				Value: "/datalayer/server",
 			},
+			{
+				Name:  "chia.daemon_port",
+				Value: "55401", // Avoids port conflict with the main chia container
+			},
 		},
 		VolumeMounts: []corev1.VolumeMount{
 			{