Skip to content

Commit

Permalink
Fixes for KSM
Browse files Browse the repository at this point in the history
- add KSM imate to telemetrydefaults webhook
- remove image version from labels, because in some cases it can
  exceed maximum lenght of value
  • Loading branch information
paramite committed Oct 14, 2024
1 parent 43bc54d commit 19f2bbb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 4 additions & 0 deletions api/v1beta1/telemetry_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ type TelemetryDefaults struct {
SgCoreContainerImageURL string
ProxyContainerImageURL string
IpmiContainerImageURL string
KsmContainerImageURL string
AodhAPIContainerImageURL string
AodhEvaluatorContainerImageURL string
AodhNotifierContainerImageURL string
Expand Down Expand Up @@ -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
}
Expand Down
2 changes: 0 additions & 2 deletions pkg/availability/statefulset.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package availability
import (
"fmt"
"path/filepath"
"strings"

"k8s.io/utils/ptr"

Expand Down Expand Up @@ -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{
Expand Down

0 comments on commit 19f2bbb

Please sign in to comment.