Merge pull request #510 from paramite/ksm-fixes

Fixes for KSM
openstack-k8s-operators · Oct 15, 2024 · 152602c · 152602c
2 parents 43bc54d + 19f2bbb
commit 152602c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/api/v1beta1/telemetry_webhook.go b/api/v1beta1/telemetry_webhook.go
@@ -35,6 +35,7 @@ type TelemetryDefaults struct {
 	SgCoreContainerImageURL        string
 	ProxyContainerImageURL         string
 	IpmiContainerImageURL          string
+	KsmContainerImageURL           string
 	AodhAPIContainerImageURL       string
 	AodhEvaluatorContainerImageURL string
 	AodhNotifierContainerImageURL  string
@@ -90,6 +91,9 @@ func (spec *TelemetrySpec) Default() {
 	if spec.Ceilometer.CeilometerSpec.ProxyImage == "" {
 		spec.Ceilometer.CeilometerSpec.ProxyImage = telemetryDefaults.ProxyContainerImageURL
 	}
+	if spec.Ceilometer.CeilometerSpec.KSMImage == "" {
+		spec.Ceilometer.CeilometerSpec.KSMImage = telemetryDefaults.KsmContainerImageURL
+	}
 	if spec.Autoscaling.AutoscalingSpec.Aodh.APIImage == "" {
 		spec.Autoscaling.AutoscalingSpec.Aodh.APIImage = telemetryDefaults.AodhAPIContainerImageURL
 	}

diff --git a/pkg/availability/statefulset.go b/pkg/availability/statefulset.go
@@ -19,7 +19,6 @@ package availability
 import (
 	"fmt"
 	"path/filepath"
-	"strings"
 
 	"k8s.io/utils/ptr"
 
@@ -74,7 +73,6 @@ func KSMStatefulSet(
 
 	labels["app.kubernetes.io/component"] = "exporter"
 	labels["app.kubernetes.io/name"] = KSMServiceName
-	labels["app.kubernetes.io/version"] = instance.Spec.KSMImage[strings.LastIndex(instance.Spec.KSMImage, ":")+1:]
 
 	// kube-state-metrics relevant default arguments
 	args := []string{