[VC-45002] Upgrade makefile modules to the latest version #717
Conversation
.github/workflows/govulncheck.yaml
Outdated
| runs-on: ubuntu-latest | ||
|
|
||
| if: github.repository_owner == 'jetstack' | ||
| if: github.repository == 'jetstack/preflight' |
There was a problem hiding this comment.
This is the old name of this repo. It was renamed some years ago and GitHub provide a redirect....but I don't think this check is going to work.
There was a problem hiding this comment.
I updated the repo_name variable in 00_make file and ran make generate to change this.
| # Without this hack, golangci-lint will complain that the | ||
| # github.com/jetstack/preflight imports should be grouped with all the other | ||
| # third-party modules. | ||
| generate-golangci-lint-config: repo_name := github.com/jetstack/preflight |
There was a problem hiding this comment.
The change to the repo_name should help the new github actions workflows to run, but caused a problem with the golangci-lint (gci) import grouping which also relies on that variable.
The hack above uses the old value for generating the golangci-lint config.
| echo "This workflow should not be run on a non-branch-head." | ||
| exit 1 | ||
| - name: Octo STS Token Exchange |
There was a problem hiding this comment.
@wallrj-cyberark will we enable Octo STS in the jetstack repo too?
There was a problem hiding this comment.
I don't know 😬 would it work? Is it easy to do?
There was a problem hiding this comment.
We just have to add it as a github app afaik.
But you need to be admin in the jetstack org to do that...
I asked on teams.
There was a problem hiding this comment.
Thanks. Then I'll merge it and pick your brains about the Octo STS app in teams.
- Ran make upgrade-klone - Removed the boilerplate module because none of the files currently have the header - Ran make generate-base Signed-off-by: Richard Wall <richard.wall@cyberark.com>
pkg/logs/logs_test.go:270:23: os/exec.Command must not be called. use os/exec.CommandContext (noctx) cmd := exec.Command(os.Args[0], "-test.run=^TestLogs$", "-test.v") Signed-off-by: Richard Wall <richard.wall@cyberark.com>
Signed-off-by: Richard Wall <richard.wall@cyberark.com>
Signed-off-by: Richard Wall <richard.wall@cyberark.com>
…flow Signed-off-by: Richard Wall <richard.wall@cyberark.com>
…nfig - Change gci import prefix to github.com/jetstack/preflight in .golangci.yaml - Add makefile hack to set repo_name for golangci-lint config generation - Document workaround until go module can be renamed Signed-off-by: Richard Wall <richard.wall@cyberark.com>
wallrj-cyberark
force-pushed
the
klone_upgrade_2
branch
from
ea6975b to
71c9cbc
Compare
wallrj-cyberark
changed the title
Supplants #635
Upgrade makefile modules to the latest version. Why? Because I want to build venafi-kubernetes-agent and cyberark-disco-agent with the latest version of Go and with up to date versions of all the build tools.
All the other changes around dependabot / renovate are side effects of the
make upgrade-klonecommand.There's so much new stuff in makefile-modules, related to renovate and the use of chainguard STS....I have no idea whether it's going to work in this repo....and I can't think of an easy way to test it before merging this....so I propose merging it and fixing any problems as they arise.
Testing
I ran
make ark-test-e2ebecause it is not run by GitHub Actions. It invokes the newmake ark-releaseand uses some of the new versions of the tools to build and test the agent in a local dev environment. Output elided for brevity.{ "ts": ..., "caller": "agent/run.go:58", "msg": "Starting", "version": "v1.6.0-73-<redacted>", "commit": "<redacted>" } { "ts": ..., "caller": "identity/identity.go:402", "msg": "successfully completed AdvanceAuthentication request to CyberArk Identity; login complete", "username": "<redacted>@cyberark.cloud.<redacted>" } {"ts":...,"caller":"agent/run.go:417","msg":"Data sent successfully"}