diff --git a/apis/go.mod b/apis/go.mod index f427cfe83..21b3a2c2e 100644 --- a/apis/go.mod +++ b/apis/go.mod @@ -11,7 +11,7 @@ require ( github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240216191912-f09285faf21b github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240216110209-c405c043e280 github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240217031606-5f5dac9bb5b7 - github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240216172129-990c7cf02b25 + github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240219153539-99face71256b github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240216150409-296d5c6420a5 github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240216173228-eec429bcc776 github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240220172726-06e269f22402 @@ -23,7 +23,7 @@ require ( github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240216200042-7835df58ed0c github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240216174613-3d349f26e681 github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240216164023-80bb42077844 - github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240216195458-a0493d51b492 + github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240219111006-cce4d37e5187 github.com/rabbitmq/cluster-operator/v2 v2.5.0 k8s.io/apimachinery v0.28.7 sigs.k8s.io/controller-runtime v0.16.5 diff --git a/apis/go.sum b/apis/go.sum index b63862348..fb7a6bacf 100644 --- a/apis/go.sum +++ b/apis/go.sum @@ -85,8 +85,8 @@ github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240216110209-c40 github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240216110209-c405c043e280/go.mod h1:rUeVLCM8HhkljdJpwbfdHa87FCOyw/GLQtnW+8CMl3g= github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240217031606-5f5dac9bb5b7 h1:Y8qgnwGJ03aeJ9jeUCGen6s5sAb7pKMQg/ZffNnrEnk= github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240217031606-5f5dac9bb5b7/go.mod h1:Ytc4YmARcMZbWJ2/saCIWtVEuMPxjzcftRmDzQWwCz0= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240216172129-990c7cf02b25 h1:IR91sMpcUgp7iAKGKGvdHIputhYCdTQ4O9HXufxkr80= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240216172129-990c7cf02b25/go.mod h1:oZ8/6cQ6NgMzQ+eU/2bccPHOPKZ6FPWEfrJizyBmTMk= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240219153539-99face71256b h1:OkutuajdigOtQviaxSBPXgSrQ+QT/lfH1D7r6RshOjo= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240219153539-99face71256b/go.mod h1:2//rIZ8ucDbK+gLxvwmU6uPCm6o/C6GxXJHDo4ye7I8= github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240216150409-296d5c6420a5 h1:mWLBdPSYrX4w5DnvINlFj0/h4vdCTihMmLcnuy5Vlyg= github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240216150409-296d5c6420a5/go.mod h1:jAqNnaLEqhgSimEvgql28pvkQibRu4MeO5gFpfSzqYw= 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 github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240216174613-3d349f26e681/go.mod h1:hqzRPvT7eviqXkO53Xu9+ir9A4sC5ibrKxFCMqdRJsM= github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240216164023-80bb42077844 h1:12ZECCJFWQtfgxgokYaDZ0J9USUvOteipG/B23G0zCE= github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240216164023-80bb42077844/go.mod h1:mU+y8AMhsvAuBQCSTRCvZOovQa9qImF7LqEK/vDj0e8= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240216195458-a0493d51b492 h1:mjW7kw3v5ET3GWBWTNYGqx75VKWXfA4nPn5TAOlVxyk= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240216195458-a0493d51b492/go.mod h1:m4TeOCVaU6S9jPTo8w6u7bxNBuAb4OyAiDU59HSHdSc= +github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240219111006-cce4d37e5187 h1:RNIuKPewgkmjtC16VXg53KoDCsMEf7JZ/qArQr/5T14= +github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240219111006-cce4d37e5187/go.mod h1:cPlPg9nENRG5QFR+Uh+vMunuTBSGHuMCq/tEGiz9J4U= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/go.mod b/go.mod index 48329d6ac..046b41df4 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240216191912-f09285faf21b github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240216110209-c405c043e280 github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240217031606-5f5dac9bb5b7 - github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240216172129-990c7cf02b25 + github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240219153539-99face71256b github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240216150409-296d5c6420a5 github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240216173228-eec429bcc776 github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240216173409-86913e6d5885 @@ -33,7 +33,7 @@ require ( github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240216200042-7835df58ed0c github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240216174613-3d349f26e681 github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240216164023-80bb42077844 - github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240216195458-a0493d51b492 + github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240219111006-cce4d37e5187 github.com/operator-framework/api v0.20.0 github.com/rabbitmq/cluster-operator/v2 v2.5.0 go.uber.org/zap v1.26.0 diff --git a/go.sum b/go.sum index 9d42b0662..71abf18ee 100644 --- a/go.sum +++ b/go.sum @@ -99,8 +99,8 @@ github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240216110209-c40 github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240216110209-c405c043e280/go.mod h1:rUeVLCM8HhkljdJpwbfdHa87FCOyw/GLQtnW+8CMl3g= github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240217031606-5f5dac9bb5b7 h1:Y8qgnwGJ03aeJ9jeUCGen6s5sAb7pKMQg/ZffNnrEnk= github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240217031606-5f5dac9bb5b7/go.mod h1:Ytc4YmARcMZbWJ2/saCIWtVEuMPxjzcftRmDzQWwCz0= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240216172129-990c7cf02b25 h1:IR91sMpcUgp7iAKGKGvdHIputhYCdTQ4O9HXufxkr80= -github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240216172129-990c7cf02b25/go.mod h1:oZ8/6cQ6NgMzQ+eU/2bccPHOPKZ6FPWEfrJizyBmTMk= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240219153539-99face71256b h1:OkutuajdigOtQviaxSBPXgSrQ+QT/lfH1D7r6RshOjo= +github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240219153539-99face71256b/go.mod h1:2//rIZ8ucDbK+gLxvwmU6uPCm6o/C6GxXJHDo4ye7I8= github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240216150409-296d5c6420a5 h1:mWLBdPSYrX4w5DnvINlFj0/h4vdCTihMmLcnuy5Vlyg= github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240216150409-296d5c6420a5/go.mod h1:jAqNnaLEqhgSimEvgql28pvkQibRu4MeO5gFpfSzqYw= 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 github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240216174613-3d349f26e681/go.mod h1:hqzRPvT7eviqXkO53Xu9+ir9A4sC5ibrKxFCMqdRJsM= github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240216164023-80bb42077844 h1:12ZECCJFWQtfgxgokYaDZ0J9USUvOteipG/B23G0zCE= github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240216164023-80bb42077844/go.mod h1:mU+y8AMhsvAuBQCSTRCvZOovQa9qImF7LqEK/vDj0e8= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240216195458-a0493d51b492 h1:mjW7kw3v5ET3GWBWTNYGqx75VKWXfA4nPn5TAOlVxyk= -github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240216195458-a0493d51b492/go.mod h1:m4TeOCVaU6S9jPTo8w6u7bxNBuAb4OyAiDU59HSHdSc= +github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240219111006-cce4d37e5187 h1:RNIuKPewgkmjtC16VXg53KoDCsMEf7JZ/qArQr/5T14= +github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240219111006-cce4d37e5187/go.mod h1:cPlPg9nENRG5QFR+Uh+vMunuTBSGHuMCq/tEGiz9J4U= github.com/operator-framework/api v0.20.0 h1:A2YCRhr+6s0k3pRJacnwjh1Ue8BqjIGuQ2jvPg9XCB4= github.com/operator-framework/api v0.20.0/go.mod h1:rXPOhrQ6mMeXqCmpDgt1ALoar9ZlHL+Iy5qut9R99a4= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/pkg/openstackclient/funcs.go b/pkg/openstackclient/funcs.go index 1744561f5..7f2b11eef 100644 --- a/pkg/openstackclient/funcs.go +++ b/pkg/openstackclient/funcs.go @@ -14,10 +14,12 @@ package openstackclient import ( "context" + "fmt" env "github.com/openstack-k8s-operators/lib-common/modules/common/env" "github.com/openstack-k8s-operators/lib-common/modules/common/helper" clientv1 "github.com/openstack-k8s-operators/openstack-operator/apis/client/v1beta1" + telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1" corev1 "k8s.io/api/core/v1" "k8s.io/utils/ptr" @@ -34,6 +36,10 @@ func ClientPodSpec( envVars := map[string]env.Setter{} envVars["OS_CLOUD"] = env.SetValue("default") envVars["CONFIG_HASH"] = env.SetValue(configHash) + envVars["PROMETHEUS_HOST"] = env.SetValue(fmt.Sprintf("%s-prometheus.%s.svc", + telemetryv1.DefaultServiceName, + instance.Namespace)) + envVars["PROMETHEUS_PORT"] = env.SetValue(fmt.Sprint(telemetryv1.DefaultPrometheusPort)) // create Volume and VolumeMounts volumes := clientPodVolumes(instance)