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

Slack vitess r14.0.5 go1.19.10 upgrade #129

Merged
merged 8 commits into from
Sep 18, 2023

Conversation

maksimov
Copy link
Collaborator

Description

Cherry-picking #91 out of slack-vitess-r14.0.5-dsdefense branch. The change upgrades Go 1.18.3 to 1.19.10

Related Issue(s)

Checklist

  • "Backport to:" labels have been added if this change should be back-ported
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on the CI
  • Documentation was added or is not required

Deployment Notes

maksimov and others added 4 commits September 13, 2023 17:57
* Cleanup usage of go.rice in favor of go:embed (vitessio#10956)

* Cleanup usage of go.rice in favor of go:embed

The usage of go.rice predates the availability of go:embed, but we
should switch to using go:embed instead to ship specific assets like
config files that we need.

go.rice is also incompatible with Go 1.19 and while it might see a fix
in the future, it seems better to go with the recommended Go approach
that is available these days.

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

* Move vtctld to also use `go embed` instead of go.rice

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

* Remove last rice-box related comments

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

* Remove config moving

This right now breaks building the actual tests since the tests might
also end up loading the regular code which has a `go embed` and refers
to the package with the config embeds.

This doesn't mean that the config isn't properly included in the
binaries. Also with using `go embed` we have a build time dependency on
the files and we always know the latest is included, so we don't have
the issue of potentially outdated files either.

All in all, it seems simplest to remove this logic and trust that Go
itself works as advertised.

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

* fix vtrootbin

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the build to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the workflows to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the docker image to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the bootstrap version to get docker to go 1.20.5

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* use 1.18.7 for static checks

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* lower the build version requirement to allow static checks to pass

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* experiment with using old and new Go for a single workflow

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* use old and new Go for a upgrade/downgrade workflows

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* set -buildvcs=false

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* address build errors

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* Revert "fix parameter name (#93)" (#100)

This reverts commit 76159fd.

* apply patch 12178 to v14 (#102)

Signed-off-by: Priya Bibra <pbibra@slack-corp.com>
Signed-off-by: 'Priya Bibra' <pbibra@slack-corp.com>

* more workflows to use self-hosted runner

* even more workflows to use self-hosted runner

* partially switch upgrade-downgrade to self-hosted runner

* Ejortegau/larger runners (#115)

* Empty commit to trigger CI

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

* `slack-vitess-r14.0.5-dsdefense`: use larger runner

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Use runner group instead

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Rename group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Move more jobs to runner group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* use vitess-ubuntu20 runner group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Rever change of runner type for e2e ERS PRS new features heavy test

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

---------

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Revert change of runner type for shardedrecovery_stress_verticalsplit_heavy. (#116)

We do this because the test is taking a lot longer & failing in some cases with
the larger runner.

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

* `slack-vitess-r14.0.5`: use dedicated larger runner (#113)

* `slack-vitess-r14.0.5`: use dedicated larger runner

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* fix fileNameFromPosition

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* empty commit

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* empty commit

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* `slack-vitess-r14.0.5`: allow conn overrides in consul topo (#111)

* `slack-vitess-r14.0.5`: allow conn overrides in consul topo

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* fix e2e test

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
Signed-off-by: Priya Bibra <pbibra@slack-corp.com>
Signed-off-by: 'Priya Bibra' <pbibra@slack-corp.com>
Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: Dirkjan Bussink <d.bussink@gmail.com>
Co-authored-by: Roderick Yao <roderick.yao@slack-corp.com>
Co-authored-by: pbibra <pbibra@slack-corp.com>
Co-authored-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>
* Cleanup usage of go.rice in favor of go:embed (vitessio#10956)

* Cleanup usage of go.rice in favor of go:embed

The usage of go.rice predates the availability of go:embed, but we
should switch to using go:embed instead to ship specific assets like
config files that we need.

go.rice is also incompatible with Go 1.19 and while it might see a fix
in the future, it seems better to go with the recommended Go approach
that is available these days.

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

* Move vtctld to also use `go embed` instead of go.rice

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

* Remove last rice-box related comments

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

* Remove config moving

This right now breaks building the actual tests since the tests might
also end up loading the regular code which has a `go embed` and refers
to the package with the config embeds.

This doesn't mean that the config isn't properly included in the
binaries. Also with using `go embed` we have a build time dependency on
the files and we always know the latest is included, so we don't have
the issue of potentially outdated files either.

All in all, it seems simplest to remove this logic and trust that Go
itself works as advertised.

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

* fix vtrootbin

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the build to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the workflows to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the docker image to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the bootstrap version to get docker to go 1.20.5

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* use 1.18.7 for static checks

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* lower the build version requirement to allow static checks to pass

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* experiment with using old and new Go for a single workflow

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* use old and new Go for a upgrade/downgrade workflows

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* set -buildvcs=false

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* address build errors

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* Revert "fix parameter name (#93)" (#100)

This reverts commit 76159fd.

* apply patch 12178 to v14 (#102)

Signed-off-by: Priya Bibra <pbibra@slack-corp.com>
Signed-off-by: 'Priya Bibra' <pbibra@slack-corp.com>

* more workflows to use self-hosted runner

* even more workflows to use self-hosted runner

* partially switch upgrade-downgrade to self-hosted runner

* Ejortegau/larger runners (#115)

* Empty commit to trigger CI

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

* `slack-vitess-r14.0.5-dsdefense`: use larger runner

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Use runner group instead

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Rename group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Move more jobs to runner group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* use vitess-ubuntu20 runner group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Rever change of runner type for e2e ERS PRS new features heavy test

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

---------

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Revert change of runner type for shardedrecovery_stress_verticalsplit_heavy. (#116)

We do this because the test is taking a lot longer & failing in some cases with
the larger runner.

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

* `slack-vitess-r14.0.5`: use dedicated larger runner (#113)

* `slack-vitess-r14.0.5`: use dedicated larger runner

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* fix fileNameFromPosition

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* empty commit

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* empty commit

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* `slack-vitess-r14.0.5`: allow conn overrides in consul topo (#111)

* `slack-vitess-r14.0.5`: allow conn overrides in consul topo

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* fix e2e test

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
Signed-off-by: Priya Bibra <pbibra@slack-corp.com>
Signed-off-by: 'Priya Bibra' <pbibra@slack-corp.com>
Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: Dirkjan Bussink <d.bussink@gmail.com>
Co-authored-by: Roderick Yao <roderick.yao@slack-corp.com>
Co-authored-by: pbibra <pbibra@slack-corp.com>
Co-authored-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>
…lackhq/vitess into slack-vitess-r14.0.5-go1.19.10-upgrade
@maksimov maksimov requested a review from a team as a code owner September 13, 2023 17:09
@maksimov maksimov merged commit 9a0efbc into slack-vitess-r14.0.5 Sep 18, 2023
243 checks passed
@maksimov maksimov deleted the slack-vitess-r14.0.5-go1.19.10-upgrade branch September 22, 2023 17:08
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