sync: rc-2023-11-16.2 to stage (#1476)

sync-branches: New code has just landed in rc-2023-11-16.2, so let's
bring stage up to speed!

Author: ludydoo

dp-terraform/helm/rhacs-terraform/charts/secured-cluster/templates/secured-cluster-cr.yaml

@@ -58,13 +58,13 @@ spec:
       {{- if .Values.scanner.analyzer.nodeSelector }}
       nodeSelector: {{ toYaml .Values.scanner.analyzer.nodeSelector | nindent 8 }}
       {{- end }}
-      db:
-        {{- if .Values.scanner.analyzer.db.resources }}
-        resources: {{ toYaml .Values.scanner.analyzer.db.resources | nindent 10 }}
-        {{- end }}
-        {{- if .Values.scanner.analyzer.db.tolerations }}
-        tolerations: {{ toYaml .Values.scanner.analyzer.db.tolerations | nindent 10 }}
-        {{- end }}
-        {{- if .Values.scanner.analyzer.db.nodeSelector }}
-        nodeSelector: {{ toYaml .Values.scanner.analyzer.db.nodeSelector | nindent 10 }}
-        {{- end }}
+    db:
+      {{- if .Values.scanner.db.resources }}
+      resources: {{ toYaml .Values.scanner.db.resources | nindent 8 }}
+      {{- end }}
+      {{- if .Values.scanner.db.tolerations }}
+      tolerations: {{ toYaml .Values.scanner.db.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if .Values.scanner.db.nodeSelector }}
+      nodeSelector: {{ toYaml .Values.scanner.db.nodeSelector | nindent 8 }}
+      {{- end }}

dp-terraform/helm/rhacs-terraform/charts/secured-cluster/values.yaml

@@ -38,13 +38,13 @@ scanner:
       requests:
         memory: 100Mi
         cpu: 100m
-    db:
-      tolerations: []
-      nodeSelector: {}
-      resources:
-        requests:
-          memory: 100Mi
-          cpu: 100m
+  db:
+    tolerations: []
+    nodeSelector: {}
+    resources:
+      requests:
+        memory: 100Mi
+        cpu: 100m
 sensor:
   serviceTLS:
     cert: ""

dp-terraform/helm/rhacs-terraform/values.yaml

@@ -224,13 +224,13 @@ secured-cluster:
           effect: NoSchedule
       nodeSelector:
         node-role.kubernetes.io/acscs-infra: ""
-      db:
-        tolerations:
-          - key: node-role.kubernetes.io/acscs-infra
-            operator: Exists
-            effect: NoSchedule
-        nodeSelector:
-          node-role.kubernetes.io/acscs-infra: ""
+    db:
+      tolerations:
+        - key: node-role.kubernetes.io/acscs-infra
+          operator: Exists
+          effect: NoSchedule
+      nodeSelector:
+        node-role.kubernetes.io/acscs-infra: ""
 
 external-secrets:
   fullnameOverride: rhacs-external-secrets

pkg/features/list.go

@@ -5,8 +5,8 @@ var (
 	TargetedOperatorUpgrades = registerFeature("Upgrade Central instances targetedly via fleet-manager API", "RHACS_TARGETED_OPERATOR_UPGRADES", false)
 
 	// GitOpsCentrals enables the GitOps for Central instances
-	GitOpsCentrals = registerFeature("GitOps for Central instances", "RHACS_GITOPS_ENABLED", false)
+	GitOpsCentrals = registerFeature("GitOps for Central instances", "RHACS_GITOPS_ENABLED", true)
 
 	// PrintCentralUpdateDiff enables printing the diff of the central update
-	PrintCentralUpdateDiff = registerFeature("Print the diff of the central update", "RHACS_PRINT_CENTRAL_UPDATE_DIFF", false)
+	PrintCentralUpdateDiff = registerFeature("Print the diff of the central update", "RHACS_PRINT_CENTRAL_UPDATE_DIFF", true)
 )

pkg/server/profiler/profiler_server.go

@@ -39,25 +39,32 @@ var (
 // SingletonPprofServer returns the PprofServer
 func SingletonPprofServer() *PprofServer {
 	oncePprofServer.Do(func() {
-		router := mux.NewRouter()
-		router.Handle("/debug/pprof/", http.HandlerFunc(pprof.Index))
-		router.Handle("/debug/pprof/cmdline", http.HandlerFunc(pprof.Cmdline))
-		router.Handle("/debug/pprof/profile", http.HandlerFunc(pprof.Profile))
-		router.Handle("/debug/pprof/symbol", http.HandlerFunc(pprof.Symbol))
-		router.Handle("/debug/pprof/trace", http.HandlerFunc(pprof.Trace))
-		router.Handle("/debug/pprof/{cmd}", http.HandlerFunc(pprof.Index)) // special handling for Gorilla mux
-		httpServer := &http.Server{
-			Addr:    "localhost:6060",
-			Handler: router,
-		}
-
-		pprofServerInstance = &PprofServer{
-			httpServer: httpServer,
-		}
+		pprofServerInstance = newPprofServer()
 	})
 	return pprofServerInstance
 }
 
+func getRouter() *mux.Router {
+	router := mux.NewRouter()
+	router.Handle("/debug/pprof/", http.HandlerFunc(pprof.Index))
+	router.Handle("/debug/pprof/cmdline", http.HandlerFunc(pprof.Cmdline))
+	router.Handle("/debug/pprof/profile", http.HandlerFunc(pprof.Profile))
+	router.Handle("/debug/pprof/symbol", http.HandlerFunc(pprof.Symbol))
+	router.Handle("/debug/pprof/trace", http.HandlerFunc(pprof.Trace))
+	router.Handle("/debug/pprof/{cmd}", http.HandlerFunc(pprof.Index)) // special handling for Gorilla mux
+	return router
+}
+
+func newPprofServer() *PprofServer {
+	httpServer := &http.Server{
+		Addr:    "localhost:6060",
+		Handler: getRouter(),
+	}
+	return &PprofServer{
+		httpServer: httpServer,
+	}
+}
+
 // Stop ...
 func (p *PprofServer) Stop() {
 	err := p.httpServer.Shutdown(context.Background())

pkg/server/profiler/profiler_server_test.go

@@ -12,19 +12,16 @@ func TestPprofProfiler(t *testing.T) {
 	server := SingletonPprofServer()
 	server.Start()
 
-	for {
-		conn, err := net.DialTimeout("tcp", net.JoinHostPort("localhost", "6060"), 5*time.Second)
-		require.NoError(t, err)
-		if conn != nil {
-			require.NoError(t, conn.Close())
-			break
-		}
-		time.Sleep(50 * time.Millisecond)
+	// Test server is reachable
+	conn, err := net.DialTimeout("tcp", net.JoinHostPort("localhost", "6060"), 60*time.Second)
+	require.NoError(t, err)
+	if conn != nil {
+		require.NoError(t, conn.Close())
 	}
 
 	// Test server was stopped
 	server.Stop()
-	conn, err := net.DialTimeout("tcp", net.JoinHostPort("localhost", "6060"), 5*time.Second)
+	conn, err = net.DialTimeout("tcp", net.JoinHostPort("localhost", "6060"), 2*time.Second)
 	require.Error(t, err)
 	require.Nil(t, conn)
 }