Skip to content

Backport of readd dev image tags for fips ubi into release/1.2.x#3883

Merged
zalimeni merged 1 commit intorelease/1.2.xfrom
backport/readd-dev-fips-ubi/merely-feasible-turkey
Apr 4, 2024
Merged

Backport of readd dev image tags for fips ubi into release/1.2.x#3883
zalimeni merged 1 commit intorelease/1.2.xfrom
backport/readd-dev-fips-ubi/merely-feasible-turkey

Conversation

@hc-github-team-consul-core
Copy link
Copy Markdown
Collaborator

Backport

This PR is auto-generated from #3881 to be assessed for backporting due to the inclusion of the label backport/1.2.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@alvin-huang
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul-k8s/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Changes proposed in this PR

  • readds the docker dev tags were deleted for FIPS UBI docker images in Remove Duplicate UBI Tags #3265. Also corrected the tags because previously they were pushing to consul-k8s-control-plane instead of consul-k8s-control-plane-fips

How I've tested this PR

N/A, the tags were correct previously but were removed.


Overview of commits

@hashicorp-cla-app
Copy link
Copy Markdown

hashicorp-cla-app bot commented Apr 4, 2024

CLA assistant check
All committers have signed the CLA.

@hashicorp-cla-app
Copy link
Copy Markdown

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

@zalimeni zalimeni force-pushed the backport/readd-dev-fips-ubi/merely-feasible-turkey branch from 6225fa3 to 1818553 Compare April 4, 2024 20:33
@zalimeni zalimeni marked this pull request as ready for review April 4, 2024 20:34
@zalimeni zalimeni merged commit d318752 into release/1.2.x Apr 4, 2024
@zalimeni zalimeni deleted the backport/readd-dev-fips-ubi/merely-feasible-turkey branch April 4, 2024 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants