Skip to content

Commit 744fe8b

Browse files
committed
Add observabilityclient config to env vars
1 parent 06eb0b3 commit 744fe8b

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ require (
3333
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240125084018-043c1fc15b4f
3434
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240125124919-72883dc08303
3535
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240125135518-3bd566f845a6
36+
github.com/openstack-k8s-operators/telemetry-operator v0.1.1-0.20240130075809-6609fa1c0732
3637
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240125213204-be84db57f62f
3738
github.com/operator-framework/api v0.20.0
3839
github.com/rabbitmq/cluster-operator/v2 v2.5.0

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,8 @@ github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.2024012512491
191191
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240125124919-72883dc08303/go.mod h1:G4XUqjS1C8V5U066HUcjnCyxTNhU4cSZOOGXcOCOhz4=
192192
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240125135518-3bd566f845a6 h1:eKwXlZguzhBiHJvbB82yVvcMsSMERLVT9NnMOei5gZE=
193193
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240125135518-3bd566f845a6/go.mod h1:fwLKs8h2isnIutnuN19Sf2e+eYjpiHV/92Fe9CYJXp8=
194+
github.com/openstack-k8s-operators/telemetry-operator v0.1.1-0.20240130075809-6609fa1c0732 h1:xQTytYZsDVxpm4JUpgUrtzrN/HQ9fuVE17jWymmioOc=
195+
github.com/openstack-k8s-operators/telemetry-operator v0.1.1-0.20240130075809-6609fa1c0732/go.mod h1:v3zM1DOYEMry+GSJY6MLVtDeHRnY09ttSdv6gvcpIbQ=
194196
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240125213204-be84db57f62f h1:d8xOg4OH1VtEfV6Q0xXS93qsCo78b+7ZQGoIQmGZNvI=
195197
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240125213204-be84db57f62f/go.mod h1:u5GO5fGJ0CsVRivvQoZE400I+jlI4tIoEqNN4HfMiHg=
196198
github.com/operator-framework/api v0.20.0 h1:A2YCRhr+6s0k3pRJacnwjh1Ue8BqjIGuQ2jvPg9XCB4=

pkg/openstackclient/funcs.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ package openstackclient
1414

1515
import (
1616
"context"
17+
"fmt"
1718

1819
env "github.com/openstack-k8s-operators/lib-common/modules/common/env"
1920
"github.com/openstack-k8s-operators/lib-common/modules/common/helper"
2021
clientv1 "github.com/openstack-k8s-operators/openstack-operator/apis/client/v1beta1"
22+
metricstorage "github.com/openstack-k8s-operators/telemetry-operator/pkg/metricstorage"
2123

2224
corev1 "k8s.io/api/core/v1"
2325
"k8s.io/utils/ptr"
@@ -34,6 +36,10 @@ func ClientPodSpec(
3436
envVars := map[string]env.Setter{}
3537
envVars["OS_CLOUD"] = env.SetValue("default")
3638
envVars["CONFIG_HASH"] = env.SetValue(configHash)
39+
envVars["PROMETHEUS_HOST"] = env.SetValue(fmt.Sprintf("%s-prometheus.%s.svc",
40+
metricstorage.DefaultServiceName,
41+
instance.Namespace))
42+
envVars["PROMETHEUS_PORT"] = env.SetValue(fmt.Sprint(metricstorage.DefaultPrometheusPort))
3743

3844
// create Volume and VolumeMounts
3945
volumes := clientPodVolumes(instance)

0 commit comments

Comments
 (0)