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

MON-3479: [bot] Bump openshift/prometheus-operator to v0.69.1 #256

Merged
merged 6 commits into from Nov 10, 2023

Conversation

openshift-monitoring-bot[bot]
Copy link

Description

This is an automated version bump from CI.
If you wish to perform this manually, execute the following commands from openshift/prometheus-operator repo,

git fetch https://github.com/prometheus-operator/prometheus-operator --tags
if ! git merge refs/tags/v0.69.1 --no-edit; then
  git checkout --theirs CHANGELOG.md Documentation VERSION bundle.yaml example go.mod go.sum pkg
  git checkout --ours 
  git add CHANGELOG.md Documentation VERSION bundle.yaml example go.mod go.sum pkg 
  git merge --continue
fi
go mod tidy
go mod vendor

if [ -f scripts/rh-manifest.sh ]; then
  bash scripts/rh-manifest.sh
  git add rh-manifest.txt
  git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt"
fi

simonpasquier and others added 6 commits November 8, 2023 16:59
Running `go get github.com/prometheus-operator/prometheus@v0.69.0` fails
with:

```
...
not found: create zip:
pkg/prometheus/testdata/TSDB_config_<_v2.39.0.golden: malformed file
path "pkg/prometheus/testdata/TSDB_config_<_v2.39.0.golden": invalid
char '<'
pkg/prometheus/testdata/TSDB_config_>=_v2.39.0.golden: malformed file
path "pkg/prometheus/testdata/TSDB_config_>=_v2.39.0.golden": invalid
char '>'
```

This commit renames the problematic golden files to avoid characters
which aren't supported by the checksum database.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
…-imports

chore: fix filenames to avoid import failures
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
v0.69.1

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEE/jCAc0MNZY5toBt1AZCmbAoQ/E8FAmVM3tEACgkQAZCmbAoQ
# /E/e7Q/+IluJbBGQEIkEMWaZiFrcya6yEvoLy4gc8LXfhsUqp/HoDdzaulE8EaeE
# fLwLz9TIOV2ePeH8h4caJ2+lQa9XXNRj92rwRrUkP5nw7Sl9HD+TjR3+JZurwNdN
# JyRQO3qjdMHJs1zYVA5aS6mcIni7qt60XSFMgkOSOXhHLBSjuQlkuoSpKFo3JgKE
# pig5Y2P6aDUtLk+juaammpasGvytSdr+C0n9QCuYZ1EEoecHS1v7rZ1WguGmT6rK
# mWTsIstGkvV95Yvget1ltr+WUY6oeYWZ0nZibtlxjy95LsKABPz5PHDM0yrZzrOo
# L1VZPLjbaLCNO+5gkurd/ggUl7rE/i7iWqOFhYDbuL1/lQZwwA4/i+6l+be28cak
# Tno9f1aAs0yIyalmJnq/bjdO2jinLl0A7m2t+46sNCc3IlmBYCEbGUy5Tu9OAtEr
# YehscWq+bVt0ghqylI0apP9GsdFQrEDmKhwP71wTjX3+8wXou0YUu7RBFEK7OkUi
# ji8DQ3p+QRJSIdI18sJTNlbjgsFFarRADQzdlZC/spavSBqZk1KcoPrwciu424Iu
# 1wscoBaoWHYbunzSHg5RIJQzw+d/vK5OFbVNeFH2lF7YlntWesWLswOlFXXIbCRG
# xuwKQilyHh+D1j/1pSFmzBc/bPate5970teFGIDhenJqrdQx4CI=
# =dyh8
# -----END PGP SIGNATURE-----
# gpg: directory '/home/runner/.gnupg' created
# gpg: keybox '/home/runner/.gnupg/pubring.kbx' created
# gpg: Signature made Thu Nov  9 13:29:53 2023 UTC
# gpg:                using RSA key FE308073430D658E6DA01B750190A66C0A10FC4F
# gpg: Can't check signature: No public key
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 10, 2023
Copy link

openshift-ci bot commented Nov 10, 2023

Hi @openshift-monitoring-bot[bot]. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@slashpai
Copy link
Member

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 10, 2023
Copy link

openshift-ci bot commented Nov 10, 2023

@openshift-monitoring-bot[bot]: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@simonpasquier
Copy link

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 10, 2023
Copy link

openshift-ci bot commented Nov 10, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-monitoring-bot[bot], simonpasquier

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 10, 2023
@simonpasquier
Copy link

simonpasquier commented Nov 10, 2023

/retitle MON-3479: [bot] Bump openshift/prometheus-operator to v0.69.1

@openshift-ci openshift-ci bot changed the title [bot] Bump openshift/prometheus-operator to v0.69.1 MON-3479: [bot] Bump openshift/prometheus-operator to v0.69.1 Nov 10, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 10, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 10, 2023

@openshift-monitoring-bot[bot]: This pull request references MON-3479 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set.

In response to this:

Description

This is an automated version bump from CI.
If you wish to perform this manually, execute the following commands from openshift/prometheus-operator repo,

git fetch https://github.com/prometheus-operator/prometheus-operator --tags
if ! git merge refs/tags/v0.69.1 --no-edit; then
 git checkout --theirs CHANGELOG.md Documentation VERSION bundle.yaml example go.mod go.sum pkg
 git checkout --ours 
 git add CHANGELOG.md Documentation VERSION bundle.yaml example go.mod go.sum pkg 
 git merge --continue
fi
go mod tidy
go mod vendor

if [ -f scripts/rh-manifest.sh ]; then
 bash scripts/rh-manifest.sh
 git add rh-manifest.txt
 git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt"
fi

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-merge-bot openshift-merge-bot bot merged commit 1f58391 into openshift:master Nov 10, 2023
7 checks passed
@simonpasquier simonpasquier deleted the automated-updates-master branch November 10, 2023 08:33
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build prometheus-operator-container-v4.15.0-202311202349.p0.g1f58391.assembly.stream for distgit prometheus-operator.
All builds following this will include this PR.

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants