Skip to content

Commit 2a33139

Browse files
vyzigoldvyzigold
committed
Add observabilityclient config to env vars
1 parent 2bce701 commit 2a33139

File tree

5 files changed

+18
-12
lines changed

5 files changed

+18
-12
lines changed

‎apis/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240216191912-f09285faf21b
1212
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240216110209-c405c043e280
1313
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240217031606-5f5dac9bb5b7
14-
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240216172129-990c7cf02b25
14+
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240218132212-ad757a2f5bab
1515
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240216150409-296d5c6420a5
1616
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240216173228-eec429bcc776
1717
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240216173409-86913e6d5885
@@ -23,7 +23,7 @@ require (
2323
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240216200042-7835df58ed0c
2424
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240216174613-3d349f26e681
2525
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240216164023-80bb42077844
26-
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240216195458-a0493d51b492
26+
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240219111006-cce4d37e5187
2727
github.com/rabbitmq/cluster-operator/v2 v2.5.0
2828
k8s.io/apimachinery v0.28.6
2929
sigs.k8s.io/controller-runtime v0.16.5

‎apis/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240216110209-c40
8585
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240216110209-c405c043e280/go.mod h1:rUeVLCM8HhkljdJpwbfdHa87FCOyw/GLQtnW+8CMl3g=
8686
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240217031606-5f5dac9bb5b7 h1:Y8qgnwGJ03aeJ9jeUCGen6s5sAb7pKMQg/ZffNnrEnk=
8787
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240217031606-5f5dac9bb5b7/go.mod h1:Ytc4YmARcMZbWJ2/saCIWtVEuMPxjzcftRmDzQWwCz0=
88-
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240216172129-990c7cf02b25 h1:IR91sMpcUgp7iAKGKGvdHIputhYCdTQ4O9HXufxkr80=
89-
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240216172129-990c7cf02b25/go.mod h1:oZ8/6cQ6NgMzQ+eU/2bccPHOPKZ6FPWEfrJizyBmTMk=
88+
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240218132212-ad757a2f5bab h1:zdI202C0TtXz5UPB+uTdxZtIaFseEDV0HtQ/MmX6hQU=
89+
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240218132212-ad757a2f5bab/go.mod h1:FGKwlmAIgTsvvz2+uusWqNYFKHNAm4uzVyKao+emeu0=
9090
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240216150409-296d5c6420a5 h1:mWLBdPSYrX4w5DnvINlFj0/h4vdCTihMmLcnuy5Vlyg=
9191
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240216150409-296d5c6420a5/go.mod h1:jAqNnaLEqhgSimEvgql28pvkQibRu4MeO5gFpfSzqYw=
9292
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240216173228-eec429bcc776 h1:piRji0b//DM3h2KNXxphlIYTGeRw03QhfQ/+0JS5eVY=
@@ -113,8 +113,8 @@ github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.2024021617461
113113
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240216174613-3d349f26e681/go.mod h1:hqzRPvT7eviqXkO53Xu9+ir9A4sC5ibrKxFCMqdRJsM=
114114
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240216164023-80bb42077844 h1:12ZECCJFWQtfgxgokYaDZ0J9USUvOteipG/B23G0zCE=
115115
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240216164023-80bb42077844/go.mod h1:mU+y8AMhsvAuBQCSTRCvZOovQa9qImF7LqEK/vDj0e8=
116-
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240216195458-a0493d51b492 h1:mjW7kw3v5ET3GWBWTNYGqx75VKWXfA4nPn5TAOlVxyk=
117-
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240216195458-a0493d51b492/go.mod h1:m4TeOCVaU6S9jPTo8w6u7bxNBuAb4OyAiDU59HSHdSc=
116+
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240219111006-cce4d37e5187 h1:RNIuKPewgkmjtC16VXg53KoDCsMEf7JZ/qArQr/5T14=
117+
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240219111006-cce4d37e5187/go.mod h1:cPlPg9nENRG5QFR+Uh+vMunuTBSGHuMCq/tEGiz9J4U=
118118
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
119119
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
120120
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240216191912-f09285faf21b
1717
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240216110209-c405c043e280
1818
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240217031606-5f5dac9bb5b7
19-
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240216172129-990c7cf02b25
19+
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240218132212-ad757a2f5bab
2020
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240216150409-296d5c6420a5
2121
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240216173228-eec429bcc776
2222
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240216173409-86913e6d5885
@@ -33,7 +33,7 @@ require (
3333
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240216200042-7835df58ed0c
3434
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240216174613-3d349f26e681
3535
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240216164023-80bb42077844
36-
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240216195458-a0493d51b492
36+
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240219111006-cce4d37e5187
3737
github.com/operator-framework/api v0.20.0
3838
github.com/rabbitmq/cluster-operator/v2 v2.5.0
3939
go.uber.org/zap v1.26.0

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240216110209-c40
9999
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240216110209-c405c043e280/go.mod h1:rUeVLCM8HhkljdJpwbfdHa87FCOyw/GLQtnW+8CMl3g=
100100
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240217031606-5f5dac9bb5b7 h1:Y8qgnwGJ03aeJ9jeUCGen6s5sAb7pKMQg/ZffNnrEnk=
101101
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240217031606-5f5dac9bb5b7/go.mod h1:Ytc4YmARcMZbWJ2/saCIWtVEuMPxjzcftRmDzQWwCz0=
102-
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240216172129-990c7cf02b25 h1:IR91sMpcUgp7iAKGKGvdHIputhYCdTQ4O9HXufxkr80=
103-
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240216172129-990c7cf02b25/go.mod h1:oZ8/6cQ6NgMzQ+eU/2bccPHOPKZ6FPWEfrJizyBmTMk=
102+
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240218132212-ad757a2f5bab h1:zdI202C0TtXz5UPB+uTdxZtIaFseEDV0HtQ/MmX6hQU=
103+
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240218132212-ad757a2f5bab/go.mod h1:FGKwlmAIgTsvvz2+uusWqNYFKHNAm4uzVyKao+emeu0=
104104
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240216150409-296d5c6420a5 h1:mWLBdPSYrX4w5DnvINlFj0/h4vdCTihMmLcnuy5Vlyg=
105105
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240216150409-296d5c6420a5/go.mod h1:jAqNnaLEqhgSimEvgql28pvkQibRu4MeO5gFpfSzqYw=
106106
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240216173228-eec429bcc776 h1:piRji0b//DM3h2KNXxphlIYTGeRw03QhfQ/+0JS5eVY=
@@ -135,8 +135,8 @@ github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.2024021617461
135135
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240216174613-3d349f26e681/go.mod h1:hqzRPvT7eviqXkO53Xu9+ir9A4sC5ibrKxFCMqdRJsM=
136136
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240216164023-80bb42077844 h1:12ZECCJFWQtfgxgokYaDZ0J9USUvOteipG/B23G0zCE=
137137
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240216164023-80bb42077844/go.mod h1:mU+y8AMhsvAuBQCSTRCvZOovQa9qImF7LqEK/vDj0e8=
138-
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240216195458-a0493d51b492 h1:mjW7kw3v5ET3GWBWTNYGqx75VKWXfA4nPn5TAOlVxyk=
139-
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240216195458-a0493d51b492/go.mod h1:m4TeOCVaU6S9jPTo8w6u7bxNBuAb4OyAiDU59HSHdSc=
138+
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240219111006-cce4d37e5187 h1:RNIuKPewgkmjtC16VXg53KoDCsMEf7JZ/qArQr/5T14=
139+
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240219111006-cce4d37e5187/go.mod h1:cPlPg9nENRG5QFR+Uh+vMunuTBSGHuMCq/tEGiz9J4U=
140140
github.com/operator-framework/api v0.20.0 h1:A2YCRhr+6s0k3pRJacnwjh1Ue8BqjIGuQ2jvPg9XCB4=
141141
github.com/operator-framework/api v0.20.0/go.mod h1:rXPOhrQ6mMeXqCmpDgt1ALoar9ZlHL+Iy5qut9R99a4=
142142
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

‎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+
telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1"
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+
telemetryv1.DefaultServiceName,
41+
instance.Namespace))
42+
envVars["PROMETHEUS_PORT"] = env.SetValue(fmt.Sprint(telemetryv1.DefaultPrometheusPort))
3743

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

0 commit comments

Comments
 (0)