USHIFT-6951: move otelcol metrics drop-in to metrics-server package

metrics-server installs its own otelcol drop-in config and creates
the otelcol.d directory, removing the hard coupling to observability

Signed-off-by: Jonathan H. Cope <jcope@redhat.com>

Author: copejon

packaging/rpm/microshift.spec

@@ -236,7 +236,6 @@ and can be used to embed those images into osbuilder blueprints or bootc contain
 Summary: OpenTelemetry-Collector configured for MicroShift
 BuildArch: noarch
 Requires: microshift = %{version}
-Requires: microshift-metrics-server = %{version}
 Requires: opentelemetry-collector
 
 %description observability
@@ -584,7 +583,6 @@ install -p -m644 assets/optional/ai-model-serving/release-ai-model-serving-x86_6
 install -d -m755 %{buildroot}/%{_sysconfdir}/microshift/observability
 install -d -m755 %{buildroot}/%{_sysconfdir}/microshift/observability/otelcol.d
 install -p -m644 packaging/observability/*.yaml -D %{buildroot}%{_sysconfdir}/microshift/observability/
-install -p -m644 packaging/observability/otelcol.d/microshift-metrics-server.yaml %{buildroot}%{_sysconfdir}/microshift/observability/otelcol.d/
 # Explicit copy of large config as default. Not using symlink to avoid accidental package upgrade overwriting user config if the user edits the config without copying (i.e. edits the target of symlink).
 install -p -m644 packaging/observability/opentelemetry-collector-large.yaml -D %{buildroot}%{_sysconfdir}/microshift/observability/opentelemetry-collector.yaml
 install -p -m644 packaging/observability/microshift-observability.service %{buildroot}%{_unitdir}/
@@ -642,6 +640,10 @@ cat assets/optional/metrics-server/kustomization.aarch64.yaml >> %{buildroot}/%{
 cat assets/optional/metrics-server/kustomization.x86_64.yaml >> %{buildroot}/%{_prefix}/lib/microshift/manifests.d/080-microshift-metrics-server/kustomization.yaml
 %endif
 
+# metrics-server otelcol drop-in (creates the config path if microshift-observability is not installed)
+install -d -m755 %{buildroot}/%{_sysconfdir}/microshift/observability/otelcol.d
+install -p -m644 packaging/observability/otelcol.d/microshift-metrics-server.yaml %{buildroot}%{_sysconfdir}/microshift/observability/otelcol.d/
+
 # metrics-server-release-info
 mkdir -p -m755 %{buildroot}%{_datadir}/microshift/release
 install -p -m644 assets/optional/metrics-server/release-metrics-server-{x86_64,aarch64}.json %{buildroot}%{_datadir}/microshift/release/
@@ -842,7 +844,6 @@ fi
 %config(noreplace) %{_sysconfdir}/microshift/observability/opentelemetry-collector.yaml
 %{_sysconfdir}/microshift/observability/opentelemetry-collector-*.yaml
 %{_prefix}/lib/microshift/manifests.d/003-microshift-observability/*
-%config(noreplace) %{_sysconfdir}/microshift/observability/otelcol.d/microshift-metrics-server.yaml
 
 %files cert-manager
 %dir %{_prefix}/lib/microshift/manifests.d/060-microshift-cert-manager
@@ -854,6 +855,8 @@ fi
 %files metrics-server
 %dir %{_prefix}/lib/microshift/manifests.d/080-microshift-metrics-server
 %{_prefix}/lib/microshift/manifests.d/080-microshift-metrics-server/*
+%dir %{_sysconfdir}/microshift/observability/otelcol.d
+%config(noreplace) %{_sysconfdir}/microshift/observability/otelcol.d/microshift-metrics-server.yaml
 
 %files metrics-server-release-info
 %{_datadir}/microshift/release/release-metrics-server-{x86_64,aarch64}.json