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 1832124: retain pvc metdata #68

Merged

Conversation

pgier
Copy link

@pgier pgier commented May 8, 2020

Backport of upstream PVC metadata fix: prometheus-operator#3115

@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/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels May 8, 2020
@openshift-ci-robot
Copy link

@pgier: This pull request references Bugzilla bug 1832124, which is invalid:

  • expected Bugzilla bug 1832124 to depend on a bug targeting a release in 4.5.0, 4.5.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but no dependents were found

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1832124: retain pvc metdata

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.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 8, 2020
pgier added 2 commits May 8, 2020 12:43
This allows nested PersistentVolumeClaim fields to be validated and
maintain metadata information such as labels and annotations.

Signed-off-by: Paul Gier <pgier@redhat.com>
Signed-off-by: Paul Gier <pgier@redhat.com>
@pgier pgier force-pushed the bz1832124-retain-pvc-metdata branch from 881613c to 40737b5 Compare May 8, 2020 17:46
@pgier pgier changed the base branch from release-4.4 to master May 8, 2020 17:46
@openshift-ci-robot
Copy link

@pgier: This pull request references Bugzilla bug 1832124, 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.5.0) matches configured target release for branch (4.5.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 1832124: retain pvc metdata

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.

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels May 8, 2020
@pgier
Copy link
Author

pgier commented May 8, 2020

/bugzilla refresh

@openshift-ci-robot
Copy link

@pgier: This pull request references Bugzilla bug 1832124, which is valid.

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

In response to this:

/bugzilla refresh

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.

@s-urbaniak
Copy link

@pgier the upgrade test failure seems to be legit:

    <*errors.errorString | 0xc001a6c0c0>: {
        s: "Cluster did not complete upgrade: timed out waiting for the condition: Cluster operator monitoring is still updating",
    }
    Cluster did not complete upgrade: timed out waiting for the condition: Cluster operator monitoring is still updating

with an underlying error:

May 08 18:20:47.407 E ns/openshift-monitoring pod/prometheus-k8s-1 node/ip-10-0-137-167.ec2.internal container=prometheus-config-reloader container exited with code 2 (Error): ts=2020-05-08T18:19:42.391007353Z caller=main.go:85 msg="Starting prometheus-config-reloader version '1.12.16'."\nlevel=info ts=2020-05-08T18:19:42.391133303Z caller=reloader.go:127 msg="started watching config file for changes" in=/etc/prometheus/config/prometheus.yaml.gz out=/etc/prometheus/config_out/prometheus.env.yaml\nlevel=error ts=2020-05-08T18:19:42.392521749Z caller=runutil.go:87 msg="function failed. Retrying in next tick" err="trigger reload: reload request failed: Post http://localhost:9090/-/reload: dial tcp [::1]:9090: connect: connection refused"\nlevel=error ts=2020-05-08T18:19:47.392715916Z caller=runutil.go:87 msg="function failed. Retrying in next tick" err="trigger reload: reload request failed: Post http://localhost:9090/-/reload: dial tcp [::1]:9090: connect: connection refused"\nlevel=info ts=2020-05-08T18:19:52.504768465Z caller=reloader.go:258 msg="Prometheus reload triggered" cfg_in=/etc/prometheus/config/prometheus.yaml.gz cfg_out=/etc/prometheus/config_out/prometheus.env.yaml rule_dirs=\n

@lilic
Copy link

lilic commented May 11, 2020

I would prefer this bugfix merged into the release branch of prom-operator upstream as we are not the only ones impacted by this and then brought in downstream to openshift.

@pgier
Copy link
Author

pgier commented May 11, 2020

Upstream PR to 0.38 release branch prometheus-operator#3209

@pgier
Copy link
Author

pgier commented May 11, 2020

/retest

@pgier
Copy link
Author

pgier commented May 11, 2020

@s-urbaniak I think it was just a flake, looks like it's passing now. @lilic I created an upstream PR, but I'm having trouble getting it to build correctly for some reason.

Check that metadata added to a volume claim template in a prometheus
resource is retained in both the Prometheus object and the stateful set.
@pgier pgier force-pushed the bz1832124-retain-pvc-metdata branch from 40737b5 to ef67cb7 Compare May 12, 2020 15:18
@pgier
Copy link
Author

pgier commented May 13, 2020

@s-urbaniak @lilic is this ok to merge now that the upstream issue is merged? or do we need an upstream Z release?

@s-urbaniak
Copy link

my 2 cent: if the content of the cherry-picks is the same as upstream i am fine with merging this. since the QA phase for 4.5 is not over yet we might encounter additional necessary fixes. Once 4.5 code freezes we can cut a z-release upstream.

@s-urbaniak
Copy link

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 14, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pgier, 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:

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

@openshift-merge-robot openshift-merge-robot merged commit 99b8939 into openshift:master May 14, 2020
@openshift-ci-robot
Copy link

@pgier: All pull requests linked via external trackers have merged: openshift/prometheus-operator#68. Bugzilla bug 1832124 has been moved to the MODIFIED state.

In response to this:

Bug 1832124: retain pvc metdata

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