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

Backport of Update Release Scripts into release/1.1.x #2563

Conversation

hc-github-team-consul-core

Backport

This PR is auto-generated from #2558 to be assessed for backporting due to the inclusion of the label backport/1.1.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:
@wilkermichael
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.


NOTE TO REVIEWER: You can go through my PR commit by commit, I've organized changes to be isolated to each commit. You can often get more context from them.

Changes proposed in this PR:

  • update environment variables with CONSUL_K8s prefix. This will let us check that we have all the environment variables set more easily with printenv | grep "CONSUL_K8S"
  • also added a make target that just runs printenv | grep "CONSUL_K8S"
  • update imageConsulDataplane without quotes. This makes it consistent with the other images and allows scripting to work similarly to other images
  • updated utils script
    • handle replace case where consul-enterprise is in the values.yaml file and charts.yaml file
    • handle adding pre-release tag in changelog
    • handle updating consul-dataplane

How I've tested this PR:

  • Ran three scenarios for prepare release/prepare dev scripts
  1. Scenario with a prerelease set (rc1)
  2. Scenario with switching to dev mode
  3. Scenario with release without a prerelease set
  • ran make check-env
$ make check-env      
CONSUL_K8S_RELEASE_BRANCH=release/1.1.0
CONSUL_K8S_PRERELEASE_VERSION=
CONSUL_K8S_CONSUL_VERSION=1.16.0
CONSUL_K8S_CONSUL_DATAPLANE_VERSION=1.2.0
CONSUL_K8S_RELEASE_DATE=September 31, 2022
CONSUL_K8S_NEXT_CONSUL_DATAPLANE_VERSION=1.1.3
CONSUL_K8S_PRODUCT_VERSION=1.1.0
CONSUL_K8S_NEXT_CONSUL_VERSION=1.17.3
CONSUL_K8S_NEXT_RELEASE_VERSION=1.1.6
CONSUL_K8S_RELEASE_VERSION=1.1.0
CONSUL_K8S_LAST_RELEASE_GIT_TAG=v0.48.0

How I expect reviewers to test this PR:

  • I've included the outputs of each scenario in my testing as commits that I'll drop, so check out those commits
  • 👀

Checklist:


Overview of commits

* update environment variables with CONSUL_K8s prefix
- This will let us check that we have all the environment variables set more easily with `printenv | grep "CONSUL_K8S"`

* update imageConsulDataplane without quotes
- this makes it consistent with the other images
- allows scripting to work similarly to other images

* updated utils script
- handle replace case where consul-enterprise is in the values.yaml file and charts.yaml file
- handle adding pre-release tag in changelog
- handle updating consul-dataplane
@wilkermichael wilkermichael force-pushed the backport/mw/update-release-scripts-now/duly-fair-teal branch from eb88c52 to 19aeb05 Compare July 12, 2023 22:03
@wilkermichael wilkermichael marked this pull request as ready for review July 12, 2023 22:10
@wilkermichael wilkermichael enabled auto-merge (squash) July 12, 2023 22:19
@wilkermichael wilkermichael merged commit 4e81137 into release/1.1.x Jul 12, 2023
3 checks passed
@wilkermichael wilkermichael deleted the backport/mw/update-release-scripts-now/duly-fair-teal branch July 12, 2023 22:35
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.

2 participants