Merge branch 'operator-framework:main' into fix-desiredState-in-applier-and-some-hack-scripts-issues

Author: azych

config/base/kustomization.yaml

@@ -18,5 +18,4 @@ resources:
 - crd
 - rbac
 - manager
-# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
-#- ../prometheus
+

config/base/manager/kustomization.yaml

@@ -1,8 +1,11 @@
-resources:
-- manager.yaml
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+
+resources:
+- manager.yaml
+- service.yaml
+
 images:
 - name: controller
   newName: quay.io/operator-framework/operator-controller
-  newTag: devel
+  newTag: devel

config/base/rbac/auth_proxy_service.yaml renamed to config/base/manager/service.yaml

@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
+  name: service
+  namespace: system
   labels:
     control-plane: operator-controller-controller-manager
-  name: controller-manager-metrics-service
-  namespace: system
 spec:
   ports:
   - name: https

config/base/prometheus/kustomization.yaml

@@ -23,7 +23,6 @@ resources:
 # can access the metrics endpoint. Comment the following
 # permissions if you want to disable this protection.
 # More info: https://book.kubebuilder.io/reference/metrics.html
-- auth_proxy_service.yaml
 - auth_proxy_role.yaml
 - auth_proxy_role_binding.yaml
 - auth_proxy_client_clusterrole.yaml

config/base/prometheus/monitor.yaml

@@ -5,10 +5,8 @@ metadata:
 spec:
   secretName: olmv1-cert
   dnsNames:
-    - operator-controller.olmv1-system.svc
-    - operator-controller.olmv1-system.svc.cluster.local
-    - operator-controller-controller-manager-metrics-service.olmv1-system.svc
-    - operator-controller-controller-manager-metrics-service.olmv1-system.svc.cluster.local
+    - operator-controller-service.olmv1-system.svc
+    - operator-controller-service.olmv1-system.svc.cluster.local
   privateKey:
     algorithm: ECDSA
     size: 256

config/base/rbac/kustomization.yaml

@@ -1,13 +1,13 @@
 Babel==2.16.0
 beautifulsoup4==4.12.3
 certifi==2024.12.14
-charset-normalizer==3.4.0
+charset-normalizer==3.4.1
 click==8.1.7
 colorama==0.4.6
 cssselect==1.2.0
 ghp-import==2.1.0
 idna==3.10
-Jinja2==3.1.4
+Jinja2==3.1.5
 lxml==5.3.0
 Markdown==3.7
 markdown2==2.5.2
@@ -21,7 +21,7 @@ paginate==0.5.7
 pathspec==0.12.1
 platformdirs==4.3.6
 Pygments==2.18.0
-pymdown-extensions==10.12
+pymdown-extensions==10.13
 pyquery==2.0.1
 python-dateutil==2.9.0.post0
 PyYAML==6.0.2
@@ -31,5 +31,5 @@ regex==2024.11.6
 requests==2.32.3
 six==1.17.0
 soupsieve==2.6
-urllib3==2.2.3
+urllib3==2.3.0
 watchdog==6.0.0

config/components/tls/resources/manager_cert.yaml

@@ -98,7 +98,7 @@ func TestOperatorControllerMetricsExportedEndpoint(t *testing.T) {
 	require.NoError(t, waitErr, "Error waiting for curl pod to be ready: %s", string(waitOutput))
 
 	t.Log("Validating the metrics endpoint")
-	metricsURL := "https://operator-controller-controller-manager-metrics-service." + namespace + ".svc.cluster.local:8443/metrics"
+	metricsURL := "https://operator-controller-service." + namespace + ".svc.cluster.local:8443/metrics"
 	curlCmd := exec.Command(client, "exec", curlPod, "-n", namespace, "--",
 		"curl", "-v", "-k", "-H", "Authorization: Bearer "+token, metricsURL)
 	output, err = curlCmd.CombinedOutput()