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

Commits on Sep 13, 2023

  1. Upgrade go slack vitess r14.0.5 (#91)

    * 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 <[email protected]>
    
    * Move vtctld to also use `go embed` instead of go.rice
    
    Signed-off-by: Dirkjan Bussink <[email protected]>
    
    * Remove last rice-box related comments
    
    Signed-off-by: Dirkjan Bussink <[email protected]>
    
    * 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 <[email protected]>
    
    * fix vtrootbin
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * update the build to 1.19.10
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * update the workflows to 1.19.10
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * update the docker image to 1.19.10
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * update the bootstrap version to get docker to go 1.20.5
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * use 1.18.7 for static checks
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * lower the build version requirement to allow static checks to pass
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * experiment with using old and new Go for a single workflow
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * use old and new Go for a upgrade/downgrade workflows
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * set -buildvcs=false
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * address build errors
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * Revert "fix parameter name (#93)" (#100)
    
    This reverts commit 76159fd.
    
    * apply patch 12178 to v14 (#102)
    
    Signed-off-by: Priya Bibra <[email protected]>
    Signed-off-by: 'Priya Bibra' <[email protected]>
    
    * 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 <[email protected]>
    
    * `slack-vitess-r14.0.5-dsdefense`: use larger runner
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    * Use runner group instead
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    * Rename group
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    * Move more jobs to runner group
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    * use vitess-ubuntu20 runner group
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    * Rever change of runner type for e2e ERS PRS new features heavy test
    
    Signed-off-by: Eduardo J. Ortega U <[email protected]>
    
    ---------
    
    Signed-off-by: Eduardo J. Ortega U <[email protected]>
    Signed-off-by: Tim Vaillancourt <[email protected]>
    Co-authored-by: Tim Vaillancourt <[email protected]>
    
    * 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 <[email protected]>
    
    * `slack-vitess-r14.0.5`: use dedicated larger runner (#113)
    
    * `slack-vitess-r14.0.5`: use dedicated larger runner
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    * fix fileNameFromPosition
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    * empty commit
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    * empty commit
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    ---------
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    * `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 <[email protected]>
    
    * fix e2e test
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    ---------
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    ---------
    
    Signed-off-by: Dirkjan Bussink <[email protected]>
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    Signed-off-by: Priya Bibra <[email protected]>
    Signed-off-by: 'Priya Bibra' <[email protected]>
    Signed-off-by: Eduardo J. Ortega U <[email protected]>
    Signed-off-by: Tim Vaillancourt <[email protected]>
    Co-authored-by: Dirkjan Bussink <[email protected]>
    Co-authored-by: Roderick Yao <[email protected]>
    Co-authored-by: pbibra <[email protected]>
    Co-authored-by: Eduardo J. Ortega U <[email protected]>
    Co-authored-by: Tim Vaillancourt <[email protected]>
    6 people committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    ad7d8c8 View commit details
    Browse the repository at this point in the history
  2. Upgrade go slack vitess r14.0.5 (#91)

    * 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 <[email protected]>
    
    * Move vtctld to also use `go embed` instead of go.rice
    
    Signed-off-by: Dirkjan Bussink <[email protected]>
    
    * Remove last rice-box related comments
    
    Signed-off-by: Dirkjan Bussink <[email protected]>
    
    * 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 <[email protected]>
    
    * fix vtrootbin
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * update the build to 1.19.10
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * update the workflows to 1.19.10
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * update the docker image to 1.19.10
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * update the bootstrap version to get docker to go 1.20.5
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * use 1.18.7 for static checks
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * lower the build version requirement to allow static checks to pass
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * experiment with using old and new Go for a single workflow
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * use old and new Go for a upgrade/downgrade workflows
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * set -buildvcs=false
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * address build errors
    
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    
    * Revert "fix parameter name (#93)" (#100)
    
    This reverts commit 76159fd.
    
    * apply patch 12178 to v14 (#102)
    
    Signed-off-by: Priya Bibra <[email protected]>
    Signed-off-by: 'Priya Bibra' <[email protected]>
    
    * 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 <[email protected]>
    
    * `slack-vitess-r14.0.5-dsdefense`: use larger runner
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    * Use runner group instead
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    * Rename group
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    * Move more jobs to runner group
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    * use vitess-ubuntu20 runner group
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    * Rever change of runner type for e2e ERS PRS new features heavy test
    
    Signed-off-by: Eduardo J. Ortega U <[email protected]>
    
    ---------
    
    Signed-off-by: Eduardo J. Ortega U <[email protected]>
    Signed-off-by: Tim Vaillancourt <[email protected]>
    Co-authored-by: Tim Vaillancourt <[email protected]>
    
    * 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 <[email protected]>
    
    * `slack-vitess-r14.0.5`: use dedicated larger runner (#113)
    
    * `slack-vitess-r14.0.5`: use dedicated larger runner
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    * fix fileNameFromPosition
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    * empty commit
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    * empty commit
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    ---------
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    * `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 <[email protected]>
    
    * fix e2e test
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    ---------
    
    Signed-off-by: Tim Vaillancourt <[email protected]>
    
    ---------
    
    Signed-off-by: Dirkjan Bussink <[email protected]>
    Signed-off-by: 'Stanislav Maksimov' <[email protected]>
    Signed-off-by: Priya Bibra <[email protected]>
    Signed-off-by: 'Priya Bibra' <[email protected]>
    Signed-off-by: Eduardo J. Ortega U <[email protected]>
    Signed-off-by: Tim Vaillancourt <[email protected]>
    Co-authored-by: Dirkjan Bussink <[email protected]>
    Co-authored-by: Roderick Yao <[email protected]>
    Co-authored-by: pbibra <[email protected]>
    Co-authored-by: Eduardo J. Ortega U <[email protected]>
    Co-authored-by: Tim Vaillancourt <[email protected]>
    6 people committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    0fa0baa View commit details
    Browse the repository at this point in the history
  3. Merge branch 'slack-vitess-r14.0.5-go1.19.10-upgrade' of github.com:s…

    …lackhq/vitess into slack-vitess-r14.0.5-go1.19.10-upgrade
    maksimov committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    167fd5d View commit details
    Browse the repository at this point in the history
  4. Cleaning up bad merge

    maksimov committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    e84e50a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    bf1c7b6 View commit details
    Browse the repository at this point in the history
  6. Fixing the build cmds

    maksimov committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    086b3c9 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'slack-vitess-r14.0.5-go1.19.10-upgrade' of github.com:s…

    …lackhq/vitess into slack-vitess-r14.0.5-go1.19.10-upgrade
    maksimov committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    51a17e0 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2023

  1. Configuration menu
    Copy the full SHA
    4f33744 View commit details
    Browse the repository at this point in the history