Merge pull request #7 from Netcracker/bugfix/affinity

Fix affinity for logging components
Netcracker · Feb 19, 2025 · 4ff53c3 · 4ff53c3
2 parents 8028b39 + 446fd80
commit 4ff53c3
Show file tree

Hide file tree

Showing 18 changed files with 8,510 additions and 3,740 deletions.
diff --git a/api/v1alpha1/loggingservice_types.go b/api/v1alpha1/loggingservice_types.go
@@ -90,6 +90,7 @@ type Graylog struct {
 	AuthProxy                                *AuthProxy                   `json:"authProxy,omitempty"`
 	TLS                                      *GraylogTLS                  `json:"tls,omitempty"`
 	OpenSearch                               *OpenSearch                  `json:"openSearch,omitempty"`
+	Affinity                                 *v1.Affinity                 `json:"affinity,omitempty"`
 	Annotations                              map[string]string            `json:"annotations,omitempty"`
 	Labels                                   map[string]string            `json:"labels,omitempty"`
 	NodeSelectorValue                        string                       `json:"nodeSelectorValue,omitempty"`
@@ -194,6 +195,7 @@ type Fluentd struct {
 	ExcludePath                []string                 `json:"excludePath,omitempty"`
 	AdditionalVolumes          []v1.Volume              `json:"additionalVolumes,omitempty"`
 	Tolerations                []v1.Toleration          `json:"tolerations,omitempty"`
+	Affinity                   *v1.Affinity             `json:"affinity,omitempty"`
 	QueueLimitLength           int                      `json:"queueLimitLength,omitempty"`
 	GraylogPort                int                      `json:"graylogPort,omitempty"`
 	BillCycleConf              bool                     `json:"billCycleConf,omitempty"`
@@ -240,6 +242,7 @@ type Fluentbit struct {
 	AdditionalVolumes         []v1.Volume              `json:"additionalVolumes,omitempty"`
 	AdditionalVolumeMounts    []v1.VolumeMount         `json:"additionalVolumeMounts,omitempty"`
 	Tolerations               []v1.Toleration          `json:"tolerations,omitempty"`
+	Affinity                  *v1.Affinity             `json:"affinity,omitempty"`
 	GraylogPort               int                      `json:"graylogPort,omitempty"`
 	SecurityContextPrivileged bool                     `json:"securityContextPrivileged,omitempty"`
 	WatchKubernetesMetadata   bool                     `json:"watchKubernetesMetadata,omitempty"`
@@ -278,6 +281,7 @@ type FluentbitAggregator struct {
 	CustomLuaScriptConf       map[string]string        `json:"customLuaScriptConf,omitempty"`
 	TLS                       FluentbitTLS             `json:"tls,omitempty"`
 	Tolerations               []v1.Toleration          `json:"tolerations,omitempty"`
+	Affinity                  *v1.Affinity             `json:"affinity,omitempty"`
 	StartupTimeout            int                      `json:"startupTimeout,omitempty"`
 	Replicas                  int                      `json:"replicas,omitempty"`
 	GraylogPort               int                      `json:"graylogPort,omitempty"`
@@ -294,14 +298,15 @@ type CloudEventsReader struct {
 	PriorityClassName string                   `json:"priorityClassName,omitempty"`
 	NodeSelectorKey   string                   `json:"nodeSelectorKey,omitempty"`
 	NodeSelectorValue string                   `json:"nodeSelectorValue,omitempty"`
+	Affinity          *v1.Affinity             `json:"affinity,omitempty"`
 	Labels            map[string]string        `json:"labels,omitempty"`
 	Annotations       map[string]string        `json:"annotations,omitempty"`
 	Args              []string                 `json:"args,omitempty"`
 	Install           bool                     `json:"install"`
 }
 
 // MonitoringAgentLoggingPlugin contains MonitoringAgentLoggingPlugin-specific configuration
-//+kubebuilder:deprecatedversion:warning="MonitoringAgentLoggingPlugin section is no longer need and use"
+// +kubebuilder:deprecatedversion:warning="MonitoringAgentLoggingPlugin section is no longer need and use"
 type MonitoringAgentLoggingPlugin struct {
 	Resources          *v1.ResourceRequirements `json:"resources,omitempty"`
 	Annotations        map[string]string        `json:"annotations,omitempty"`

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/qubership-logging-operator/Chart.yaml b/charts/qubership-logging-operator/Chart.yaml
@@ -7,7 +7,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 2.0.0
+version: 2.0.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.