Skip to content

Commit 4e233a2

Browse files
liliclilic
committed
Cleanup to easier allow for removal of code in 4.7
1 parent a10c91b commit 4e233a2

File tree

3 files changed

+64
-68
lines changed

3 files changed

+64
-68
lines changed

‎pkg/manifests/config.go

-3
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,6 @@ type UserWorkloadConfiguration struct {
385385
}
386386

387387
func (u *UserWorkloadConfiguration) applyDefaults() {
388-
fmt.Println("apply some defaults")
389-
fmt.Println(u.PrometheusOperator)
390388
if u.PrometheusOperator == nil {
391389
u.PrometheusOperator = &PrometheusOperatorConfig{}
392390
}
@@ -422,7 +420,6 @@ func NewDefaultUserWorkloadMonitoringConfig() *UserWorkloadConfiguration {
422420
// IsUserWorkloadEnabled checks if user workload monitoring is
423421
// enabled on old or new configuration.
424422
func (c *Config) IsUserWorkloadEnabled() bool {
425-
fmt.Println(*c.ClusterMonitoringConfiguration.UserWorkloadEnabled)
426423
if *c.ClusterMonitoringConfiguration.UserWorkloadEnabled == true {
427424
return true
428425
}

‎pkg/manifests/manifests.go

+56-55
Original file line numberDiff line numberDiff line change
@@ -1410,76 +1410,73 @@ func (f *Factory) PrometheusUserWorkload(grpcTLS *v1.Secret) (*monv1.Prometheus,
14101410
p.Spec.LogLevel = f.config.UserWorkloadConfiguration.Prometheus.LogLevel
14111411
}
14121412

1413-
if f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.LogLevel != "" {
1414-
p.Spec.LogLevel = f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.LogLevel
1415-
}
1416-
14171413
if f.config.UserWorkloadConfiguration.Prometheus.Retention != "" {
14181414
p.Spec.Retention = f.config.UserWorkloadConfiguration.Prometheus.Retention
14191415
}
14201416

1421-
if f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.Retention != "" {
1422-
p.Spec.Retention = f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.Retention
1423-
}
1424-
14251417
p.Spec.Image = &f.config.Images.Prometheus
14261418

14271419
if f.config.UserWorkloadConfiguration.Prometheus.Resources != nil {
14281420
p.Spec.Resources = *f.config.UserWorkloadConfiguration.Prometheus.Resources
14291421
}
14301422

1431-
if f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.Resources != nil {
1432-
p.Spec.Resources = *f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.Resources
1433-
}
1434-
14351423
if f.config.UserWorkloadConfiguration.Prometheus.NodeSelector != nil {
14361424
p.Spec.NodeSelector = f.config.UserWorkloadConfiguration.Prometheus.NodeSelector
14371425
}
14381426

1439-
if f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.NodeSelector != nil {
1440-
p.Spec.NodeSelector = f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.NodeSelector
1441-
}
1442-
14431427
if len(f.config.UserWorkloadConfiguration.Prometheus.Tolerations) > 0 {
14441428
p.Spec.Tolerations = f.config.UserWorkloadConfiguration.Prometheus.Tolerations
14451429
}
14461430

1447-
if len(f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.Tolerations) > 0 {
1448-
p.Spec.Tolerations = f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.Tolerations
1449-
}
1450-
14511431
if f.config.UserWorkloadConfiguration.Prometheus.ExternalLabels != nil {
14521432
p.Spec.ExternalLabels = f.config.UserWorkloadConfiguration.Prometheus.ExternalLabels
14531433
}
14541434

1455-
if f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.ExternalLabels != nil {
1456-
p.Spec.ExternalLabels = f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.ExternalLabels
1457-
}
1458-
fmt.Println(f.config.UserWorkloadConfiguration.Prometheus.VolumeClaimTemplate)
1459-
14601435
if f.config.UserWorkloadConfiguration.Prometheus.VolumeClaimTemplate != nil {
1461-
fmt.Println("yes===")
14621436
p.Spec.Storage = &monv1.StorageSpec{
14631437
VolumeClaimTemplate: *f.config.UserWorkloadConfiguration.Prometheus.VolumeClaimTemplate,
14641438
}
14651439
}
14661440

1441+
if len(f.config.UserWorkloadConfiguration.Prometheus.RemoteWrite) > 0 {
1442+
p.Spec.RemoteWrite = f.config.UserWorkloadConfiguration.Prometheus.RemoteWrite
1443+
}
1444+
1445+
// TODO: remove after 4.7
1446+
1447+
if f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.LogLevel != "" {
1448+
p.Spec.LogLevel = f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.LogLevel
1449+
}
1450+
1451+
if f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.Retention != "" {
1452+
p.Spec.Retention = f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.Retention
1453+
}
1454+
1455+
if f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.Resources != nil {
1456+
p.Spec.Resources = *f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.Resources
1457+
}
1458+
1459+
if f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.NodeSelector != nil {
1460+
p.Spec.NodeSelector = f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.NodeSelector
1461+
}
1462+
1463+
if len(f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.Tolerations) > 0 {
1464+
p.Spec.Tolerations = f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.Tolerations
1465+
}
1466+
1467+
if f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.ExternalLabels != nil {
1468+
p.Spec.ExternalLabels = f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.ExternalLabels
1469+
}
1470+
14671471
if f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.VolumeClaimTemplate != nil {
14681472
p.Spec.Storage = &monv1.StorageSpec{
14691473
VolumeClaimTemplate: *f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.VolumeClaimTemplate,
14701474
}
14711475
}
1472-
fmt.Println("====")
1473-
fmt.Println(p.Spec.Storage)
1474-
1475-
if len(f.config.UserWorkloadConfiguration.Prometheus.RemoteWrite) > 0 {
1476-
p.Spec.RemoteWrite = f.config.UserWorkloadConfiguration.Prometheus.RemoteWrite
1477-
}
1478-
14791476
if len(f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.RemoteWrite) > 0 {
14801477
p.Spec.RemoteWrite = f.config.ClusterMonitoringConfiguration.PrometheusUserWorkloadConfig.RemoteWrite
14811478
}
1482-
1479+
// end removal
14831480
if f.config.Images.Thanos != "" {
14841481
p.Spec.Thanos.Image = &f.config.Images.Thanos
14851482
}
@@ -1878,23 +1875,25 @@ func (f *Factory) PrometheusOperatorUserWorkloadDeployment(denyNamespaces []stri
18781875
if err != nil {
18791876
return nil, err
18801877
}
1881-
fmt.Println(f.config.UserWorkloadConfiguration)
18821878
if len(f.config.UserWorkloadConfiguration.PrometheusOperator.NodeSelector) > 0 {
18831879
d.Spec.Template.Spec.NodeSelector = f.config.UserWorkloadConfiguration.PrometheusOperator.NodeSelector
18841880
}
18851881

1886-
if len(f.config.ClusterMonitoringConfiguration.PrometheusOperatorUserWorkloadConfig.NodeSelector) > 0 {
1887-
d.Spec.Template.Spec.NodeSelector = f.config.ClusterMonitoringConfiguration.PrometheusOperatorUserWorkloadConfig.NodeSelector
1888-
}
1889-
18901882
if len(f.config.UserWorkloadConfiguration.PrometheusOperator.Tolerations) > 0 {
18911883
d.Spec.Template.Spec.Tolerations = f.config.UserWorkloadConfiguration.PrometheusOperator.Tolerations
18921884
}
18931885

1886+
// TODO: remove in 4.7
1887+
if len(f.config.ClusterMonitoringConfiguration.PrometheusOperatorUserWorkloadConfig.NodeSelector) > 0 {
1888+
d.Spec.Template.Spec.NodeSelector = f.config.ClusterMonitoringConfiguration.PrometheusOperatorUserWorkloadConfig.NodeSelector
1889+
}
1890+
18941891
if len(f.config.ClusterMonitoringConfiguration.PrometheusOperatorUserWorkloadConfig.Tolerations) > 0 {
18951892
d.Spec.Template.Spec.Tolerations = f.config.ClusterMonitoringConfiguration.PrometheusOperatorUserWorkloadConfig.Tolerations
18961893
}
18971894

1895+
// end of remove
1896+
18981897
d.Spec.Template.Spec.Containers[0].Image = f.config.Images.PrometheusOperator
18991898
d.Spec.Template.Spec.Containers[1].Image = f.config.Images.KubeRbacProxy
19001899

@@ -3032,45 +3031,47 @@ func (f *Factory) ThanosRulerCustomResource(queryURL string, trustedCA *v1.Confi
30323031
t.Spec.LogLevel = f.config.UserWorkloadConfiguration.ThanosRuler.LogLevel
30333032
}
30343033

3035-
if f.config.ClusterMonitoringConfiguration.ThanosRulerConfig.LogLevel != "" {
3036-
t.Spec.LogLevel = f.config.ClusterMonitoringConfiguration.ThanosRulerConfig.LogLevel
3037-
}
3038-
30393034
if f.config.UserWorkloadConfiguration.ThanosRuler.Resources != nil {
30403035
t.Spec.Resources = *f.config.UserWorkloadConfiguration.ThanosRuler.Resources
30413036
}
30423037

3043-
if f.config.ClusterMonitoringConfiguration.ThanosRulerConfig.Resources != nil {
3044-
t.Spec.Resources = *f.config.ClusterMonitoringConfiguration.ThanosRulerConfig.Resources
3045-
}
3046-
30473038
if f.config.UserWorkloadConfiguration.ThanosRuler.VolumeClaimTemplate != nil {
30483039
t.Spec.Storage = &monv1.StorageSpec{
30493040
VolumeClaimTemplate: *f.config.UserWorkloadConfiguration.ThanosRuler.VolumeClaimTemplate,
30503041
}
30513042
}
30523043

3044+
if f.config.UserWorkloadConfiguration.ThanosRuler.NodeSelector != nil {
3045+
t.Spec.NodeSelector = f.config.UserWorkloadConfiguration.ThanosRuler.NodeSelector
3046+
}
3047+
3048+
if len(f.config.UserWorkloadConfiguration.ThanosRuler.Tolerations) > 0 {
3049+
t.Spec.Tolerations = f.config.UserWorkloadConfiguration.ThanosRuler.Tolerations
3050+
}
3051+
3052+
// TODO: remove in 4.7
3053+
if f.config.ClusterMonitoringConfiguration.ThanosRulerConfig.LogLevel != "" {
3054+
t.Spec.LogLevel = f.config.ClusterMonitoringConfiguration.ThanosRulerConfig.LogLevel
3055+
}
3056+
3057+
if f.config.ClusterMonitoringConfiguration.ThanosRulerConfig.Resources != nil {
3058+
t.Spec.Resources = *f.config.ClusterMonitoringConfiguration.ThanosRulerConfig.Resources
3059+
}
3060+
30533061
if f.config.ClusterMonitoringConfiguration.ThanosRulerConfig.VolumeClaimTemplate != nil {
30543062
t.Spec.Storage = &monv1.StorageSpec{
30553063
VolumeClaimTemplate: *f.config.ClusterMonitoringConfiguration.ThanosRulerConfig.VolumeClaimTemplate,
30563064
}
30573065
}
30583066

3059-
if f.config.UserWorkloadConfiguration.ThanosRuler.NodeSelector != nil {
3060-
t.Spec.NodeSelector = f.config.UserWorkloadConfiguration.ThanosRuler.NodeSelector
3061-
}
3062-
30633067
if f.config.ClusterMonitoringConfiguration.ThanosRulerConfig.NodeSelector != nil {
30643068
t.Spec.NodeSelector = f.config.ClusterMonitoringConfiguration.ThanosRulerConfig.NodeSelector
30653069
}
30663070

3067-
if len(f.config.UserWorkloadConfiguration.ThanosRuler.Tolerations) > 0 {
3068-
t.Spec.Tolerations = f.config.UserWorkloadConfiguration.ThanosRuler.Tolerations
3069-
}
3070-
30713071
if len(f.config.ClusterMonitoringConfiguration.ThanosRulerConfig.Tolerations) > 0 {
30723072
t.Spec.Tolerations = f.config.ClusterMonitoringConfiguration.ThanosRulerConfig.Tolerations
30733073
}
3074+
// end of remove
30743075

30753076
t.Spec.Containers[1].Image = f.config.Images.OauthProxy
30763077
setEnv := func(name, value string) {

‎pkg/operator/operator.go

+8-10
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package operator
1616

1717
import (
18-
"fmt"
1918
"strings"
2019
"time"
2120

@@ -365,29 +364,26 @@ func (o *Operator) loadUserWorkloadConfig() (*manifests.UserWorkloadConfiguratio
365364
userCM, err := o.client.GetConfigmap(o.namespaceUserWorkload, o.userWorkloadConfigMapName)
366365
if err != nil {
367366
if apierrors.IsNotFound(err) {
368-
fmt.Println("not found?")
367+
klog.Warning("No User Workload Monitoring ConfigMap was found. Using defaults.")
369368
return manifests.NewDefaultUserWorkloadMonitoringConfig(), nil
370369
} else {
371-
372-
klog.Warningf("Error loading user workload monitoring ConfigMap. Error: %v", err)
370+
klog.Warningf("Error loading User Workload Monitoring ConfigMap. Error: %v", err)
373371
return nil, err
374372
}
375373
}
376374

377375
configContent, found := userCM.Data["config.yaml"]
378376
if found {
379-
fmt.Println("---load user workload config---")
380377
uwc, err := manifests.NewUserConfigFromString(configContent)
381378
if err != nil {
382-
klog.Warningf("Error filling user workload configuration from ConfigMap. Error: %v", err)
379+
klog.Warningf("Error creating User Workload Configuration from ConfigMap. Error: %v", err)
383380
return nil, err
384381
}
385382
return uwc, nil
386383
}
387384

388-
// if configmap is empty create new with defaults
385+
klog.Warning("No User Workload Monitoring ConfigMap was found. Using defaults.")
389386
return manifests.NewDefaultUserWorkloadMonitoringConfig(), nil
390-
391387
}
392388

393389
func (o *Operator) loadConfig(key string) (*manifests.Config, error) {
@@ -423,8 +419,10 @@ func (o *Operator) Config(key string) (*manifests.Config, error) {
423419
return nil, err
424420
}
425421

426-
// Only use user workload monitoring configmap and populate if its enabled
427-
// by admin via cluster monitoring configmap.
422+
// Only use User Workload Monitoring ConfigMap from user ns and populate if
423+
// its enabled by admin via Cluster Monitoring ConfigMap. The above
424+
// loadConfig() already initializes the structs with nil values for
425+
// UserWorkloadConfiguration struct.
428426
if *c.ClusterMonitoringConfiguration.UserWorkloadEnabled {
429427
c.UserWorkloadConfiguration, err = o.loadUserWorkloadConfig()
430428
if err != nil {

0 commit comments

Comments
 (0)