Merge pull request #564 from iamkirkbater/etcd-members-down

Removes the etcdMembersDown alert from paging SRE

Author: openshift-merge-bot[bot]

.tekton/OWNERS

@@ -54,10 +54,9 @@ aliases:
     - jaybeeunix
     - sam-nguyen7
     - wshearn
-    - dem4gus
+    - devnulljason
     - npecka
     - pshickeydev
-    - casey-williams-rh
     - boranx
   srep-functional-team-thor:
     - diakovnec

OWNERS_ALIASES

@@ -1 +1 @@
-b33eb88d67486536c185b1b66266bf5d8be77dfe
+e80c64d14b1270998230374b4973695e1ef6ee35

boilerplate/_data/last-boilerplate-commit

@@ -54,10 +54,9 @@ aliases:
     - jaybeeunix
     - sam-nguyen7
     - wshearn
-    - dem4gus
+    - devnulljason
     - npecka
     - pshickeydev
-    - casey-williams-rh
     - boranx
   srep-functional-team-thor:
     - diakovnec

boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES

@@ -18,15 +18,17 @@ cp ${HERE}/.codecov.yml $REPO_ROOT
 echo "Copying OWNERS_ALIASES to your repository root."
 cp -L ${HERE}/OWNERS_ALIASES $REPO_ROOT
 
-# Add CICD owners to .tekton if exists
-if [[ -d "${REPO_ROOT}/.tekton/" ]]; then
-	echo "Adding Konflux subdirectory OWNERS file to .tekton/"
-	cat >"${REPO_ROOT}/.tekton/OWNERS" <<EOF
-reviewers:
-- srep-infra-cicd
-approvers:
-- srep-infra-cicd
-EOF
+# Clean up srep-infra-cicd from .tekton/OWNERS if it exists
+TEKTON_OWNERS="${REPO_ROOT}/.tekton/OWNERS"
+if [[ -f "${TEKTON_OWNERS}" ]] && grep -q "srep-infra-cicd" "${TEKTON_OWNERS}"; then
+	echo "Removing srep-infra-cicd from .tekton/OWNERS..."
+	${SED?} -i '/srep-infra-cicd/d' "${TEKTON_OWNERS}"
+
+	# If no owners remain (ignoring section headers, comments, and blank lines), remove the file
+	if ! grep -qE "^\\s*-\\s+\\S" "${TEKTON_OWNERS}"; then
+		echo "Removing .tekton/OWNERS (no owners remain after cleanup)"
+		rm "${TEKTON_OWNERS}"
+	fi
 fi
 
 # Add dependabot configuration

boilerplate/openshift/golang-osd-operator/update

@@ -478,6 +478,8 @@ func createSubroutes(namespaceList []string, receiver receiverType) *alertmanage
 		{Receiver: receiverWarning, Match: map[string]string{"alertname": "KubeAPILatencyHigh", "severity": "critical"}},
 		// https://issues.redhat.com/browse/OSD-8983
 		{Receiver: receiverWarning, Match: map[string]string{"alertname": "etcdGRPCRequestsSlow", "namespace": "openshift-etcd"}},
+		// https://issues.redhat.com/browse/ROSAENG-59423
+		{Receiver: receiverNull, Match: map[string]string{"alertname": "etcdMembersDown", "namespace": "openshift-etcd"}},
 		// https://issues.redhat.com/browse/OSD-10473
 		{Receiver: receiverWarning, Match: map[string]string{"alertname": "ExtremelyHighIndividualControlPlaneCPU", "namespace": "openshift-kube-apiserver"}},
 		// https://issues.redhat.com/browse/DVO-54