Converge local and cloud gorelease scripts, improve release notes #4537

KnVerey · 2022-03-25T18:32:01Z

Re: new release note format

Hopefully this will save us some effort manually identifying PRs! Example:

#4424: Allow setting every array element in replacements
#4497: Fix 3812; Error message changed and check for MalformedYamlError
#4467: fn framework: Enable validation using openAPI schema for functionConfig
#4421: retain quotes in namespace transformer filter
#4383: Fix error during expansion of `!!merge <<:` anchor tags

Re: cloudbuild.sh/localbuild.sh consolidation

The diff of cloudbuild.sh and localbuild.sh on master is:

2a3,4
> # Works exactly like cloudbuild.sh but doesn't perform a release.
> #
5c7
< #  releasing/cloudbuild.sh TAG [--snapshot]
---
> #  releasing/localbuild.sh TAG [--snapshot]
14,17c16
< # Cloud build should be configured to trigger on tags
< # matching:
< #
< #   [\w/]+/v\d+\.\d+\.\d+
---
> # This script runs a build through goreleaser (http://goreleaser.com) but nothing else.
19,20d17
< # This script runs goreleaser (http://goreleaser.com),
< # presumably from a cloudbuild.yaml step that installed it.
122c119
< time /usr/local/bin/goreleaser release \
---
> time /usr/local/bin/goreleaser build \
127d123
<   --release-notes=$changeLogFile \

i.e. the only differences are release vs build and the inclusion of the release notes flag.

k8s-ci-robot · 2022-03-25T18:32:02Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

KnVerey · 2022-03-25T22:52:32Z

releasing/README.md

@@ -141,7 +141,7 @@ go mod edit -require=sigs.k8s.io/kustomize/kyaml@$versionKyaml plugin/builtin/pa

 Create the PR:
 ```
-createBranch pinToKyaml "Pin to kyaml $versionKyaml"
+createBranch pinToKyaml "Update kyaml to $versionKyaml"


We have always been removing these from the release notes, but these are obviously key dependencies, and it could be helpful to show them explicitly so folks can cross-reference the release notes if needed.

natasha41575 · 2022-03-28T17:58:19Z

releasing/README.md


-Visit the [release page] and edit the release notes as desired.
+You can test the release script locally by running [cloudbuild.sh](cloudbuild.sh) in a container or by installing Cloud Build Local and running [cloudbuild-local.sh](cloudbuild-local.sh). See each of those files for more details on their usage.


I tried this, but I couldn't figure out how to set the value of $TAG_NAME. Regardless, it seemed to be running the steps correctly and threw the exact error I expected given an empty $TAG_NAME so I think it does work.

EDIT: This comment refers to cloudbuild-local.sh specifically.

Should just be the first arg, e.g. ./releasing/cloudbuild-local.sh kyaml/v0.13.4

Ah thanks! I missed the comment at the top of cloudbuild-local.sh.

Now I get the output:

ERROR: build step 3 "goreleaser/goreleaser:v0.179.0" failed: Failed to decrypt "GITHUB_TOKEN" using key "projects/k8s-staging-kustomize/locations/global/keyRings/kust-cloud-key-ring/cryptoKeys/kust-cloud-key-name": googleapi: Error 403: Permission 'cloudkms.cryptoKeyVersions.useToDecrypt' denied on resource 'projects/k8s-staging-kustomize/locations/global/keyRings/kust-cloud-key-ring/cryptoKeys/kust-cloud-key-name' (or it may not exist)., forbidden

which I assume is because I don't have keyring decryption permissions on the google cloud project (as expected), so this LGTM.

natasha41575 · 2022-03-28T18:04:59Z

releasing/cloudbuild.sh

-# Cloud build should be configured to trigger on tags
-# matching:
+#   # Run this script in the container, where $TAG is the tag to "release" (e.g. kyaml/v0.13.4)
+#   ./releasing/cloudbuild.sh $TAG --snapshot


Question, I did this with ./releasing/cloudbuild.sh kyaml/v0.13.4 --snapshot, and the output has a bunch of things related to the kustomize module, e.g.

• parsing tag • DEPRECATED: 'kustomize/v4.5.3' is not SemVer-compatible and may cause other issues in the pipeline, check https://goreleaser.com/deprecations#skipping-semver-validations for more info

and

• github/gitlab/gitea releases • pre-release for tag kustomize/v4.5.3 set to false

is that expected? I would have expected it to only have output related to the kyaml module.

Surprising indeed, though not a new problem with the script. I discovered and added the GORELEASER_CURRENT_TAG env var to fix this.

natasha41575 · 2022-03-28T18:06:46Z

releasing/compile-changelog.sh

+#   kustomize/v1.2.3
+#   cmd/config/v1.2.3
+#   ... etc.
+#


This one worked for me!

natasha41575 · 2022-03-28T18:25:31Z

releasing/run-goreleaser.sh

 #
 # Usage (from top of repo):
 #
-#  releasing/localbuild.sh TAG [--snapshot]
+#  releasing/run-goreleaser.sh TAG MODE[build|release] [--snapshot]


same question here as https://github.com/kubernetes-sigs/kustomize/pull/4537/files#r836707396

Both resolved by L31 below

k8s-ci-robot · 2022-03-28T19:12:28Z

@KnVerey: This PR has multiple commits, and the default merge method is: merge.
You can request commits to be squashed using the label: tide/merge-method-squash

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.

KnVerey · 2022-03-28T19:15:00Z

releasing/cloudbuild-local.sh

@@ -27,7 +27,7 @@ cp releasing/cloudbuild.yaml $config
 # Add the --snapshot flag to suppress the
 # github release and leave the build output
 # in the kustomize/dist directory.
-sed -i "s|# - '--snapshot|- '--snapshot|" $config
+sed -i "" "s|# - '--snapshot|- '--snapshot|" $config


This is a linux vs mac sed difference. Both active maintainers currently use macs.

natasha41575 · 2022-03-28T20:12:35Z

releasing/cloudbuild.yaml

+  args:
+  - 'cp'
+  - '$(go env GOROOT)/bin/go'
+  - '/workspace/bin/'


Getting this error

$ ./releasing/cloudbuild-local.sh kyaml/v0.13.4 ... Step #3: cp: can't stat '$(go env GOROOT)/bin/go': No such file or directory

natasha41575 · 2022-03-28T20:30:29Z

/lgtm
/approve

k8s-ci-robot · 2022-03-28T20:30:42Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: KnVerey, natasha41575

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:

~~OWNERS~~ [KnVerey,natasha41575]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

natasha41575 · 2022-03-28T20:35:56Z

/hold

k8s-ci-robot requested review from natasha41575 and yuwenma March 25, 2022 18:32

KnVerey force-pushed the release-updates branch from 2699944 to ff7ea61 Compare March 25, 2022 22:50

KnVerey commented Mar 25, 2022

View reviewed changes

KnVerey marked this pull request as ready for review March 25, 2022 22:53

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 25, 2022

KnVerey force-pushed the release-updates branch 2 times, most recently from a8a86fd to 9b8bc00 Compare March 28, 2022 16:52

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 28, 2022

Converge local and cloud gorelease scripts, improve release notes

e86c479

KnVerey force-pushed the release-updates branch from 9b8bc00 to e86c479 Compare March 28, 2022 17:43

natasha41575 reviewed Mar 28, 2022

View reviewed changes

releasing/compile-changelog.sh

# kustomize/v1.2.3

# cmd/config/v1.2.3

# ... etc.

#

Copy link

Contributor

natasha41575 Mar 28, 2022

Choose a reason for hiding this comment

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

This one worked for me!

natasha41575 reviewed Mar 28, 2022

View reviewed changes

Make Goreleaser use the tag passed to the script

5833f4c

k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 28, 2022

KnVerey commented Mar 28, 2022

View reviewed changes

natasha41575 reviewed Mar 28, 2022

View reviewed changes

Copy newer Go into goreleaser image

9e57ab7

KnVerey force-pushed the release-updates branch from af7313f to 9e57ab7 Compare March 28, 2022 20:29

k8s-ci-robot assigned natasha41575 Mar 28, 2022

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 28, 2022

k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Mar 28, 2022

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 28, 2022

natasha41575 removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 28, 2022

natasha41575 merged commit 485f7d4 into kubernetes-sigs:master Mar 28, 2022

KnVerey mentioned this pull request Jul 12, 2022

Release automation #3952

Open

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Converge local and cloud gorelease scripts, improve release notes #4537

Converge local and cloud gorelease scripts, improve release notes #4537

KnVerey commented Mar 25, 2022 •

edited

Loading

k8s-ci-robot commented Mar 25, 2022

KnVerey Mar 25, 2022

natasha41575 Mar 28, 2022 •

edited

Loading

KnVerey Mar 28, 2022

natasha41575 Mar 28, 2022

natasha41575 Mar 28, 2022 •

edited

Loading

KnVerey Mar 28, 2022

natasha41575 Mar 28, 2022

natasha41575 Mar 28, 2022

KnVerey Mar 28, 2022

k8s-ci-robot commented Mar 28, 2022

KnVerey Mar 28, 2022

natasha41575 Mar 28, 2022

natasha41575 commented Mar 28, 2022

k8s-ci-robot commented Mar 28, 2022

natasha41575 commented Mar 28, 2022


		Visit the [release page] and edit the release notes as desired.
		You can test the release script locally by running [cloudbuild.sh](cloudbuild.sh) in a container or by installing Cloud Build Local and running [cloudbuild-local.sh](cloudbuild-local.sh). See each of those files for more details on their usage.

Converge local and cloud gorelease scripts, improve release notes #4537

Converge local and cloud gorelease scripts, improve release notes #4537

Conversation

KnVerey commented Mar 25, 2022 • edited Loading

Re: new release note format

Re: cloudbuild.sh/localbuild.sh consolidation

k8s-ci-robot commented Mar 25, 2022

Choose a reason for hiding this comment

natasha41575 Mar 28, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

natasha41575 Mar 28, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

k8s-ci-robot commented Mar 28, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

natasha41575 commented Mar 28, 2022

k8s-ci-robot commented Mar 28, 2022

natasha41575 commented Mar 28, 2022

KnVerey commented Mar 25, 2022 •

edited

Loading

natasha41575 Mar 28, 2022 •

edited

Loading

natasha41575 Mar 28, 2022 •

edited

Loading