update APIremovedRelease test and alerts

openshift · Aug 12, 2021 · 57b8a5d · 57b8a5d
1 parent 06e6b54
commit 57b8a5d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/bindata/assets/alerts/api-usage.yaml b/bindata/assets/alerts/api-usage.yaml
@@ -15,7 +15,7 @@ spec:
               a successful upgrade to the next cluster version.
               Refer to `oc get apirequestcounts {{ $labels.resource }}.{{ $labels.version }}.{{ $labels.group }} -o yaml` to identify the workload.
           expr: |
-            group(apiserver_requested_deprecated_apis{removed_release="1.22"}) by (group,version,resource) and (sum by(group,version,resource) (rate(apiserver_request_total{system_client!="kube-controller-manager",system_client!="cluster-policy-controller"}[4h]))) > 0
+            group(apiserver_requested_deprecated_apis{removed_release="1.23"}) by (group,version,resource) and (sum by(group,version,resource) (rate(apiserver_request_total{system_client!="kube-controller-manager",system_client!="cluster-policy-controller"}[4h]))) > 0
           for: 1h
           labels:
             severity: info
@@ -27,7 +27,7 @@ spec:
               a successful upgrade to the next EUS cluster version.
               Refer to `oc get apirequestcounts {{ $labels.resource }}.{{ $labels.version }}.{{ $labels.group }} -o yaml` to identify the workload.
           expr: |
-            group(apiserver_requested_deprecated_apis{removed_release=~"1\\.2[123]"}) by (group,version,resource) and (sum by(group,version,resource) (rate(apiserver_request_total{system_client!="kube-controller-manager",system_client!="cluster-policy-controller"}[4h]))) > 0
+            group(apiserver_requested_deprecated_apis{removed_release=~"1\\.2[1234]"}) by (group,version,resource) and (sum by(group,version,resource) (rate(apiserver_request_total{system_client!="kube-controller-manager",system_client!="cluster-policy-controller"}[4h]))) > 0
 
           for: 1h
           labels:

diff --git a/test/e2e/deprecated_api_test.go b/test/e2e/deprecated_api_test.go
@@ -30,6 +30,9 @@ func TestAPIRemovedInNextReleaseInUse(t *testing.T) {
 		currentMinor, err := strconv.Atoi(regexp.MustCompile(`^\d*`).FindString(version.Minor))
 
 		// get deprecated major.minor version from alert expression
+		// NOTE: the alert major and minor version is hardcoded
+		// this test will fail in each version bump until the alert is updated
+		// xref: /home/aojea/go/src/github.com/openshift/cluster-kube-apiserver-operator/bindata/assets/alerts/api-usage.yaml
 		monitoringClient, err := monitoringclient.NewForConfig(kubeConfig)
 		require.NoError(t, err)
 		ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)