Skip to content

Commit b152272

Browse files
authored
Merge pull request #309 from llm-d-incubation/custom_ns
Discover namespace post install
2 parents 6cc90fe + 64cf2cb commit b152272

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

charts/workload-variant-autoscaler/templates/manager/wva-deployment-controller-manager.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ spec:
8989
configMapKeyRef:
9090
name: workload-variant-autoscaler-variantautoscaling-config
9191
key: EXPERIMENTAL_HYBRID_OPTIMIZATION
92+
- name: POD_NAMESPACE
93+
valueFrom:
94+
fieldRef:
95+
fieldPath: metadata.namespace
9296
name: manager
9397
ports:
9498
- name: healthz

config/manager/manager.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ spec:
9090
configMapKeyRef:
9191
name: variantautoscaling-config
9292
key: EXPERIMENTAL_HYBRID_OPTIMIZATION
93+
- name: POD_NAMESPACE
94+
valueFrom:
95+
fieldRef:
96+
fieldPath: metadata.namespace
9397
name: manager
9498
ports: []
9599
securityContext:

internal/controller/variantautoscaling_controller.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ type VariantAutoscalingReconciler struct {
9292
// +kubebuilder:rbac:groups="",resources=events,verbs=create;patch
9393

9494
const (
95-
configMapName = "workload-variant-autoscaler-variantautoscaling-config"
96-
configMapNamespace = "workload-variant-autoscaler-system"
95+
configMapName = "workload-variant-autoscaler-variantautoscaling-config"
9796
// ServiceMonitor constants for watching controller's own metrics ServiceMonitor
9897
serviceMonitorName = "workload-variant-autoscaler-controller-manager-metrics-monitor"
9998
// Environment variable to enable experimental hybrid-based optimization
@@ -103,13 +102,21 @@ const (
103102
EnvExperimentalHybridOptimization = "EXPERIMENTAL_HYBRID_OPTIMIZATION"
104103
)
105104

105+
func getNamespace() string {
106+
if ns := os.Getenv("POD_NAMESPACE"); ns != "" {
107+
return ns
108+
}
109+
return "workload-variant-autoscaler-system"
110+
}
111+
106112
var (
107113
// ServiceMonitor GVK for watching controller's own metrics ServiceMonitor
108114
serviceMonitorGVK = schema.GroupVersionKind{
109115
Group: "monitoring.coreos.com",
110116
Version: "v1",
111117
Kind: "ServiceMonitor",
112118
}
119+
configMapNamespace = getNamespace()
113120
)
114121

115122
func initMetricsEmitter() {

0 commit comments

Comments
 (0)