@@ -750,6 +750,9 @@ func (f *Factory) KubeStateMetricsDeployment() (*appsv1.Deployment, error) {
750
750
d .Spec .Template .Spec .Containers [i ].Args = f .setTLSSecurityConfiguration (container .Args , KubeRbacProxyTLSCipherSuitesFlag , KubeRbacProxyMinTLSVersionFlag )
751
751
case "kube-state-metrics" :
752
752
d .Spec .Template .Spec .Containers [i ].Image = f .config .Images .KubeStateMetrics
753
+ if f .config .ClusterMonitoringConfiguration .KubeStateMetricsConfig .Resources != nil {
754
+ d .Spec .Template .Spec .Containers [i ].Resources = * f .config .ClusterMonitoringConfiguration .KubeStateMetricsConfig .Resources
755
+ }
753
756
}
754
757
}
755
758
@@ -809,6 +812,9 @@ func (f *Factory) OpenShiftStateMetricsDeployment() (*appsv1.Deployment, error)
809
812
d .Spec .Template .Spec .Containers [i ].Args = f .setTLSSecurityConfiguration (container .Args , KubeRbacProxyTLSCipherSuitesFlag , KubeRbacProxyMinTLSVersionFlag )
810
813
case "openshift-state-metrics" :
811
814
d .Spec .Template .Spec .Containers [i ].Image = f .config .Images .OpenShiftStateMetrics
815
+ if f .config .ClusterMonitoringConfiguration .OpenShiftMetricsConfig .Resources != nil {
816
+ d .Spec .Template .Spec .Containers [i ].Resources = * f .config .ClusterMonitoringConfiguration .OpenShiftMetricsConfig .Resources
817
+ }
812
818
}
813
819
}
814
820
@@ -964,6 +970,9 @@ func (f *Factory) NodeExporterDaemonSet() (*appsv1.DaemonSet, error) {
964
970
if err != nil {
965
971
return nil , err
966
972
}
973
+ if f .config .ClusterMonitoringConfiguration .NodeExporterConfig .Resources != nil {
974
+ ds .Spec .Template .Spec .Containers [i ].Resources = * f .config .ClusterMonitoringConfiguration .NodeExporterConfig .Resources
975
+ }
967
976
case "kube-rbac-proxy" :
968
977
ds .Spec .Template .Spec .Containers [i ].Image = f .config .Images .KubeRbacProxy
969
978
ds .Spec .Template .Spec .Containers [i ].Args = f .setTLSSecurityConfiguration (container .Args , KubeRbacProxyTLSCipherSuitesFlag , KubeRbacProxyMinTLSVersionFlag )
@@ -2004,6 +2013,10 @@ func (f *Factory) PrometheusAdapterDeployment(apiAuthSecretName string, requesth
2004
2013
spec .Containers [0 ].Args = f .setTLSSecurityConfiguration (spec .Containers [0 ].Args ,
2005
2014
PrometheusAdapterTLSCipherSuitesFlag , PrometheusAdapterTLSMinTLSVersionFlag )
2006
2015
2016
+ if f .config .ClusterMonitoringConfiguration .K8sPrometheusAdapter .Resources != nil {
2017
+ spec .Containers [0 ].Resources = * f .config .ClusterMonitoringConfiguration .K8sPrometheusAdapter .Resources
2018
+ }
2019
+
2007
2020
dep .Spec .Template .Spec = spec
2008
2021
2009
2022
return dep , nil
@@ -2162,6 +2175,8 @@ func (f *Factory) PrometheusOperatorAdmissionWebhookDeployment() (*appsv1.Deploy
2162
2175
case "prometheus-operator-admission-webhook" :
2163
2176
d .Spec .Template .Spec .Containers [i ].Image = f .config .Images .PrometheusOperatorAdmissionWebhook
2164
2177
2178
+ // TODO: Derive resource request from relevant deployment(s)?
2179
+
2165
2180
args := d .Spec .Template .Spec .Containers [i ].Args
2166
2181
if f .config .ClusterMonitoringConfiguration .PrometheusOperatorConfig .LogLevel != "" {
2167
2182
args = append (args , fmt .Sprintf ("--log-level=%s" , f .config .ClusterMonitoringConfiguration .PrometheusOperatorConfig .LogLevel ))
@@ -2213,6 +2228,10 @@ func (f *Factory) PrometheusOperatorDeployment() (*appsv1.Deployment, error) {
2213
2228
case "prometheus-operator" :
2214
2229
d .Spec .Template .Spec .Containers [i ].Image = f .config .Images .PrometheusOperator
2215
2230
2231
+ if f .config .ClusterMonitoringConfiguration .PrometheusOperatorConfig .Resources != nil {
2232
+ d .Spec .Template .Spec .Containers [i ].Resources = * f .config .ClusterMonitoringConfiguration .PrometheusOperatorConfig .Resources
2233
+ }
2234
+
2216
2235
args := d .Spec .Template .Spec .Containers [i ].Args
2217
2236
for i := range args {
2218
2237
if strings .HasPrefix (args [i ], PrometheusConfigReloaderFlag ) && f .config .Images .PrometheusConfigReloader != "" {
@@ -2261,6 +2280,10 @@ func (f *Factory) PrometheusOperatorUserWorkloadDeployment() (*appsv1.Deployment
2261
2280
case "prometheus-operator" :
2262
2281
d .Spec .Template .Spec .Containers [i ].Image = f .config .Images .PrometheusOperator
2263
2282
2283
+ if f .config .UserWorkloadConfiguration .PrometheusOperator .Resources != nil {
2284
+ d .Spec .Template .Spec .Containers [i ].Resources = * f .config .UserWorkloadConfiguration .PrometheusOperator .Resources
2285
+ }
2286
+
2264
2287
args := d .Spec .Template .Spec .Containers [i ].Args
2265
2288
for i := range args {
2266
2289
if strings .HasPrefix (args [i ], PrometheusConfigReloaderFlag ) {
@@ -2884,6 +2907,10 @@ func (f *Factory) TelemeterClientDeployment(proxyCABundleCM *v1.ConfigMap, s *v1
2884
2907
case "telemeter-client" :
2885
2908
d .Spec .Template .Spec .Containers [i ].Image = f .config .Images .TelemeterClient
2886
2909
2910
+ if f .config .ClusterMonitoringConfiguration .TelemeterClientConfig .Resources != nil {
2911
+ d .Spec .Template .Spec .Containers [i ].Resources = * f .config .ClusterMonitoringConfiguration .TelemeterClientConfig .Resources
2912
+ }
2913
+
2887
2914
if f .config .ClusterMonitoringConfiguration .TelemeterClientConfig .ClusterID != "" {
2888
2915
setContainerEnvironmentVariable (& d .Spec .Template .Spec .Containers [i ], "ID" , f .config .ClusterMonitoringConfiguration .TelemeterClientConfig .ClusterID )
2889
2916
}
0 commit comments