diff --git a/docs/governance/templates/release_issue.md b/docs/governance/templates/release_issue.md index 1bdea94657..148697b5bd 100644 --- a/docs/governance/templates/release_issue.md +++ b/docs/governance/templates/release_issue.md @@ -30,7 +30,7 @@ and copy it into a release issue. Fill in relevent values, found inside {} - [ ] Copy the draft release content into a new `/site/content/en/blog/releases` content (this will be what you send via email). - [ ] Create PR with these changes, and merge them with approval - [ ] Confirm local git remote `upstream` points at `git@github.com:GoogleCloudPlatform/agones.git` -- [ ] Run `git remote update && git checkout master && git reset --hard upstream/master` to ensure your code is in line with upstream (unless this is a hotfix, then do the same, but for the the release branch) +- [ ] Run `git remote update && git checkout master && git reset --hard upstream/master` to ensure your code is in line with upstream (unless this is a hotfix, then do the same, but for the release branch) - [ ] Run `make do-release`. (if release candidate: `make do-release RELEASE_VERSION={version}-rc`) to create and push the docker images and helm chart. - [ ] Do a `helm repo add agones https://agones.dev/chart/stable` and verify that the new version is available via the command `helm search agones/` - [ ] Do a `helm install` and a smoke test to confirm everything is working. @@ -49,4 +49,4 @@ and copy it into a release issue. Fill in relevent values, found inside {} [chart]: https://github.com/GoogleCloudPlatform/agones/blob/master/install/helm/agones/Chart.yaml [list]: https://groups.google.com/forum/#!forum/agones-discuss [release-template]: https://github.com/GoogleCloudPlatform/agones/blob/master/docs/governance/templates/release.md -[build-makefile]: https://github.com/GoogleCloudPlatform/agones/blob/master/build/Makefile \ No newline at end of file +[build-makefile]: https://github.com/GoogleCloudPlatform/agones/blob/master/build/Makefile diff --git a/pkg/apis/stable/v1alpha1/gameserverallocation.go b/pkg/apis/stable/v1alpha1/gameserverallocation.go index b64079e1ad..7662f5ab66 100644 --- a/pkg/apis/stable/v1alpha1/gameserverallocation.go +++ b/pkg/apis/stable/v1alpha1/gameserverallocation.go @@ -74,7 +74,7 @@ type GameServerAllocationSpec struct { MetaPatch MetaPatch `json:"metadata,omitempty"` } -// PreferredSelectors converts all the the preferred label selectors into an array of +// PreferredSelectors converts all the preferred label selectors into an array of // labels.Selectors. This is useful as they all have `Match()` functions! func (gsas *GameServerAllocationSpec) PreferredSelectors() ([]labels.Selector, error) { list := make([]labels.Selector, len(gsas.Preferred))