Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set log dir and log group through environment variables for unified image #2060

Merged
merged 3 commits into from
Jun 14, 2024
Merged

Set log dir and log group through environment variables for unified image #2060

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2cf8aeb
set logging var in env for unified image
nicmorales9 Jun 11, 2024
414bfe3
review
nicmorales9 Jun 13, 2024
0398a19
fix envVar clash in patch
nicmorales9 Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions api/v1beta2/foundationdbcluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2468,6 +2468,15 @@ func (cluster *FoundationDBCluster) NeedsReplacement(processGroup *ProcessGroupS
return processGroup.ProcessClass.IsTransaction()
}

// GetLogGroup returns the cluster's logGroup for use in trace logs
func (cluster *FoundationDBCluster) GetLogGroup() string {
logGroup := cluster.Spec.LogGroup
if logGroup == "" {
logGroup = cluster.Name
}
return logGroup
}

// GetResourceLabels returns the resource labels for all created resources
func (cluster *FoundationDBCluster) GetResourceLabels() map[string]string {
if cluster.Spec.LabelConfig.ResourceLabels != nil {
Expand Down
5 changes: 1 addition & 4 deletions internal/monitor_conf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,7 @@ func GetMonitorProcessConfiguration(cluster *fdbv1beta2.FoundationDBCluster, pro
configuration.RunServers = pointer.Bool(false)
}

logGroup := cluster.Spec.LogGroup
if logGroup == "" {
logGroup = cluster.Name
}
logGroup := cluster.GetLogGroup()

var zoneVariable string
if strings.HasPrefix(cluster.Spec.FaultDomain.ValueFrom, "$") {
Expand Down
7 changes: 3 additions & 4 deletions internal/pod_models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ func configureContainersForUnifiedImages(cluster *fdbv1beta2.FoundationDBCluster
mainContainer.Env = append(mainContainer.Env, corev1.EnvVar{Name: "FDB_POD_NAMESPACE", ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.namespace"},
}})
mainContainer.Env = append(mainContainer.Env, corev1.EnvVar{Name: "FDB_NETWORK_OPTION_TRACE_LOG_GROUP", Value: cluster.GetLogGroup()})
mainContainer.Env = append(mainContainer.Env, corev1.EnvVar{Name: "FDB_NETWORK_OPTION_TRACE_ENABLE", Value: "/var/log/fdb-trace-logs"})
nicmorales9 marked this conversation as resolved.
Show resolved Hide resolved
if cluster.DefineDNSLocalityFields() {
mainContainer.Env = append(mainContainer.Env, corev1.EnvVar{Name: "FDB_DNS_NAME", Value: GetPodDNSName(cluster, processGroup.GetPodName(cluster))})
}
Expand Down Expand Up @@ -419,10 +421,7 @@ func GetPodSpec(cluster *fdbv1beta2.FoundationDBCluster, processGroup *fdbv1beta
extendEnv(mainContainer, corev1.EnvVar{Name: "FDB_TLS_CA_FILE", Value: "/var/dynamic-conf/ca.pem"})
}

logGroup := cluster.Spec.LogGroup
if logGroup == "" {
logGroup = cluster.Name
}
logGroup := cluster.GetLogGroup()

podName := processGroup.GetPodName(cluster)
if useUnifiedImage {
Expand Down
8 changes: 8 additions & 0 deletions internal/pod_models_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,8 @@ var _ = Describe("pod_models", func() {
{Name: "FDB_POD_NAMESPACE", ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.namespace"},
}},
{Name: "FDB_NETWORK_OPTION_TRACE_LOG_GROUP", Value: cluster.Name},
{Name: "FDB_NETWORK_OPTION_TRACE_ENABLE", Value: "/var/log/fdb-trace-logs"},
}))

Expect(*mainContainer.Resources.Limits.Cpu()).To(Equal(resource.MustParse("1")))
Expand Down Expand Up @@ -644,6 +646,8 @@ var _ = Describe("pod_models", func() {
{Name: "FDB_POD_NAMESPACE", ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.namespace"},
}},
{Name: "FDB_NETWORK_OPTION_TRACE_LOG_GROUP", Value: cluster.Name},
{Name: "FDB_NETWORK_OPTION_TRACE_ENABLE", Value: "/var/log/fdb-trace-logs"},
}))
})

Expand Down Expand Up @@ -698,6 +702,8 @@ var _ = Describe("pod_models", func() {
{Name: "FDB_POD_NAMESPACE", ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.namespace"},
}},
{Name: "FDB_NETWORK_OPTION_TRACE_LOG_GROUP", Value: cluster.Name},
{Name: "FDB_NETWORK_OPTION_TRACE_ENABLE", Value: "/var/log/fdb-trace-logs"},
}))
})

Expand Down Expand Up @@ -754,6 +760,8 @@ var _ = Describe("pod_models", func() {
{Name: "FDB_POD_NAMESPACE", ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.namespace"},
}},
{Name: "FDB_NETWORK_OPTION_TRACE_LOG_GROUP", Value: cluster.Name},
{Name: "FDB_NETWORK_OPTION_TRACE_ENABLE", Value: "/var/log/fdb-trace-logs"},
}))
})

Expand Down
Loading