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.

Sign up for GitHub

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

Jump to bottom

[release-4.14] OCPBUGS-29604: move azure storage blobs from docker back into /docker #1001

Merged
merged 3 commits into from Feb 21, 2024
Merged

[release-4.14] OCPBUGS-29604: move azure storage blobs from docker back into /docker #1001

merged 3 commits into from Feb 21, 2024

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #1000

/assign flavianmissi

flavianmissi and others added 3 commits February 16, 2024 16:32
@flavianmissi
cmd/move-blobs: add cmd to move blobs from one root dir to another
3696809 
* Dockerfile: add move-blobs binary to image
* cmd/move-blobs: prioritise account key for auth when present
@flavianmissi
cmd/move-blobs: vendor libraries
b8094c8
@dmage
pkg/operator: add AzurePathFix controller to migrate blobs
cc02d79 
this fixes the path bug on the storage level by migrating blobs from the
`docker` virtual directory into the `/docker` virtual directory instead.

* azurepathfix: give job required env vars
* handle different job conditions on azure path fix controller
* azurepathfixjob: set restart policy to never
* azurepathfixjob: export account key from secret
* azurepathfixjob: add azure account key env var to job container
* pass account key to path fix job (this time for reals)
* azurepathfix: only allow new controller to run on Azure
* also mount trusted-ca volume to job so the script works when a
  cluster-wide proxy is in use.
* fix a couple of mispellings
* manifests: export operator image env var to container
* manifests: update generated files
* mount volumes for proxy certs on azure path fix job
* azurepathfixcontroller: return error if account name is not present
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Feb 16, 2024
Merged
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Detected clone of Jira Issue OCPBUGS-29525 with correct target version. Will retitle the PR to link to the clone.
/retitle [release-4.14] OCPBUGS-29604: move azure storage blobs from docker back into /docker

In response to this:

This is an automated cherry-pick of #1000

/assign flavianmissi

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot changed the title [release-4.14] OCPBUGS-29525: move azure storage blobs from docker back into /docker [release-4.14] OCPBUGS-29604: move azure storage blobs from docker back into /docker Feb 16, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Feb 16, 2024
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-29604, which is invalid:

  • expected dependent Jira Issue OCPBUGS-29525 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

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

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This is an automated cherry-pick of #1000

/assign flavianmissi

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 openshift-eng/jira-lifecycle-plugin repository.

@wewang58
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Feb 17, 2024
@flavianmissi
Copy link
Member

/retest

1 similar comment
@flavianmissi
Copy link
Member

/retest

@flavianmissi
Copy link
Member

/hold
we need to wait until we can backport #1003 before merging this.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 19, 2024
@flavianmissi
Copy link
Member

failures seem due to flakes.
/retest

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 19, 2024

@openshift-cherrypick-robot: 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.

@flavianmissi
Copy link
Member

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Feb 21, 2024
@openshift-ci-robot
Copy link
Contributor

@flavianmissi: This pull request references Jira Issue OCPBUGS-29604, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.z) matches configured target version for branch (4.14.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-29525 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-29525 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
  • bug has dependents

Requesting review from QA contact:
/cc @xiuwang

In response to this:

/jira 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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested a review from xiuwang February 21, 2024 09:13
@openshift-ci-robot openshift-ci-robot mentioned this pull request Feb 21, 2024
Merged
@flavianmissi
Copy link
Member

/label backport-risk-assessed
/lgtm

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Feb 21, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 21, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 21, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flavianmissi, openshift-cherrypick-robot

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 Feb 21, 2024
@flavianmissi
Copy link
Member

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 21, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit e39fe6a into openshift:release-4.14 Feb 21, 2024
12 checks passed
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-29604: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-29604 has not been moved to the MODIFIED state.

In response to this:

This is an automated cherry-pick of #1000

/assign flavianmissi

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot mentioned this pull request Feb 21, 2024
Merged
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-cluster-image-registry-operator-container-v4.14.0-202402211310.p0.ge39fe6a.assembly.stream.el8 for distgit ose-cluster-image-registry-operator.
All builds following this will include this PR.

@PratikMahajan PratikMahajan mentioned this pull request Mar 1, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xiuwang xiuwang Awaiting requested review from xiuwang

Assignees

@flavianmissi flavianmissi

@xiuwang xiuwang

@wewang58 wewang58

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@openshift-cherrypick-robot @openshift-ci-robot @wewang58 @flavianmissi @openshift-bot @xiuwang @dmage