diff --git a/CHANGELOG.md b/CHANGELOG.md index e2aa105eac..b64cf834fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Note: This CHANGELOG is only for the monitoring team to track all monitoring related changes. Please see OpenShift release notes for official changes. +## 4.7 + +- [#959](https://github.com/openshift/cluster-monitoring-operator/pull/959) Remove memory limits from prometheus-config-reloader in user workload monitoring + ## 4.6 - [#936](https://github.com/openshift/cluster-monitoring-operator/pull/9936) Bump prometheus-operator 0.42.1 diff --git a/assets/prometheus-operator-user-workload/deployment.yaml b/assets/prometheus-operator-user-workload/deployment.yaml index cc48e4c8bc..0909bbbc9f 100644 --- a/assets/prometheus-operator-user-workload/deployment.yaml +++ b/assets/prometheus-operator-user-workload/deployment.yaml @@ -30,6 +30,7 @@ spec: - --alertmanager-instance-namespaces=openshift-user-workload-monitoring - --thanos-ruler-instance-namespaces=openshift-user-workload-monitoring - --config-reloader-cpu=0 + - --config-reloader-memory=0 image: quay.io/prometheus-operator/prometheus-operator:v0.42.1 name: prometheus-operator ports: diff --git a/jsonnet/prometheus-operator-user-workload.jsonnet b/jsonnet/prometheus-operator-user-workload.jsonnet index da25361a14..c349d2bd6d 100644 --- a/jsonnet/prometheus-operator-user-workload.jsonnet +++ b/jsonnet/prometheus-operator-user-workload.jsonnet @@ -97,6 +97,7 @@ local tlsVolumeName = 'prometheus-operator-user-workload-tls'; '--alertmanager-instance-namespaces=' + $._config.namespaceUserWorkload, '--thanos-ruler-instance-namespaces=' + $._config.namespaceUserWorkload, '--config-reloader-cpu=0', + '--config-reloader-memory=0', ], securityContext: {}, resources: { diff --git a/pkg/manifests/bindata.go b/pkg/manifests/bindata.go index ab979d698b..56315023df 100644 --- a/pkg/manifests/bindata.go +++ b/pkg/manifests/bindata.go @@ -2148,7 +2148,7 @@ func assetsPrometheusOperatorUserWorkloadClusterRoleYaml() (*asset, error) { return a, nil } -var _assetsPrometheusOperatorUserWorkloadDeploymentYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x56\x5d\x6f\x2a\x37\x10\x7d\xe7\x57\x58\xf7\xb9\x66\x81\x9b\xe4\x46\x96\x78\x40\x84\x36\x95\xf2\xa5\x12\xb5\xea\x13\x72\xbc\x03\xb8\xf8\xeb\xce\xcc\xd2\xac\xaa\xfe\xf7\xca\x49\x80\x5d\x12\x2e\x49\x7b\xbb\x4f\x30\x3e\x3e\x9e\x99\x73\xc6\xbb\x3a\xd9\x5f\x01\xc9\xc6\xa0\x84\x4e\x89\x8a\x75\xbf\xb3\xb2\xa1\x54\xe2\x02\x92\x8b\xb5\x87\xc0\x1d\x0f\xac\x4b\xcd\x5a\x75\x84\x70\xfa\x01\x1c\xe5\x5f\x22\x6f\xe8\xae\xaa\x07\xc0\x00\x0c\xd4\xb5\xb1\x30\xd1\xa7\x18\x20\xb0\x12\x26\x06\xc6\xe8\x1c\xe0\x01\x6c\xd0\x1e\x94\x48\x18\x3d\xf0\x12\x2a\x92\x31\x01\x6a\x8e\x87\xf0\xeb\x4d\x9e\xeb\x5e\xf7\x64\xd0\xed\x77\x84\xf8\x16\x45\x5e\xa3\xa4\x0d\x28\x11\x13\x04\x5a\xda\x39\xcb\x8a\x00\xe5\x9f\x11\x57\x2e\xea\x52\xfa\x18\x2c\x47\xb4\x61\xd1\xa1\x04\x26\x17\x85\x90\x9c\x35\x9a\x94\xc8\xfc\x04\x0e\x0c\x47\x7c\x2e\xd7\x6b\x36\xcb\xab\x46\xfd\x1f\xeb\xc0\x47\x7b\xc0\xe0\x93\xd3\x0c\x2f\x87\x37\x34\xc8\x8f\x6b\xe5\xf1\xd1\x4c\x3e\xae\xc7\xbb\x35\x11\x62\xd3\xcb\xfc\xe4\x93\xb5\x0d\x80\xdb\x54\xa5\xd0\xb8\x68\x24\x2e\x85\x94\x2e\x2e\x38\x12\x97\x80\x38\x64\xac\xa0\xb5\x68\x62\x98\xdb\x85\x44\xc8\x9a\x01\x4a\xeb\xf5\x02\x86\x7f\x58\xef\x6d\x59\x53\x0c\xc5\x33\xc0\xeb\xf4\x82\x51\x39\x99\x6e\xaf\x45\xd2\x28\x6b\x8f\x6f\xf8\xb5\xd2\x75\xae\xe5\x8d\xca\x8b\xc3\xdb\x54\xb3\xe2\xcd\x29\x25\x84\x5a\x6e\x8d\x47\xc3\x9d\xf1\x1a\x56\x3b\x90\x96\x0d\xc4\x3a\x18\x78\x7b\xff\x41\xe3\x36\xd9\xb4\x03\x64\xaf\x83\x5e\xe4\x36\xfd\x77\x3e\x5e\xea\x10\x49\x62\xe5\xbe\x0f\xdf\xbe\x92\x26\x55\xc3\x9d\x4c\x4f\xba\x2a\xf1\x4e\x39\x36\xb1\x57\x3a\x1c\xb7\x71\x8a\xc8\x2d\x03\x6e\x4d\x7a\x17\x91\x95\x38\xef\x9d\xef\xb2\xda\x10\x2e\x99\xd3\x36\x88\x40\xb1\x42\x03\x0d\x96\x1c\xfc\x5a\x01\x71\x2b\x26\x84\x49\x95\x12\x7d\xdf\x8a\x79\xf0\x11\x6b\x25\xfa\x5f\xae\xed\x76\x81\xc0\x54\x68\xb9\x1e\xc7\xc0\xf0\xc8\x4a\xfc\xf5\xf7\x76\x8d\x01\xbd\x0d\x9a\x6d\x0c\xd7\x40\xa4\x17\x70\x17\x9d\x35\xb5\x12\x3f\x6a\xe7\x1e\xb4\x59\xdd\xc7\xab\xb8\xa0\xdb\x30\x41\xdc\x56\x7a\x64\xd2\x5a\xf1\xa7\xd3\x41\x3a\x4b\x0c\x41\xea\xb2\x44\x20\x1a\xaa\xf3\x93\x93\xcf\x6d\x4b\x38\x92\xc6\xa6\x25\xa0\xa4\xca\x32\xd0\xf0\xfe\x6a\x3a\x9b\x8c\x2f\x2e\x27\xb3\x5f\xa6\xa3\xd9\x6f\x3f\xdf\x5f\xce\x46\x93\xe9\xac\x3f\x38\x9f\xfd\x34\xbe\x9e\x4d\x2f\x47\x83\xd3\xb3\x1f\x76\xa8\xc9\xf8\xe2\x5d\xb8\x16\xdb\xe0\xf4\x6c\x83\xfa\x7c\x7e\x72\x98\xed\x20\x6e\xcb\x36\xbe\x1c\x8d\x2f\x47\x83\xde\xec\xee\xf6\xea\xf7\xfe\xe7\xde\xe9\xdb\x64\xaf\x60\xad\x2e\x54\x89\x18\x41\xfb\x61\x76\x85\x2a\x8a\xfe\xe0\x4b\xb7\xd7\xed\x75\xfb\x2a\x7b\xa7\x78\xdd\x31\x40\x96\x73\xeb\x60\x58\x00\x9b\x82\x1d\x15\x09\xed\x5a\x33\xe4\xdf\x5d\x83\xfc\x6a\xcb\xcb\xba\x5c\x41\xfd\x8d\x9d\x2b\xa8\x0f\xcd\x8f\x89\x08\x91\x8a\x7c\x5f\x4b\x7c\xd0\x26\xdf\x35\x8f\x75\x1e\x97\xb3\xc6\xdd\xf8\x6c\xee\x3d\xd0\xfb\x27\xa5\x69\x8f\xe6\xa4\xd0\x77\x1f\x95\xde\xff\x3a\x2a\x42\xac\xa3\xab\x3c\x5c\xc7\x2a\xb4\x2b\xf6\x39\x72\xa7\x79\xa9\xc4\xbe\x02\xaf\x2a\x7f\xe3\xd2\xd9\xbb\x18\xd9\x51\xab\x0d\xba\xbc\x0d\xae\x56\x62\xae\x1d\x6d\xf8\x42\x2c\x61\xda\xfa\xf0\xc8\xcf\x03\xb0\xde\x7b\xf9\x46\x52\xc2\xd9\x50\x3d\xee\xd4\x8c\x25\x48\x8c\x0e\xf6\x90\x5e\x13\x03\x2a\xf1\xe9\xd3\x0b\x34\xa1\x8d\x4f\x1d\x74\x9a\xe8\xe6\x29\x79\xaa\x89\xc1\x4b\xe3\xaa\x8c\x95\x06\x2d\x5b\xa3\x5d\xe7\x58\xcb\x09\x70\x6d\x0d\x8c\x8c\xc9\x9d\xba\x39\x72\xfb\x72\x74\xf9\xbf\x8d\xa1\xf1\x41\x00\xf3\x39\x18\x56\xe2\x26\x4e\xcd\x12\xca\xca\xed\x5a\xbb\x82\x5a\x1d\x29\x6b\x8b\xdd\xbe\x12\xc4\xe4\xd1\x12\x6f\x3a\xfd\xac\x6c\xe3\xb8\x7f\x23\x16\x81\x41\xe0\xa6\x5f\x9f\x23\x07\xeb\x7d\x83\xeb\x9f\x00\x00\x00\xff\xff\x4b\xef\x7e\x93\x6c\x0b\x00\x00") +var _assetsPrometheusOperatorUserWorkloadDeploymentYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x56\x5b\x6f\x2a\x37\x10\x7e\xe7\x57\x58\xe7\xb9\x66\x81\x5c\x4e\x64\x89\x07\x44\x68\x53\x29\x37\x95\xa8\x55\x9f\x90\xe3\x1d\xc0\xc5\xb7\x33\x33\x4b\xb3\xaa\xfa\xdf\x2b\x87\x40\x76\x49\xc8\xa5\x3d\xdd\x27\x18\x7f\xfe\x3c\xdf\xcc\x37\xde\xd5\xc9\xfe\x0a\x48\x36\x06\x25\x74\x4a\x54\xac\xfb\x9d\x95\x0d\xa5\x12\xe7\x90\x5c\xac\x3d\x04\xee\x78\x60\x5d\x6a\xd6\xaa\x23\x84\xd3\xf7\xe0\x28\xff\x12\x79\x43\x77\x55\xdd\x03\x06\x60\xa0\xae\x8d\x85\x89\x3e\xc5\x00\x81\x95\x30\x31\x30\x46\xe7\x00\x0f\x60\x83\xf6\xa0\x44\xc2\xe8\x81\x97\x50\x91\x8c\x09\x50\x73\x3c\x84\x5f\x6f\xf3\x5c\xf7\xba\xc7\x83\x6e\xbf\x23\xc4\x5b\x14\x79\x8d\x92\x36\xa0\x44\x4c\x10\x68\x69\xe7\x2c\x2b\x02\x94\x7f\x46\x5c\xb9\xa8\x4b\xe9\x63\xb0\x1c\xd1\x86\x45\x87\x12\x98\x2c\x0a\x21\x39\x6b\x34\x29\x91\xf9\x09\x1c\x18\x8e\xb8\x91\xeb\x35\x9b\xe5\x65\x43\xff\xe7\x2a\xf0\xd9\x1a\x30\xf8\xe4\x34\xc3\xd3\xe1\x8d\x1e\xe4\xc7\xb5\xf2\xf8\x6c\x26\x9f\xef\xc7\x87\x7b\x22\xc4\xb6\x96\xf9\xc9\x27\x6b\x1b\x00\x77\xa9\x4a\xa1\x71\xd1\x48\x5c\x0a\x29\x5d\x5c\x70\x24\x2e\x01\x71\xc8\x58\x41\x6b\xd1\xc4\x30\xb7\x0b\x89\x90\x7b\x06\x28\xad\xd7\x0b\x18\xfe\x61\xbd\xb7\x65\x4d\x31\x14\x1b\x80\xd7\xe9\x09\xa3\x72\x32\xdd\x5e\x8b\xa4\x21\x6b\x8f\x6f\xf8\xad\xd2\x75\xd6\xf2\x8a\xf2\xe2\xf0\x36\xd5\x54\xbc\x3d\xa5\x84\x50\xcb\x9d\xf1\x68\xf8\x6c\xbc\x86\xd5\x0e\xa4\x65\x03\xb1\x0e\x06\x5e\xdf\x7f\xd0\xb8\x4d\x36\xed\x00\xd9\xeb\xa0\x17\xb9\x4c\xff\x9d\x8f\x97\x3a\x44\x92\x58\xb9\xef\xc3\xb7\xdf\x49\x93\xaa\x61\xef\x4d\x84\x07\x1f\xb1\x6e\x80\x1e\x9b\xaf\xc4\x07\x7b\xb6\x8d\xbd\x68\xd6\xfb\x5e\x4f\x11\xb9\xe5\xd2\x9d\x93\x6f\x23\xb2\x12\x67\xbd\xb3\xe7\xac\xb6\x84\x4b\xe6\xb4\x0b\x22\x50\xac\xd0\x40\x83\x25\x07\xbf\x55\x40\xdc\x8a\x09\x61\x52\xa5\x44\xdf\xb7\x62\x1b\xe9\x4a\xf4\xbf\x5e\xd9\xdd\x02\x81\xa9\xd0\x72\x3d\x8e\x81\xe1\x81\x95\xf8\xeb\xef\xdd\x1a\x03\x7a\x1b\x34\xdb\x18\xae\x80\x48\x2f\xe0\x36\x3a\x6b\x6a\x25\x7e\xd4\xce\xdd\x6b\xb3\xba\x8b\x97\x71\x41\x37\x61\x82\xb8\x53\xfa\xce\x38\xb6\xe2\x8f\xa7\x83\x74\x96\x18\x82\xd4\x65\x89\x40\x34\x54\x67\xc7\xc7\x47\x6d\xdf\x38\x92\xc6\xa6\x25\xa0\xa4\xca\x32\xd0\xf0\xee\x72\x3a\x9b\x8c\xcf\x2f\x26\xb3\x5f\xa6\xa3\xd9\x6f\x3f\xdf\x5d\xcc\x46\x93\xe9\xac\x3f\x38\x9b\xfd\x34\xbe\x9a\x4d\x2f\x46\x83\x93\xd3\x1f\x9e\x51\x93\xf1\xf9\x87\x70\x2d\xb6\xc1\xc9\xe9\x16\x75\x74\x76\x7c\x98\xed\x20\x6e\xc7\x36\xbe\x18\x8d\x2f\x46\x83\xde\xec\xf6\xe6\xf2\xf7\xfe\x51\xef\xe4\x75\xb2\x17\xb0\x56\x15\xaa\x44\x8c\xa0\xfd\x30\xbb\x42\x15\x45\x7f\xf0\xb5\xdb\xeb\xf6\xba\x7d\x95\xbd\x53\xbc\xac\x18\x20\xcb\xb9\x75\x30\x2c\x80\x4d\xc1\x8e\x8a\x84\x76\xad\x19\xf2\xef\xae\x41\x7e\xb1\xe5\x69\x5d\xae\xa0\x7e\x63\xe7\x0a\xea\x43\xf3\x63\x22\x42\xa4\x22\x5f\xea\x12\xef\xb5\xc9\x17\xd2\x43\x9d\xc7\xe5\xb4\x71\x81\x6e\xcc\xbd\x07\xfa\xf8\xa4\x34\xed\xd1\x9c\x14\xfa\xee\xa3\xd2\xfb\x5f\x47\x45\x88\x75\x74\x95\x87\xab\x58\x85\xb6\x62\x9f\x23\xb7\x9a\x97\x4a\xec\x77\xe0\x85\xf2\x57\x2e\x9d\xbd\xdb\x93\x1d\xb5\xca\xa0\xcb\x9b\xe0\x6a\x25\xe6\xda\xd1\x96\x2f\xc4\x12\xa6\xad\xaf\x93\xfc\xdc\x03\xeb\xbd\x37\x74\x24\x25\x9c\x0d\xd5\xc3\x73\x37\x63\x09\x12\xa3\x83\x3d\xa4\xd7\xc4\x80\x4a\x7c\xf9\xf2\x04\x4d\x68\xe3\x63\x05\x9d\x26\xba\x7e\x4c\x9e\x6a\x62\xf0\xd2\xb8\x2a\x63\xa5\x41\xcb\xd6\x68\xd7\x79\xaf\xe4\x04\xb8\xb6\x06\x46\xc6\xe4\x4a\x5d\xbf\x73\xfb\x72\x74\xf9\xbf\x8d\xa1\xf1\xd5\x00\xf3\x39\x18\x56\xe2\x3a\x4e\xcd\x12\xca\xca\x3d\x97\x76\x05\xb5\x7a\x47\xd6\x0e\xbb\x7b\x25\x88\xc9\x83\x25\xde\x56\x7a\xd3\xd9\xc6\x71\xff\xa6\x59\x04\x06\x81\x9b\x7e\xdd\x44\x0e\xea\x7d\x85\xeb\x9f\x00\x00\x00\xff\xff\x7e\x18\xd2\x57\x91\x0b\x00\x00") func assetsPrometheusOperatorUserWorkloadDeploymentYamlBytes() ([]byte, error) { return bindataRead( @@ -2163,7 +2163,7 @@ func assetsPrometheusOperatorUserWorkloadDeploymentYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "assets/prometheus-operator-user-workload/deployment.yaml", size: 2924, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "assets/prometheus-operator-user-workload/deployment.yaml", size: 2961, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil }