Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 1857192: test/e2e: don't count central grpc-tls #899

Merged
merged 1 commit into from Aug 3, 2020

Conversation

s-urbaniak
Copy link
Contributor

We expect a constant number of 5 secrets
as per

// 1. openshift-monitoring/grpc-tls

However the underlying countGRPCSecrets method only lists secrets
having the monitoring.openshift.io/hash label set
which excludes grpc-tls.

It is flaky because, during GRPC TLS rotation, there are indeed
sometimes 5 secrets with the above hash label (pre- and post-rotation secrets).

The fix is to expect 4 secrets only which is the what the rotation has to converge against.

/cc @openshift/openshift-team-monitoring

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

We expect a constant number of 5 secrets
as per https://github.com/openshift/cluster-monitoring-operator/blob/f9567c5be644a867e41e2312f93c7183d5aa9c10/test/e2e/user_workload_monitoring_test.go#L894

However the underlying `countGRPCSecrets` method only lists secrets
having the `monitoring.openshift.io/hash` label set
which excludes `grpc-tls`.

It is flaky because, during GRPC TLS rotation, there are indeed
sometimes 5 secrets with the above hash label (pre- and post-rotation secrets).

The fix is to expect 4 secrets only which is the what the rotation has to converge against.
@openshift-ci-robot openshift-ci-robot requested a review from a team August 3, 2020 16:04
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 3, 2020
@s-urbaniak s-urbaniak changed the title test/e2e: don't count central grpc-tls Bug 1857192: test/e2e: don't count central grpc-tls Aug 3, 2020
@openshift-ci-robot openshift-ci-robot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Aug 3, 2020
@openshift-ci-robot
Copy link
Contributor

@s-urbaniak: This pull request references Bugzilla bug 1857192, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1857192: test/e2e: don't count central grpc-tls

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

// 4. openshift-user-workload-monitoring/thanos-ruler-grpc-tls-[hash]
//
// The central grpc-tls secret is verified independently by getting it directly
// and verifying if the force-rotation annotation has been removed.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we ensure that openshift-monitoring/grpc-tls is excluded from being counted?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in fact we do that already (that was the actual flake cause) by setting the label selector in

s, err := f.KubeClient.CoreV1().Secrets(ns).List(context.TODO(), metav1.ListOptions{LabelSelector: "monitoring.openshift.io/hash"})

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: paulfantom, s-urbaniak

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [paulfantom,s-urbaniak]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 3, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit c54fe62 into openshift:master Aug 3, 2020
@openshift-ci-robot
Copy link
Contributor

@s-urbaniak: All pull requests linked via external trackers have merged: openshift/cluster-monitoring-operator#899. Bugzilla bug 1857192 has been moved to the MODIFIED state.

In response to this:

Bug 1857192: test/e2e: don't count central grpc-tls

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants