Skip to content

Conversation

@gchevalley
Copy link
Contributor

little typo when decoding the kube CA

little typo when decoding the kube CA
@hashicorp-cla
Copy link

hashicorp-cla commented Apr 6, 2020

CLA assistant check
All committers have signed the CLA.

Copy link
Contributor

@tyrannosaurus-becks tyrannosaurus-becks left a comment

Choose a reason for hiding this comment

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

Ah, nice catch! Thank you! :-)

@tyrannosaurus-becks tyrannosaurus-becks merged commit f4d3068 into hashicorp:master Apr 6, 2020
sapk pushed a commit to sapk-fork/vault that referenced this pull request Aug 27, 2025
…hashicorp#8685) (hashicorp#8690)

* VAULT-34830: enable the new workflow (hashicorp#8661)



 Conflicts:
	.github/workflows/merge-oss-ent.yml

* pipeline: various fixes for the cutover to the enterprise first workflow (hashicorp#8686)

Various small fixes that were discovered when doing the cutover to the enterprise first merge workflow:

- The `actions-docker-build` action infers enterprise metadata magically from the repository name. Use a branch that allows configuring the repo name until it's merged upstream.
- Fix some CE-In-Enterprise outputs in our metadata job.
- Pass the recurse depth flag correctly when creating backports
- Set the package name when calling the `build-vault` composite action
- Disallow merging changes into `main` and `release/*` when executing in the `hashicorp/vault` repository. This is a hack until PSS-909 is resolved.
- Use self-hosted runners when testing arm64 CE containers in enterprise.

Signed-off-by: Ryan Cragun <[email protected]>
Co-authored-by: Ryan Cragun <[email protected]>
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