Merge pull request #2409 from slashpai/remove-adapter

MON-3900: Remove prometheus-adapter code

Author: openshift-merge-bot[bot]

.github/ISSUE_TEMPLATE/release.md

@@ -16,7 +16,7 @@ about: Create release checklist
 - [ ] update downstream backport of [openshift/prometheus-operator](https://github.com/openshift/prometheus-operator)
 - [ ] update downstream backport of [openshift/kube-state-metrics](https://github.com/openshift/kube-state-metrics)
 - [ ] update downstream backport of [openshift/kube-rbac-proxy](https://github.com/openshift/kube-rbac-proxy)
-- [ ] update downstream backport of [openshift/k8s-prometheus-adapter](https://github.com/openshift/k8s-prometheus-adapter)
+- [ ] update downstream backport of [openshift/kubernetes-metrics-server](https://github.com/openshift/kubernetes-metrics-server)
 
 ## Jsonnet dependencies
 

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.17
+
+- [#2409](https://github.com/openshift/cluster-monitoring-operator/issues/2409) Remove prometheus-adapter code from CMO
+
 ## 4.16
 
 - [#2302](https://github.com/openshift/cluster-monitoring-operator/issues/2302) Enable feature `extra-scrape-metrics` in Prometheus user-workload

Documentation/api.md

@@ -128,7 +128,6 @@ The `ClusterMonitoringConfiguration` resource defines settings that customize th
 | -------- | ---- | ----------- |
 | alertmanagerMain | *[AlertmanagerMainConfig](#alertmanagermainconfig) | `AlertmanagerMainConfig` defines settings for the Alertmanager component in the `openshift-monitoring` namespace. |
 | enableUserWorkload | *bool | `UserWorkloadEnabled` is a Boolean flag that enables monitoring for user-defined projects. |
-| k8sPrometheusAdapter | *[K8sPrometheusAdapter](#k8sprometheusadapter) | `K8sPrometheusAdapter` defines settings for the Prometheus Adapter component. |
 | metricsServer | *[MetricsServerConfig](#metricsserverconfig) | `MetricsServer` defines settings for the MetricsServer component. |
 | kubeStateMetrics | *[KubeStateMetricsConfig](#kubestatemetricsconfig) | `KubeStateMetricsConfig` defines settings for the `kube-state-metrics` agent. |
 | prometheusK8s | *[PrometheusK8sConfig](#prometheusk8sconfig) | `PrometheusK8sConfig` defines settings for the Prometheus component. |
@@ -146,10 +145,7 @@ The `ClusterMonitoringConfiguration` resource defines settings that customize th
 
 #### Description
 
-The `K8sPrometheusAdapter` resource defines settings for the Prometheus Adapter component. This is deprecated and will be removed in a future version.
-
-
-<em>appears in: [ClusterMonitoringConfiguration](#clustermonitoringconfiguration)</em>
+The `K8sPrometheusAdapter` resource defines settings for the Prometheus Adapter component. This is deprecated config, setting this has no effect and will be removed in a future version.
 
 | Property | Type | Description |
 | -------- | ---- | ----------- |

Documentation/deps-versions.md

@@ -19,8 +19,6 @@ The `ClusterMonitoringConfiguration` resource defines settings that customize th
 
 |enableUserWorkload|*bool|`UserWorkloadEnabled` is a Boolean flag that enables monitoring for user-defined projects.
 
-|k8sPrometheusAdapter|*link:k8sprometheusadapter.adoc[K8sPrometheusAdapter]|`K8sPrometheusAdapter` defines settings for the Prometheus Adapter component.
-
 |metricsServer|*link:metricsserverconfig.adoc[MetricsServerConfig]|`MetricsServer` defines settings for the MetricsServer component.
 
 |kubeStateMetrics|*link:kubestatemetricsconfig.adoc[KubeStateMetricsConfig]|`KubeStateMetricsConfig` defines settings for the `kube-state-metrics` agent.

Documentation/openshiftdocs/modules/clustermonitoringconfiguration.adoc

@@ -9,12 +9,9 @@
 
 === Description
 
-The `K8sPrometheusAdapter` resource defines settings for the Prometheus Adapter component. This is deprecated and will be removed in a future version.
+The `K8sPrometheusAdapter` resource defines settings for the Prometheus Adapter component. This is deprecated config, setting this has no effect and will be removed in a future version.
 
 
-
-Appears in: link:clustermonitoringconfiguration.adoc[ClusterMonitoringConfiguration]
-
 [options="header"]
 |===
 | Property | Type | Description 

Documentation/openshiftdocs/modules/k8sprometheusadapter.adoc

@@ -101,10 +101,6 @@ Expose openshift-state-metrics `/metrics` endpoints within the cluster on the fo
 * Port 8443 provides access to the OpenShift resource metrics. This port is for internal use, and no other usage is guaranteed.
 * Port 9443 provides access to the internal `openshift-state-metrics` metrics. This port is for internal use, and no other usage is guaranteed.
 
-=== openshift-monitoring/prometheus-adapter
-
-Expose the `prometheus-adapter` web server on port 443. This port is for internal use, and no other usage is guaranteed.
-
 === openshift-monitoring/prometheus-k8s
 
 Expose the Prometheus web server within the cluster on the following ports:

Documentation/resources.adoc

@@ -82,10 +82,6 @@ Expose openshift-state-metrics `/metrics` endpoints within the cluster on the fo
 * Port 8443 provides access to the OpenShift resource metrics. This port is for internal use, and no other usage is guaranteed.
 * Port 9443 provides access to the internal `openshift-state-metrics` metrics. This port is for internal use, and no other usage is guaranteed.
 
-### openshift-monitoring/prometheus-adapter
-
-Expose the `prometheus-adapter` web server on port 443. This port is for internal use, and no other usage is guaranteed.
-
 ### openshift-monitoring/prometheus-k8s
 
 Expose the Prometheus web server within the cluster on the following ports:

Documentation/resources.md

@@ -9,8 +9,7 @@ It contains the following components:
 * [Alertmanager](https://github.com/prometheus/alertmanager) cluster for cluster and application level alerting
 * [kube-state-metrics](https://github.com/kubernetes/kube-state-metrics)
 * [node_exporter](https://github.com/prometheus/node_exporter)
-* [prometheus-adapter](https://github.com/kubernetes-sigs/prometheus-adapter)
-* [kubernetes-metrics-server](https://github.com/openshift/kubernetes-metrics-server) only on TechPreviewNoUpgrade cluster
+* [kubernetes-metrics-server](https://github.com/openshift/kubernetes-metrics-server)
 
 The deployed Prometheus instance (`prometheus-k8s`) is responsible for monitoring and alerting on cluster and OpenShift components; it should not be extended to monitor user applications. Users interested in leveraging Prometheus for application monitoring on OpenShift should consider enabling [User Workload Monitoring](https://docs.openshift.com/container-platform/4.5/monitoring/monitoring-your-own-services.html) to easily setup new Prometheus instances to monitor and alert on their applications.