add sidecars support to primary masters containers (#259)

* add sidecars support to primary masters containers * add ytop-chart/templates/ytsaurus-crd.yaml --------- Co-authored-by: Konstantin Malov <[email protected]>
ytsaurus · May 18, 2024 · 61f83a2 · 61f83a2
1 parent e4ddb54
commit 61f83a2
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 8 deletions.
diff --git a/api/v1/ytsaurus_types.go b/api/v1/ytsaurus_types.go
@@ -269,6 +269,8 @@ type MastersSpec struct {
 
 	MaxSnapshotCountToKeep  *int `json:"maxSnapshotCountToKeep,omitempty"`
 	MaxChangelogCountToKeep *int `json:"maxChangelogCountToKeep,omitempty"`
+
+	Sidecars []string `json:"sidecars,omitempty"`
 }
 
 type HTTPTransportSpec struct {

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/cluster.ytsaurus.tech_ytsaurus.yaml b/config/crd/bases/cluster.ytsaurus.tech_ytsaurus.yaml
@@ -15262,6 +15262,10 @@ spec:
                     type: object
                   runtimeClassName:
                     type: string
+                  sidecars:
+                    items:
+                      type: string
+                    type: array
                   structuredLoggers:
                     items:
                       properties:
@@ -26953,6 +26957,10 @@ spec:
                       type: object
                     runtimeClassName:
                       type: string
+                    sidecars:
+                      items:
+                        type: string
+                      type: array
                     structuredLoggers:
                       items:
                         properties:

diff --git a/docs/api.md b/docs/api.md
@@ -859,6 +859,7 @@ _Appears in:_
 | `hostAddressLabel` _string_ |  |  |  |
 | `maxSnapshotCountToKeep` _integer_ |  |  |  |
 | `maxChangelogCountToKeep` _integer_ |  |  |  |
+| `sidecars` _string array_ |  |  |  |
 
 
 #### OauthServiceSpec

diff --git a/pkg/components/exec_node_base.go b/pkg/components/exec_node_base.go
@@ -6,7 +6,6 @@ import (
 	"path"
 
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/util/yaml"
 	ptr "k8s.io/utils/pointer"
 
 	ytv1 "github.com/ytsaurus/yt-k8s-operator/api/v1"
@@ -94,12 +93,8 @@ func (n *baseExecNode) doBuildBase() error {
 			})
 	}
 
-	for _, sidecarSpec := range n.spec.Sidecars {
-		sidecar := corev1.Container{}
-		if err := yaml.Unmarshal([]byte(sidecarSpec), &sidecar); err != nil {
-			return err
-		}
-		podSpec.Containers = append(podSpec.Containers, sidecar)
+	if err := AddSidecarsToPodSpec(n.spec.Sidecars, podSpec); err != nil {
+		return err
 	}
 
 	if n.sidecarConfig != nil {

diff --git a/pkg/components/helpers.go b/pkg/components/helpers.go
@@ -3,9 +3,12 @@ package components
 import (
 	"context"
 	"fmt"
+	"strings"
+
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	"strings"
+
+	"k8s.io/apimachinery/pkg/util/yaml"
 
 	"go.ytsaurus.tech/library/go/ptr"
 	"go.ytsaurus.tech/yt/go/ypath"
@@ -202,3 +205,14 @@ func AddAffinity(statefulSet *appsv1.StatefulSet,
 	affinity.NodeAffinity = nodeAffinity
 	statefulSet.Spec.Template.Spec.Affinity = affinity
 }
+
+func AddSidecarsToPodSpec(sidecar []string, podSpec *corev1.PodSpec) error {
+	for _, sidecarSpec := range sidecar {
+		sidecar := corev1.Container{}
+		if err := yaml.Unmarshal([]byte(sidecarSpec), &sidecar); err != nil {
+			return err
+		}
+		podSpec.Containers = append(podSpec.Containers, sidecar)
+	}
+	return nil
+}
diff --git a/pkg/components/master.go b/pkg/components/master.go
@@ -332,7 +332,13 @@ func (m *Master) Sync(ctx context.Context) error {
 
 func (m *Master) doServerSync(ctx context.Context) error {
 	statefulSet := m.server.buildStatefulSet()
+	podSpec := &statefulSet.Spec.Template.Spec
 	primaryMastersSpec := m.ytsaurus.GetResource().Spec.PrimaryMasters
+
+	if err := AddSidecarsToPodSpec(primaryMastersSpec.Sidecars, podSpec); err != nil {
+		return err
+	}
+
 	if len(primaryMastersSpec.HostAddresses) != 0 {
 		AddAffinity(statefulSet, m.getHostAddressLabel(), primaryMastersSpec.HostAddresses)
 	}

diff --git a/pkg/ytconfig/generator_test.go b/pkg/ytconfig/generator_test.go
@@ -401,6 +401,10 @@ func getYtsaurus() *ytv1.Ytsaurus {
 						},
 					},
 				},
+
+				Sidecars: []string{
+					"{name: sleep, image: fakeimage:stable, command: [/bin/sleep], args: [inf]}",
+				},
 			},
 		},
 	}

diff --git a/ytop-chart/templates/ytsaurus-crd.yaml b/ytop-chart/templates/ytsaurus-crd.yaml
@@ -15175,6 +15175,10 @@ spec:
                     type: object
                   runtimeClassName:
                     type: string
+                  sidecars:
+                    items:
+                      type: string
+                    type: array
                   structuredLoggers:
                     items:
                       properties:
@@ -26775,6 +26779,10 @@ spec:
                       type: object
                     runtimeClassName:
                       type: string
+                    sidecars:
+                      items:
+                        type: string
+                      type: array
                     structuredLoggers:
                       items:
                         properties:
-Original file line number
+Diff line change
@@ Expand Up / @@ -401,6 +401,10 @@ func getYtsaurus() *ytv1.Ytsaurus { @@
     						},
     					},
     				},
+    				Sidecars: []string{
+    					"{name: sleep, image: fakeimage:stable, command: [/bin/sleep], args: [inf]}",
+    				},
     			},
     		},
     	}
@@ Expand Down @@