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

[NET-5619] ci: Single source of truth for Go version in CI and Dockerfile #20058

Merged
merged 1 commit into from
Jan 8, 2024

Conversation

zalimeni
Copy link
Member

@zalimeni zalimeni commented Dec 22, 2023

Description

To simplify Go version management and enable simpler conflict-less (CE + Ent) upgrades in the future, move all Go version management for CI, Docker builds, and related tooling to a single source of truth.

To do this, introduce a new .go-version file and reusable workflow to read it that all jobs using setup-go can depend on. Having a separate reusable job allows multiple dependent jobs to use the version after it's determined once. It also enables us to centralize control over the version in our own CI config rather than depending on the behavior of setup-go or other imported actions (see more below).

Make all reusable workflows require a Go version as input s.t. we can ensure it is always provided.

Rationale

We have two needs for our CI when it comes to Go versions:

  • Using the most current version of Go that we support to take advantage of security patches and bugfixes. This should apply to our produced binaries and Docker containers at minimum; it should also apply to most tests to keep in sync w/ binaries and local dev.
  • Proving backwards compatibility w/ our indicated minimum-required version; this primarily impacts consumers of our submodules and mitigates the risk of backwards-incompatible changes to repository code (e.g. using a new std lib function). This is accomplished by version-specific tests such as this for our published submodules.

When we upgrade to Go 1.21, we'll have the new toolchain directive available in addition to the go directive. More on how these work here; the salient point is that Go now attempts to install the correct toolchain for us when we update the go or toolchain directive and the local version of Go does not satisfy those versions. It also means that the go directive provides an enforced minimum version, not the suggested one.

However, this presents some rough edges in CI:

  • setup-go does not yet support toolchain detection (see also Tar errors on cache restore after toolchain installation actions/setup-go#424)
  • We don't want to install Go twice in every job due to a mismatch between the version installed by setup-go and the one required locally; this sort of mistake would be easy to overlook
  • In addition to setup-go, we rely on hashicorp/action-go-build to produce binaries, which has a required input for the Go version that is not managed by setup-go; managing this separately from setup-go runs the risk of error when changing Go versions

Given these constraints, and the clarity provided by setting essential versions explicitly to avoid confusion or side-effect mistakes, this change proposes enforcing a consistently installed Go version throughout our workflows, still allowing for explicit overrides where we need a different version. It's easy to reverse if we want to go back to individual go-version-file declarations.

Futures

My hope is that we can move to calling go version to retrieve the toolchain version provided in Go 1.21+, as well as introduce a versioned go.work in the near future (which will bring several benefits, including removing submodule replaces, explicitly setting Go version via a single toolchain directive). The current change allows us to control the version from a single source of truth in CI, which is beneficial regardless of Go-native toolchain management changes in the future.

Testing & Reproduction steps

  • CI continues to pass.
  • Overrides for backwards compatibility tests still result in the desired version: Go 1.19 api and sdk tests
  • Checked for missed updates (explicit Go versions are backwards compatibility tests noted above):
rg -t yaml 'go-version-file:' -B1
test-integrations.yml
101-          # Do not explicitly set Go version here, as it should depend on what Nomad declares.
102:          go-version-file: 'go.mod'
--
184-          # Do not explicitly set Go version here, as it should depend on what Vault declares.
185:          go-version-file: 'go.mod'

rg -t yaml 'go-version: ' | grep -v 'needs.get-go-version' | grep -v 'inputs.go-version'
go-tests.yml:      go-version: "1.19"
go-tests.yml:      go-version: "1.20"
go-tests.yml:      go-version: "1.19"
go-tests.yml:      go-version: "1.20"
reusable-get-go-version.yml:      go-version: ${{ steps.get-go-version.outputs.go-version }}

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

@zalimeni zalimeni added pr/no-changelog PR does not need a corresponding .changelog entry backport/1.15 This release series is no longer active on CE. Use backport/ent/1.15. backport/1.16 This release series is no longer active on CE. Use backport/ent/1.16. backport/1.17 This release series is no longer active on CE. Use backport/ent/1.17. labels Dec 22, 2023
@github-actions github-actions bot added type/ci Relating to continuous integration (CI) tooling for testing or releases theme/contributing Additions and enhancements to community contributing materials labels Dec 22, 2023
@zalimeni zalimeni force-pushed the zalimeni/use-go-version-file branch 6 times, most recently from 35f9114 to 01567a7 Compare December 22, 2023 21:07
@zalimeni zalimeni force-pushed the zalimeni/use-go-version-file branch 4 times, most recently from d02fcc3 to 9379260 Compare January 3, 2024 17:18
@zalimeni zalimeni changed the title ci: Set Go version consistently via .go-version ci: Set Go version consistently Jan 3, 2024
@zalimeni zalimeni changed the title ci: Set Go version consistently ci: Use single source of truth for Go version in CI and Dockerfile Jan 3, 2024
@zalimeni zalimeni changed the title ci: Use single source of truth for Go version in CI and Dockerfile ci: Single source of truth for Go version in CI and Dockerfile Jan 3, 2024
@zalimeni zalimeni mentioned this pull request Jan 3, 2024
4 tasks
@zalimeni zalimeni marked this pull request as ready for review January 3, 2024 21:12
@zalimeni zalimeni requested a review from a team January 3, 2024 21:12
@zalimeni zalimeni requested a review from a team as a code owner January 3, 2024 21:12
@zalimeni zalimeni requested review from claire-labry and randyhdev and removed request for a team January 3, 2024 21:12
Ensure Go version is determined consistently for CI and Docker builds
rather than spread across several different files.

The intent is to eventually replace this with use of the `toolchain`
directive in Go 1.21.
@zalimeni zalimeni force-pushed the zalimeni/use-go-version-file branch from 9379260 to ea888cd Compare January 3, 2024 21:13
@zalimeni
Copy link
Member Author

zalimeni commented Jan 3, 2024

Just to note, backports will probably end up being semi-manual for this change; I've labeled the PR to reflect the intended backports for now.

Copy link
Contributor

@wilkermichael wilkermichael left a comment

Choose a reason for hiding this comment

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

This is a great quality of life change @zalimeni! This will make things much easier going forward. Thanks for the well thought out breakdown of the work and future considerations as well!

@@ -91,6 +97,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
with:
# Do not explicitly set Go version here, as it should depend on what Nomad declares.
Copy link
Contributor

Choose a reason for hiding this comment

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

👨‍🍳

zalimeni added a commit to hashicorp/consul-dataplane that referenced this pull request Jan 5, 2024
Ensure Go version is determined consistently for CI and Docker builds
rather than spread across several different files.

The intent is to eventually replace this with use of the `toolchain`
directive in Go 1.21.

c.f. hashicorp/consul#20058
zalimeni added a commit to hashicorp/consul-k8s that referenced this pull request Jan 5, 2024
Ensure Go version is determined consistently for CI and Docker builds
rather than spread across several different files.

The intent is to eventually replace this with use of the `toolchain`
directive in Go 1.21.

c.f. hashicorp/consul#20058
zalimeni added a commit to hashicorp/consul-k8s that referenced this pull request Jan 5, 2024
Ensure Go version is determined consistently for CI and Docker builds
rather than spread across several different files.

The intent is to eventually replace this with use of the `toolchain`
directive in Go 1.21.

c.f. hashicorp/consul#20058
@curtbushko curtbushko self-requested a review January 8, 2024 15:12
Copy link
Contributor

@curtbushko curtbushko left a comment

Choose a reason for hiding this comment

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

Awesome! It is these sorts of 'little' changes that just chip away at making all things easier.

Thanks so much for taking this on!

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

@zalimeni, a backport is missing for this PR [20058] for versions [1.15,1.16,1.17] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

zalimeni added a commit that referenced this pull request Jan 9, 2024
While we defer to other projects w.r.t. how they are built, we should
run our tests (and Consul code) using the current latest version we
declare.

Follow-up to #20058.
@hc-github-team-consul-core
Copy link
Collaborator

@zalimeni, a backport is missing for this PR [20058] for versions [1.15,1.16,1.17] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

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

@zalimeni, a backport is missing for this PR [20058] for versions [1.15,1.16,1.17] please perform the backport manually and add the following snippet to your backport PR description:

<details>
	<summary> Overview of commits </summary>
		- <<backport commit 1>>
		- <<backport commit 2>>
		...
</details>

zalimeni added a commit that referenced this pull request Jan 16, 2024
Unlike the Nomad tests (where Nomad is compiled from source and provides
the tests), Vault is installed as a binary, and local Consul tests are
run.

Fixes incorrect version change introduced in #20058.
zalimeni added a commit that referenced this pull request Jan 16, 2024
Unlike the Nomad tests (where Nomad is compiled from source and provides
the tests), Vault is installed as a binary, and local Consul tests are
run.

Fixes incorrect version change introduced in #20058.
zalimeni added a commit that referenced this pull request Jan 16, 2024
Unlike the Nomad tests (where Nomad is compiled from source and provides
the tests), Vault is installed as a binary, and local Consul tests are
run.

Fixes incorrect version change introduced in #20058.
@zalimeni zalimeni changed the title ci: Single source of truth for Go version in CI and Dockerfile [NET-5619] ci: Single source of truth for Go version in CI and Dockerfile Feb 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.15 This release series is no longer active on CE. Use backport/ent/1.15. backport/1.16 This release series is no longer active on CE. Use backport/ent/1.16. backport/1.17 This release series is no longer active on CE. Use backport/ent/1.17. pr/no-changelog PR does not need a corresponding .changelog entry theme/contributing Additions and enhancements to community contributing materials type/ci Relating to continuous integration (CI) tooling for testing or releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants