diff --git a/README.md b/README.md
index e5416857bc844be1c965efa64ca982e786797812..7a873b3407395106bfc93044d598ff304c875db4 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Agon
+# Agones
-Agon is a library for running dedicated game servers on [Kubernetes](https://kubernetes.io).
+Agones is a library for running dedicated game servers on [Kubernetes](https://kubernetes.io).
## Disclaimer
This software is currently alpha, and subject to change. Not to be used in production systems.
@@ -8,7 +8,7 @@ This software is currently alpha, and subject to change. Not to be used in produ
## Major Features
- Be able to define a `GameServer` within Kubernetes - either through yaml or the via API
- Manage GameServer lifecycles - including health checking and connection information.
-- Client SDKs for integration with dedicated game servers to work with Agon.
+- Client SDKs for integration with dedicated game servers to work with Agones.
## Requirements
- Requires a Kubernetes cluster of version 1.8+
@@ -21,12 +21,12 @@ This software is currently alpha, and subject to change. Not to be used in produ
If you are running your own Docker repository or want to install a specific version, make a local copy of install.yaml
and edit to match your settings.
-_Note:_ There has yet to be a release of Agon, so you will need to edit the `install.yaml` to specify a
+_Note:_ There has yet to be a release of Agones, so you will need to edit the `install.yaml` to specify a
development release or [build from source](build/README.md)
## Usage
-Documentation and usage guides on how to develop and host dedicated game servers on top of Agon.
+Documentation and usage guides on how to develop and host dedicated game servers on top of Agones.
More documentation forthcoming.
@@ -44,10 +44,10 @@ More documentation forthcoming.
- [Full GameServer Configuration](./examples/gameserver.yaml)
- [Simple UDP](./examples/simple-udp) (Go) - simple server and client that send UDP packets back and forth.
- [CPP Simple](./examples/cpp-simple) (C++) - C++ example that starts up, stays healthy and then shuts down after 60 seconds.
-- [Xonotic](./examples/xonotic) - Wraps the SDK around the open source FPS game [Xonotic](http://www.xonotic.org) and hosts it on Agon.
+- [Xonotic](./examples/xonotic) - Wraps the SDK around the open source FPS game [Xonotic](http://www.xonotic.org) and hosts it on Agones.
## Development and Contribution
-See the tools in the [build](build/README.md) directory for testing and building Agon from source.
+See the tools in the [build](build/README.md) directory for testing and building Agones from source.
## Licence
diff --git a/build/Makefile b/build/Makefile
index 5aac41b833a04c49b530707ebeeb7c8f33048497..825e623b5f88387febfa44a98124550fca169ad5 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -13,7 +13,7 @@
# limitations under the License.
#
-# Makefile for building, testing and developing Agon
+# Makefile for building, testing and developing Agones
#
# __ __ _ _ _
@@ -34,34 +34,34 @@ base_version = 0.1
# Version defaults to the short hash of the latest commit
VERSION ?= $(base_version)-$(shell git rev-parse --short HEAD)
# The registry that is being used to store docker images
-REGISTRY ?= gcr.io/agon-images
+REGISTRY ?= gcr.io/agones-images
# Where the kubectl configuration files are being stored
KUBEPATH ?= ~/.kube
# The (gcloud) test cluster that is being worked against
CLUSTER_NAME ?= test-cluster
# the profile to use when developing on minikube
-MINIKUBE_PROFILE ?= agon
+MINIKUBE_PROFILE ?= agones
# Directory that this Makefile is in.
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
build_path := $(dir $(mkfile_path))
-agon_path := $(realpath $(build_path)/..)
+agones_path := $(realpath $(build_path)/..)
-agon_package = github.com/agonio/agon
-mount_path = /go/src/$(agon_package)
+agones_package = agones.dev/agones
+mount_path = /go/src/$(agones_package)
common_mounts = -v $(build_path)/.config/gcloud:/root/.config/gcloud \
-v $(KUBEPATH):/root/.kube \
- -v $(agon_path):$(mount_path)
+ -v $(agones_path):$(mount_path)
# Use a hash of the Dockerfile for the tag, so when the Dockerfile changes,
# it automatically rebuilds
build_version := $(shell sha256sum $(build_path)/build-image/Dockerfile | head -c 10)
-build_tag = agon-build:$(build_version)
+build_tag = agones-build:$(build_version)
build_remote_tag = $(REGISTRY)/$(build_tag)
-controller_tag = $(REGISTRY)/agon-controller:$(VERSION)
-sidecar_tag = $(REGISTRY)/agon-sdk:$(VERSION)
+controller_tag = $(REGISTRY)/agones-controller:$(VERSION)
+sidecar_tag = $(REGISTRY)/agones-sdk:$(VERSION)
-go_version_flags = -ldflags "-X github.com/agonio/agon/pkg.Version=$(VERSION)"
+go_version_flags = -ldflags "-X agones.dev/agones/pkg.Version=$(VERSION)"
# ___ ____ ___ _ _
# / _ \/ ___| |_ _|_ __ ___| |_ _ __| | ___
@@ -92,19 +92,19 @@ include ./includes/$(osinclude)
build: build-images build-sdks
# build the docker images
-build-images: build-controller-image build-agon-sdk-image
+build-images: build-controller-image build-agones-sdk-image
#build all the sdks
build-sdks: build-sdk-cpp
# Run all tests
test: ensure-build-image
- docker run --rm $(common_mounts) --entrypoint=go $(build_tag) test -race $(agon_package)/...
+ docker run --rm $(common_mounts) --entrypoint=go $(build_tag) test -race $(agones_package)/...
# Push all the images up to $(REGISTRY)
-push: push-controller-image push-agon-sdk-image
+push: push-controller-image push-agones-sdk-image
-# Installs the current development version of Agon into the Kubernetes cluster
+# Installs the current development version of Agones into the Kubernetes cluster
install: ALWAYS_PULL_SIDECAR := true
install: IMAGE_PULL_POLICY := "Always"
install: ensure-build-image
@@ -117,35 +117,35 @@ install: ensure-build-image
# Build a static binary for the gameserver controller
build-controller-binary: ensure-build-image
docker run --rm -e "CGO_ENABLED=0" $(common_mounts) $(build_tag) go build \
- -o $(mount_path)/cmd/controller/bin/controller -a $(go_version_flags) -installsuffix cgo $(agon_package)/cmd/controller
+ -o $(mount_path)/cmd/controller/bin/controller -a $(go_version_flags) -installsuffix cgo $(agones_package)/cmd/controller
# Build the image for the gameserver controller
build-controller-image: ensure-build-image build-controller-binary
- docker build $(agon_path)/cmd/controller/ --tag=$(controller_tag)
+ docker build $(agones_path)/cmd/controller/ --tag=$(controller_tag)
# push the gameservers controller image
push-controller-image: ensure-build-image
docker push $(controller_tag)
# build the static binary for the gamesever sidecar
-build-agon-sdk-binary: ensure-build-image
+build-agones-sdk-binary: ensure-build-image
docker run --rm -e "CGO_ENABLED=0" $(common_mounts) $(build_tag) go build \
- -o $(mount_path)/cmd/sdk-server/bin/sdk-server.linux.amd64 -a $(go_version_flags) -installsuffix cgo $(agon_package)/cmd/sdk-server
+ -o $(mount_path)/cmd/sdk-server/bin/sdk-server.linux.amd64 -a $(go_version_flags) -installsuffix cgo $(agones_package)/cmd/sdk-server
docker run --rm -e "GOOS=darwin" -e "GOARCH=amd64" $(common_mounts) $(build_tag) go build \
- -o $(mount_path)/cmd/sdk-server/bin/sdk-server.darwin.amd64 $(go_version_flags) $(agon_package)/cmd/sdk-server
+ -o $(mount_path)/cmd/sdk-server/bin/sdk-server.darwin.amd64 $(go_version_flags) $(agones_package)/cmd/sdk-server
docker run --rm -e "GOOS=windows" -e "GOARCH=amd64" $(common_mounts) $(build_tag) go build \
- -o $(mount_path)/cmd/sdk-server/bin/sdk-server.windows.amd64.exe $(go_version_flags) $(agon_package)/cmd/sdk-server
+ -o $(mount_path)/cmd/sdk-server/bin/sdk-server.windows.amd64.exe $(go_version_flags) $(agones_package)/cmd/sdk-server
# Build the image for the gameserver sidecar
-build-agon-sdk-image: ensure-build-image build-agon-sdk-binary
- docker build $(agon_path)/cmd/sdk-server/ --tag=$(sidecar_tag)
+build-agones-sdk-image: ensure-build-image build-agones-sdk-binary
+ docker build $(agones_path)/cmd/sdk-server/ --tag=$(sidecar_tag)
# Build the cpp sdk linux archive
build-sdk-cpp: ensure-build-image
docker run --rm $(common_mounts) -w $(mount_path)/sdks/cpp --entrypoint make $(build_tag) build install archive VERSION=$(VERSION)
# push the gameservers sidecar image
-push-agon-sdk-image: ensure-build-image
+push-agones-sdk-image: ensure-build-image
docker push $(sidecar_tag)
# Generate the SDK gRPC server and client code
@@ -255,33 +255,33 @@ clean-gcloud-config:
# |_| |_|_|_| |_|_|_|\_\\__,_|_.__/ \___|
#
-# Switches to an "agon" profile, and starts a kubernetes cluster
+# Switches to an "agones" profile, and starts a kubernetes cluster
# of the right version.
#
# Use MINIKUBE_DRIVER variable to change the VM driver
# (defaults virtualbox for Linux and OSX, hyperv for windows) if you so desire.
-minikube-test-cluster: minikube-agon-profile
+minikube-test-cluster: minikube-agones-profile
$(MINIKUBE) start --kubernetes-version v1.8.0 --vm-driver $(MINIKUBE_DRIVER)
$(MAKE) minikube-post-start
-# switch to the agon cluster
-minikube-agon-profile:
+# switch to the agones cluster
+minikube-agones-profile:
$(MINIKUBE) profile $(MINIKUBE_PROFILE)
# Connecting to minikube requires so enhanced permissions, so use this target
# instead of `make shell` to start an interactive shell for development on minikube.
-minikube-shell: ensure-build-image minikube-agon-profile
+minikube-shell: ensure-build-image minikube-agones-profile
$(MAKE) shell ARGS="--network=host -v $(minikube_cert_mount) $(ARGS)"
-# Push the local Agon Docker images that have already been built
-# via `make build` or `make build-images` into the "agon" minikube instance.
-minikube-push: minikube-agon-profile
+# Push the local Agones Docker images that have already been built
+# via `make build` or `make build-images` into the "agones" minikube instance.
+minikube-push: minikube-agones-profile
$(MAKE) minikube-transfer-image TAG=$(sidecar_tag)
$(MAKE) minikube-transfer-image TAG=$(controller_tag)
-# Installs the current development version of Agon into the Kubernetes cluster.
+# Installs the current development version of Agones into the Kubernetes cluster.
# Use this instead of `make install`, as it disables PullAlways on the install.yaml
-minikube-install: minikube-agon-profile
+minikube-install: minikube-agones-profile
$(MAKE) install ARGS="--network=host -v $(minikube_cert_mount)" ALWAYS_PULL_SIDECAR=false IMAGE_PULL_POLICY=IfNotPresent
# Convenience target for transferring images into minikube.
diff --git a/build/README.md b/build/README.md
index 46f14806ace7a3b85a94a9721bb500bc93da7f89..6e5655c5a8cc930e7c5dad7c066689da6485dac6 100644
--- a/build/README.md
+++ b/build/README.md
@@ -1,9 +1,9 @@
-# Developing, Testing and Building Agon
+# Developing, Testing and Building Agones
-Tooling for building and developing against Agon, with only dependencies being
+Tooling for building and developing against Agones, with only dependencies being
[Make](https://www.gnu.org/software/make/) and [Docker](https://www.docker.com)
-Rather than installing all the dependencies locally, you can test and build Agon using the Docker image that is
+Rather than installing all the dependencies locally, you can test and build Agones using the Docker image that is
built from the Dockerfile in this directory. There is an accompanying Makefile for all the common
tasks you may wish to accomplish.
@@ -41,7 +41,7 @@ tasks you may wish to accomplish.
to develop on Minikube
### Windows
-Building and developing Agon requires you to use the
+Building and developing Agones requires you to use the
[Windows Subsystem for Linux](https://blogs.msdn.microsoft.com/wsl/)(WSL),
as this makes it easy to create a (relatively) cross platform development and build system.
@@ -53,8 +53,8 @@ as this makes it easy to create a (relatively) cross platform development and bu
from "Configure WSL to Connect to Docker for Windows" forward
for integrating the Docker on WSL with the Windows Docker installation
- Note the binding of `/c` to `/mnt/c` (or drive of your choice) - this is very important!
-- Agon will need to be cloned somewhere on your `/c` (or drive of your choice) path, as that is what Docker will support mounts from
-- All interaction with Agon must be on the `/c` (or drive of your choice) path, otherwise Docker mounts will not work
+- Agones will need to be cloned somewhere on your `/c` (or drive of your choice) path, as that is what Docker will support mounts from
+- All interaction with Agones must be on the `/c` (or drive of your choice) path, otherwise Docker mounts will not work
- Now the `make` commands can all be run from within your WSL shell
- (optional) Minikube is supported via the [HyperV](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/index)
driver - the same virtualisation platform as the Docker installation.
@@ -69,19 +69,26 @@ as this makes it easy to create a (relatively) cross platform development and bu
This has currently yet to be tested, but should have few issues around testing, building and running on GKE.
-Issues with building and developing on Minikube are currently expected, due to lack of testing, but Agon will run on Minikube.
+Issues with building and developing on Minikube are currently expected, due to lack of testing, but Agones will run on Minikube.
Testing on OSX and reporting bugs are appreciated.
-You can see progress on this on the [Build Agon on OSX](https://github.com/googleprivate/agon/issues/46) ticket.
-
+You can see progress on this on the [Build Agones on OSX](https://github.com/googleprivate/agones/issues/46) ticket.
## GOPATH
-This project should be cloned to the directory `$GOPATH/src/github.com/agonio/agon`
+This project should be cloned to the directory `$GOPATH/src/agones.dev/agones`
for when you are developing locally, and require package resolution in your IDE.
-This is not required if you are simply building using the `make` targets.
+If you have a working [Go environment](https://golang.org/doc/install), you can also do this through:
+
+```bash
+go get -d agones.dev/agones
+cd $GOPATH/src/agones.dev/agones
+```
+
+This is not required if you are simply building using the `make` targets, and do not plan to edit the code
+in an IDE.
If you are not familiar with GOPATHs, you can read [How to Write Go Code](https://golang.org/doc/code.html).
@@ -100,11 +107,11 @@ free to make cup of tea or coffee at this point. ☕ï¸
The build image is only created the first time one of the make targets is executed, and will only rebuild if the build
Dockerfile has changed.
-Assuming that the tests all pass, let's go ahead an compile the code and build the Docker images that Agon consists of.
+Assuming that the tests all pass, let's go ahead an compile the code and build the Docker images that Agones consists of.
Let's compile and build everything, by running `make build`, this will:
-- Compile the Agon Kubernetes integration code
+- Compile the Agones Kubernetes integration code
- Create the Docker images that we will later push
- Build the local development tooling for all supported OS's
- Compile and archive the SDKs in various languages
@@ -113,7 +120,7 @@ You may note that docker images, and tar archives are tagged with a concatenatio
upcoming release number and short git hash for the current commit. This has also been set in
the code itself, so that it can be seen in via log statements.
-Congratulations! You have now successfully tested and built Agon!
+Congratulations! You have now successfully tested and built Agones!
### Running a Test Google Kubernetes Engine Cluster
@@ -142,7 +149,7 @@ Great! Now we are setup, let's try out the development shell, and see if our `ku
Run `make shell` to enter the development shell. You should see a bash shell that has you as the root user.
Enter `kubectl get pods` and press enter. You should see that you have no resources currently, but otherwise see no errors.
Assuming that all works, let's exit the shell by typing `exit` and hitting enter, and look at building, pushing and
-installing Agon next.
+installing Agones next.
To prepare building and pushing images, let's set the REGISTRY environment variable to point to our new project.
You can [choose any registry region](https://cloud.google.com/container-registry/docs/pushing-and-pulling#choosing_a_registry_name)
@@ -159,11 +166,11 @@ To push our images up at this point, is simple `make push` and that will push up
project's container registry.
Now that the images are pushed, to install the development version (with all imagePolicies set to always download),
-run `make install` and Agon will install the image that you just built and pushed on the test cluster you
+run `make install` and Agones will install the image that you just built and pushed on the test cluster you
created at the beginning of this section. (if you want to see the resulting installation yaml, you can find it in `build/.install.yaml`)
### Running a Test Minikube cluster
-This will setup a [Minikube](https://github.com/kubernetes/minikube) cluster, running on an `agon` profile,
+This will setup a [Minikube](https://github.com/kubernetes/minikube) cluster, running on an `agones` profile,
Because Minikube runs on a virtualisation layer on the host, some of the standard build and development Make targets
need to be replaced by Minikube specific targets.
@@ -173,28 +180,28 @@ a virtualisation solution, such as [VirtualBox](https://www.virtualbox.org) as w
Check the [Building on Different Platforms](#building-on-different-platforms) above for details on what virtualisation
solution to use.
-Next we will create the Agon Minikube cluster. Run `make minikube-test-cluster` to create the `agon` profile,
+Next we will create the Agones Minikube cluster. Run `make minikube-test-cluster` to create the `agones` profile,
and a Kubernetes cluster of the supported version under this profile.
This will also install the kubectl authentication credentials in `~/.kube`, and set the
[`kubectl` context](https://kubernetes.io/docs/tasks/access-application-cluster/configure-access-multiple-clusters/)
-to `agon`.
+to `agones`.
Great! Now we are setup, let's try out the development shell, and see if our `kubectl` is working!
Run `make minikube-shell` to enter the development shell. You should see a bash shell that has you as the root user.
Enter `kubectl get pods` and press enter. You should see that you have no resources currently, but otherwise see no errors.
Assuming that all works, let's exit the shell by typing `exit` and hitting enter, and look at a building, pushing and
-installing Agon on Minikube next.
+installing Agones on Minikube next.
You may remember in the first part of this walkthrough, we ran `make build`, which created all the images and binaries
-we needed to work with Agon locally. We can push these images them straight into Minikube very easily!
+we needed to work with Agones locally. We can push these images them straight into Minikube very easily!
-Run `make minikube-push` which will send all of Agon's docker images from your local Docker into the Agon Minikube
+Run `make minikube-push` which will send all of Agones's docker images from your local Docker into the Agones Minikube
instance.
Now that the images are pushed, to install the development version,
-run `make minikube-install` and Agon will install the images that you built and pushed to the Agon Minikube instance
+run `make minikube-install` and Agones will install the images that you built and pushed to the Agones Minikube instance
(if you want to see the resulting installation yaml, you can find it in `build/.install.yaml`).
It's worth noting that Minikube does let you [reuse its Docker daemon](https://github.com/kubernetes/minikube/blob/master/docs/reusing_the_docker_daemon.md),
@@ -212,7 +219,7 @@ $ make minikube-transfer-image TAG=myimage:0.1
### Next Steps
-Have a look in the [examples](../examples) folder to see examples of running Game Servers on Agon.
+Have a look in the [examples](../examples) folder to see examples of running Game Servers on Agones.
## Make Variable Reference
@@ -220,7 +227,7 @@ Have a look in the [examples](../examples) folder to see examples of running Gam
The version of this build. Version defaults to the short hash of the latest commit
### REGISTRY
-The registry that is being used to store docker images. Defaults to gcr.io/agon-images - the release + CI registry.
+The registry that is being used to store docker images. Defaults to gcr.io/agones-images - the release + CI registry.
### KUBEPATH
The directory the kubectl configuration files are being stored for shell and kubectl targets.
@@ -238,13 +245,13 @@ All targets will create the build image if it is not present.
Targets for developing with the build image
#### `make build`
-Build all the images required for Agon, as well as the SDKs
+Build all the images required for Agones, as well as the SDKs
#### `make build-images`
-Build all the images required for Agon
+Build all the images required for Agones
#### `make build-sdks`
-Build all the sdks required for Agon
+Build all the sdks required for Agones
#### `make build-sdk-cpp`
Build the cpp sdk static and dynamic libraries (linux libraries only)
@@ -256,7 +263,7 @@ Run all tests
Pushes all built images up to the `$(REGISTRY)`
#### `make install`
-Installs the current development version of Agon into the Kubernetes cluster
+Installs the current development version of Agones into the Kubernetes cluster
#### `make shell`
Run a bash shell with the developer tools (go tooling, kubectl, etc) and source code in it.
@@ -264,10 +271,10 @@ Run a bash shell with the developer tools (go tooling, kubectl, etc) and source
#### `make godoc`
Run a container with godoc (search index enabled)
-#### `make build-agon-controller-image`
+#### `make build-agones-controller-image`
Compile the gameserver controller and then build the docker image
-#### `make build-agon-sdk-image`
+#### `make build-agones-sdk-image`
Compile the gameserver sidecar and then build the docker image
#### `make gen-crd-client`
@@ -316,18 +323,18 @@ for local development.
Since Minikube runs locally, there are some targets that need to be used instead of the standard ones above.
#### `minikube-test-cluster`
-Switches to an "agon" profile, and starts a kubernetes cluster
+Switches to an "agones" profile, and starts a kubernetes cluster
of the right version.
Use MINIKUBE_DRIVER variable to change the VM driver
(defaults virtualbox for Linux and OSX, hyperv for windows) if you so desire.
#### `minikube-push`
-Push the local Agon Docker images that have already been built
-via `make build` or `make build-images` into the "agon" minikube instance.
+Push the local Agones Docker images that have already been built
+via `make build` or `make build-images` into the "agones" minikube instance.
#### `minikube-install`
-Installs the current development version of Agon into the Kubernetes cluster.
+Installs the current development version of Agones into the Kubernetes cluster.
Use this instead of `make install`, as it disables PullAlways on the install.yaml
#### `minikube-shell`
diff --git a/build/build-image/Dockerfile b/build/build-image/Dockerfile
index cefd8d45161f1c7a336040dffb0d894c30b76990..b27b2259d5f4d6d45d9c81f6ca76b1ff970def9a 100644
--- a/build/build-image/Dockerfile
+++ b/build/build-image/Dockerfile
@@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# ForceUpdate 1 -- change here if you need to force a rebuild
+
# compiling proto + grpc takes an exceptionally long time
# so we'll use that as the base.
FROM grpc/cxx:1.8
diff --git a/build/build-image/gen-crd-client.sh b/build/build-image/gen-crd-client.sh
index eec74f27261be7859573b3fcfdfd2d60fbb1d9e9..1ea6e0bd55961d502a9bc16a2edf05d29086f06c 100644
--- a/build/build-image/gen-crd-client.sh
+++ b/build/build-image/gen-crd-client.sh
@@ -14,9 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-rsync -r /go/src/github.com/agonio/agon/vendor/k8s.io/ /go/src/k8s.io/
+rsync -r /go/src/agones.dev/agones/vendor/k8s.io/ /go/src/k8s.io/
cd /go/src/k8s.io/code-generator
./generate-groups.sh "all" \
- github.com/agonio/agon/pkg/client \
- github.com/agonio/agon/pkg/apis stable:v1alpha1 \
- --go-header-file=/go/src/github.com/agonio/agon/build/boilerplate.go.txt
+ agones.dev/agones/pkg/client \
+ agones.dev/agones/pkg/apis stable:v1alpha1 \
+ --go-header-file=/go/src/agones.dev/agones/build/boilerplate.go.txt
diff --git a/build/build-image/gen-grpc-cpp.sh b/build/build-image/gen-grpc-cpp.sh
index 75b296874899b33a3b50ec1bdd4c4c3580055d1e..d0b88f7b468fd8ef80ab45a534ffc6a4dae923de 100644
--- a/build/build-image/gen-grpc-cpp.sh
+++ b/build/build-image/gen-grpc-cpp.sh
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-cd /go/src/github.com/agonio/agon
+cd /go/src/agones.dev/agones
protoc -I . --grpc_out=./sdks/cpp --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` sdk.proto
protoc -I . --cpp_out=./sdks/cpp sdk.proto
mkdir /tmp/cpp
diff --git a/build/build-image/gen-grpc-go.sh b/build/build-image/gen-grpc-go.sh
index 1b0a1e23a516bb8d2d6d73946161110a805493a1..29b24921c121a4d433894ef26100d441c9344a03 100644
--- a/build/build-image/gen-grpc-go.sh
+++ b/build/build-image/gen-grpc-go.sh
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-cd /go/src/github.com/agonio/agon
+cd /go/src/agones.dev/agones
protoc -I . sdk.proto --go_out=plugins=grpc:sdks/go
cat ./build/boilerplate.go.txt ./sdks/go/sdk.pb.go >> ./sdk.pb.go
goimports -w ./sdk.pb.go
diff --git a/build/gke-test-cluster/cluster.yml.jinja b/build/gke-test-cluster/cluster.yml.jinja
index 366b0d34b16ec64d9ee5504257248ced24f488ae..5d6dd98574c97091af99878eac945f086a518003 100644
--- a/build/gke-test-cluster/cluster.yml.jinja
+++ b/build/gke-test-cluster/cluster.yml.jinja
@@ -20,7 +20,7 @@ resources:
zone: {{ properties["zone"] }}
cluster:
name: test-cluster
- description: Test cluster for Agon
+ description: Test cluster for Agones
nodePools:
- name: "default"
initialNodeCount: 3
diff --git a/build/install.yaml b/build/install.yaml
index e1ce1f544d6707913a506f7fe5c47b23830e86ed..fb2fb5e31c7e60c06de4050ad054e6d13d4f184b 100644
--- a/build/install.yaml
+++ b/build/install.yaml
@@ -17,9 +17,9 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
- name: gameservers.stable.agon.io
+ name: gameservers.stable.agones.dev
spec:
- group: stable.agon.io
+ group: stable.agones.dev
version: v1alpha1
scope: Namespaced
names:
@@ -32,7 +32,7 @@ spec:
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- name: agon-controller
+ name: agones-controller
spec:
replicas: 1
strategy:
@@ -40,17 +40,17 @@ spec:
template:
metadata:
labels:
- stable.agon.io/role: controller
+ stable.agones.dev/role: controller
spec:
containers:
- - name: agon-controller
- image: ${REGISTRY}/agon-controller:${VERSION}
+ - name: agones-controller
+ image: ${REGISTRY}/agones-controller:${VERSION}
imagePullPolicy: ${IMAGE_PULL_POLICY}
env:
- name: ALWAYS_PULL_SIDECAR # set the sidecar imagePullPolicy to Always
value: "${ALWAYS_PULL_SIDECAR}"
- name: SIDECAR # overwrite the GameServer sidecar image that is used
- value: ${REGISTRY}/agon-sdk:${VERSION}
+ value: ${REGISTRY}/agones-sdk:${VERSION}
- name: MIN_PORT
value: "7000"
- name: MAX_PORT
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 237b604b9dcdd84864021c0a730a2588fe8c2611..891f01f750e9088ae853532e7bca526189b832f4 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -33,9 +33,9 @@ steps:
args: [ "build", "push" ] # build all the things, and push images
- name: 'gcr.io/cloud-builders/gsutil'
dir: "sdks/cpp/bin"
- args: ['cp', '*.tar.gz', 'gs://agon-artifacts/cpp-sdk']
+ args: ['cp', '*.tar.gz', 'gs://agones-artifacts/cpp-sdk']
- name: "make-docker"
dir: "build"
args: ["push-build-image"] # push the build image (which won't do anything if it's already there)
timeout: "1h"
-images: ['gcr.io/$PROJECT_ID/agon-controller', 'gcr.io/$PROJECT_ID/agon-sdk']
+images: ['gcr.io/$PROJECT_ID/agones-controller', 'gcr.io/$PROJECT_ID/agones-sdk']
diff --git a/cmd/controller/Dockerfile b/cmd/controller/Dockerfile
index 67ed5392d0c1ebb228d6cf675f5407e710286581..d61054c88fcbd05d77180fbb8039b3724b70159b 100644
--- a/cmd/controller/Dockerfile
+++ b/cmd/controller/Dockerfile
@@ -1,10 +1,10 @@
FROM alpine:3.7
-COPY ./bin/controller /home/agon/controller
+COPY ./bin/controller /home/agones/controller
RUN apk --update add ca-certificates && \
- adduser -D agon && \
- chown -R agon /home/agon && \
- chmod o+x /home/agon/controller
+ adduser -D agones && \
+ chown -R agones /home/agones && \
+ chmod o+x /home/agones/controller
-USER agon
-ENTRYPOINT ["/home/agon/controller"]
\ No newline at end of file
+USER agones
+ENTRYPOINT ["/home/agones/controller"]
\ No newline at end of file
diff --git a/cmd/controller/main.go b/cmd/controller/main.go
index 57adc0c54533fcf5951bb08426f643648669622c..05cc86725a0ed76dd97174ff98476e6f763de4e0 100644
--- a/cmd/controller/main.go
+++ b/cmd/controller/main.go
@@ -19,12 +19,12 @@ import (
"strings"
"time"
- "github.com/agonio/agon/pkg"
- "github.com/agonio/agon/pkg/client/clientset/versioned"
- "github.com/agonio/agon/pkg/client/informers/externalversions"
- "github.com/agonio/agon/pkg/gameservers"
- "github.com/agonio/agon/pkg/util/runtime"
- "github.com/agonio/agon/pkg/util/signals"
+ "agones.dev/agones/pkg"
+ "agones.dev/agones/pkg/client/clientset/versioned"
+ "agones.dev/agones/pkg/client/informers/externalversions"
+ "agones.dev/agones/pkg/gameservers"
+ "agones.dev/agones/pkg/util/runtime"
+ "agones.dev/agones/pkg/util/signals"
"github.com/sirupsen/logrus"
"github.com/spf13/pflag"
"github.com/spf13/viper"
@@ -47,7 +47,7 @@ func init() {
// main starts the operator for the gameserver CRD
func main() {
- viper.SetDefault(sidecarFlag, "gcr.io/agon-images/agon-sdk:"+pkg.Version)
+ viper.SetDefault(sidecarFlag, "gcr.io/agones-images/agones-sdk:"+pkg.Version)
viper.SetDefault(pullSidecarFlag, false)
pflag.String(sidecarFlag, viper.GetString(sidecarFlag), "Flag to overwrite the GameServer sidecar image that is used. Can also use SIDECAR env variable")
@@ -95,19 +95,19 @@ func main() {
logrus.WithError(err).Fatal("Could not create the api extension clientset")
}
- agonClient, err := versioned.NewForConfig(config)
+ agonesClient, err := versioned.NewForConfig(config)
if err != nil {
- logrus.WithError(err).Fatal("Could not create the agon api clientset")
+ logrus.WithError(err).Fatal("Could not create the agones api clientset")
}
- agonInformerFactory := externalversions.NewSharedInformerFactory(agonClient, 30*time.Second)
+ agonesInformerFactory := externalversions.NewSharedInformerFactory(agonesClient, 30*time.Second)
kubeInformationFactory := informers.NewSharedInformerFactory(kubeClient, 30*time.Second)
- c := gameservers.NewController(minPort, maxPort, sidecarImage, alwaysPullSidecar, kubeClient, kubeInformationFactory, extClient, agonClient, agonInformerFactory)
+ c := gameservers.NewController(minPort, maxPort, sidecarImage, alwaysPullSidecar, kubeClient, kubeInformationFactory, extClient, agonesClient, agonesInformerFactory)
stop := signals.NewStopChannel()
kubeInformationFactory.Start(stop)
- agonInformerFactory.Start(stop)
+ agonesInformerFactory.Start(stop)
err = c.Run(2, stop)
if err != nil {
diff --git a/cmd/sdk-server/Dockerfile b/cmd/sdk-server/Dockerfile
index 12216408eb98838f8dea899dfc6c83fe62db0f95..f20b188c574073aa1c08c119e1729f18dbb21c66 100644
--- a/cmd/sdk-server/Dockerfile
+++ b/cmd/sdk-server/Dockerfile
@@ -1,10 +1,10 @@
FROM alpine:3.7
-COPY ./bin/sdk-server.linux.amd64 /home/agon/sdk-server
+COPY ./bin/sdk-server.linux.amd64 /home/agones/sdk-server
RUN apk --update add ca-certificates && \
- adduser -D agon && \
- chown -R agon /home/agon && \
- chmod o+x /home/agon/sdk-server
+ adduser -D agones && \
+ chown -R agones /home/agones && \
+ chmod o+x /home/agones/sdk-server
-USER agon
-ENTRYPOINT ["/home/agon/sdk-server"]
\ No newline at end of file
+USER agones
+ENTRYPOINT ["/home/agones/sdk-server"]
\ No newline at end of file
diff --git a/cmd/sdk-server/main.go b/cmd/sdk-server/main.go
index e5926611175f2b98ac1e86aafe48d3b4fb116b41..c0d5035e1af0beda3a025ef3b8e627ca0e6b741f 100644
--- a/cmd/sdk-server/main.go
+++ b/cmd/sdk-server/main.go
@@ -21,11 +21,11 @@ import (
"strings"
"time"
- "github.com/agonio/agon/pkg"
- "github.com/agonio/agon/pkg/client/clientset/versioned"
- "github.com/agonio/agon/pkg/gameservers"
- "github.com/agonio/agon/pkg/sdk"
- "github.com/agonio/agon/pkg/util/runtime"
+ "agones.dev/agones/pkg"
+ "agones.dev/agones/pkg/client/clientset/versioned"
+ "agones.dev/agones/pkg/gameservers"
+ "agones.dev/agones/pkg/sdk"
+ "agones.dev/agones/pkg/util/runtime"
"github.com/sirupsen/logrus"
"github.com/spf13/pflag"
"github.com/spf13/viper"
@@ -117,14 +117,14 @@ func main() {
logrus.WithError(err).Fatal("Could not create the kubernetes clientset")
}
- agonClient, err := versioned.NewForConfig(config)
+ agonesClient, err := versioned.NewForConfig(config)
if err != nil {
- logrus.WithError(err).Fatalf("Could not create the agon api clientset")
+ logrus.WithError(err).Fatalf("Could not create the agones api clientset")
}
var s *gameservers.SDKServer
s, err = gameservers.NewSDKServer(viper.GetString(gameServerNameEnv), viper.GetString(podNamespaceEnv),
- healthDisabled, healthTimeout, healthFailureThreshold, healthInitialDelay, kubeClient, agonClient)
+ healthDisabled, healthTimeout, healthFailureThreshold, healthInitialDelay, kubeClient, agonesClient)
if err != nil {
logrus.WithError(err).Fatalf("Could not start sidecar")
}
diff --git a/docs/health_checking.md b/docs/health_checking.md
index 5087ffa9117705ca8b86c6b4d8fab1c63a54afda..5cda9e6930346a6b4df33300e3798a7dcdadde69 100644
--- a/docs/health_checking.md
+++ b/docs/health_checking.md
@@ -54,7 +54,7 @@ For a configuration that requires a health ping every 5 seconds, the example bel
to be sure that the GameServer is under the threshold.
```cpp
-void doHealth(agon::SDK *sdk) {
+void doHealth(agones::SDK *sdk) {
while (true) {
if (!sdk->Health()) {
std::cout << "Health ping failed" << std::endl;
@@ -66,7 +66,7 @@ void doHealth(agon::SDK *sdk) {
}
int main() {
- agon::SDK *sdk = new agon::SDK();
+ agones::SDK *sdk = new agones::SDK();
bool connected = sdk->Connect();
if (!connected) {
return -1;
diff --git a/examples/cpp-simple/Makefile b/examples/cpp-simple/Makefile
index f6f726a8e9196aeb5f5844f2766be217db69acbb..0a787101e5c5b2fcb44b09c158a15cb96927632d 100644
--- a/examples/cpp-simple/Makefile
+++ b/examples/cpp-simple/Makefile
@@ -26,8 +26,8 @@
CXX = g++
CPPFLAGS += -I/usr/local/include -pthread
CXXFLAGS += -std=c++11
-LDFLAGS += -L/usr/local/lib -lagonsdk -lgrpc++_unsecure -lgrpc -lprotobuf -lpthread -ldl
-REPOSITORY = gcr.io/agon-images
+LDFLAGS += -L/usr/local/lib -lagonessdk -lgrpc++_unsecure -lgrpc -lprotobuf -lpthread -ldl
+REPOSITORY = gcr.io/agones-images
# Directory that this Makefile is in.
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
diff --git a/examples/cpp-simple/README.md b/examples/cpp-simple/README.md
index 8c3679b2afc19960a95a59bca3817fc067319d96..dcdd1ab5a9fac18fa132814597ff48f213dd8761 100644
--- a/examples/cpp-simple/README.md
+++ b/examples/cpp-simple/README.md
@@ -3,8 +3,8 @@
This is a very simple "server" that doesn't do much other than show how the SDK works in C++.
It will
-- Setup the Agon SDK
-- Call `SDK::Ready()` to register that it is ready with Agon.
+- Setup the Agones SDK
+- Call `SDK::Ready()` to register that it is ready with Agones.
- Every 10 seconds, write a log saying "Hi! I'm a Game Server"
- After 60 seconds, call `SDK::Shutdown()` to shut the server down.
diff --git a/examples/cpp-simple/gameserver.yaml b/examples/cpp-simple/gameserver.yaml
index 6dd3aff5d07ebab8010f6dcc242c5e5fe37bf05f..2b22b2297611a46c87ce4f4e12e741ed3b9b8677 100644
--- a/examples/cpp-simple/gameserver.yaml
+++ b/examples/cpp-simple/gameserver.yaml
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: "stable.agon.io/v1alpha1"
+apiVersion: "stable.agones.dev/v1alpha1"
kind: GameServer
metadata:
# generate a unique name
@@ -24,5 +24,5 @@ spec:
spec:
containers:
- name: cpp-simple
- image: gcr.io/agon-images/cpp-simple-server:0.1
+ image: gcr.io/agones-images/cpp-simple-server:0.1
# imagePullPolicy: Always # add for development
\ No newline at end of file
diff --git a/examples/cpp-simple/server.cc b/examples/cpp-simple/server.cc
index 5c9c97698db682d07538438019440527995d9b51..6ed24194a99d5d56693a4d5e953207c0b6d3e8f5 100644
--- a/examples/cpp-simple/server.cc
+++ b/examples/cpp-simple/server.cc
@@ -18,11 +18,11 @@
#include <iostream>
#include <thread>
-#include <agon/sdk.h>
+#include <agones/sdk.h>
#include <grpc++/grpc++.h>
// send health check pings
-void doHealth(agon::SDK *sdk) {
+void doHealth(agones::SDK *sdk) {
while (true) {
if (!sdk->Health()) {
std::cout << "Health ping failed" << std::endl;
@@ -37,7 +37,7 @@ int main() {
std::cout << "C++ Game Server has started!" << std::endl;
std::cout << "Getting the instance of the SDK!" << std::endl;
- agon::SDK *sdk = new agon::SDK();
+ agones::SDK *sdk = new agones::SDK();
std::cout << "Attempting to connect..." << std::endl;
bool connected = sdk->Connect();
diff --git a/examples/gameserver.yaml b/examples/gameserver.yaml
index 97add9f67e249ec25c3c4025ba1a884de6115da6..a675e169a4f7c9d789c5f1416bedb2da7af88a11 100644
--- a/examples/gameserver.yaml
+++ b/examples/gameserver.yaml
@@ -21,7 +21,7 @@
# and provides a sidecar for this game server that the SDK will connect with.
#
-apiVersion: "stable.agon.io/v1alpha1"
+apiVersion: "stable.agones.dev/v1alpha1"
kind: GameServer
# GameServer Metadata
# https://v1-8.docs.kubernetes.io/docs/api-reference/v1.8/#objectmeta-v1-meta
@@ -65,5 +65,5 @@ spec:
spec:
containers:
- name: example-server
- image: gcr.io/agon/test-server:0.1
+ image: gcr.io/agones/test-server:0.1
imagePullPolicy: Always
diff --git a/examples/simple-udp/Makefile b/examples/simple-udp/Makefile
index b8ba3962de0981899d9613053ab3a188bfa839b2..fa6186d747bfe52c306b91dc72d363621d0f892e 100644
--- a/examples/simple-udp/Makefile
+++ b/examples/simple-udp/Makefile
@@ -23,12 +23,12 @@
# \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/
#
-REPOSITORY = gcr.io/agon-images
+REPOSITORY = gcr.io/agones-images
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
project_path := $(dir $(mkfile_path))
server_tag = $(REPOSITORY)/udp-server:0.1
-package = github.com/agonio/agon/examples/simple-udp
+package = agones.dev/agones/examples/simple-udp
# _____ _
# |_ _|_ _ _ __ __ _ ___| |_ ___
diff --git a/examples/simple-udp/README.md b/examples/simple-udp/README.md
index 39bc37f2a46400b449474712fa828f48c5197bab..b76db6824a206296ff1bdd59df6c01b900d3480e 100644
--- a/examples/simple-udp/README.md
+++ b/examples/simple-udp/README.md
@@ -1,7 +1,7 @@
# Simple UDP Server
A very simple UDP logging server and client, for the purposes of demoing and testing
-running a UDP based server on Agon.
+running a UDP based server on Agones.
## Server
Starts a server on port `7654` by default. Can be overwritten by `PORT` env var or `port` flag.
diff --git a/examples/simple-udp/server/gameserver.yaml b/examples/simple-udp/server/gameserver.yaml
index 29e76eb7b280cb66154c61640dd9311054dbf045..737225d485991ec1fe0562977eff476331b4ad9c 100644
--- a/examples/simple-udp/server/gameserver.yaml
+++ b/examples/simple-udp/server/gameserver.yaml
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: "stable.agon.io/v1alpha1"
+apiVersion: "stable.agones.dev/v1alpha1"
kind: GameServer
metadata:
name: "simple-udp"
@@ -24,5 +24,5 @@ spec:
spec:
containers:
- name: simple-udp
- image: gcr.io/agon-images/udp-server:0.1
+ image: gcr.io/agones-images/udp-server:0.1
# imagePullPolicy: Always # add for development
\ No newline at end of file
diff --git a/examples/simple-udp/server/main.go b/examples/simple-udp/server/main.go
index 3f7cb2e74deb3bc30507764663ec426ea5d1c0e9..17fefe3bccf56ac027f76e02626d55738546d24d 100644
--- a/examples/simple-udp/server/main.go
+++ b/examples/simple-udp/server/main.go
@@ -23,7 +23,7 @@ import (
"time"
- "github.com/agonio/agon/sdks/go"
+ "agones.dev/agones/sdks/go"
)
// main starts a UDP server that received 1024 byte sized packets at at time
@@ -53,7 +53,7 @@ func main() {
go doHealth(s, stop)
log.Print("Marking this server as ready")
- // This tells Agon that the server is ready to receive connections.
+ // This tells Agones that the server is ready to receive connections.
err = s.Ready()
if err != nil {
log.Fatalf("Could not send ready message")
@@ -72,7 +72,7 @@ func main() {
// shuts down the gameserver
case "EXIT":
log.Printf("Received EXIT command. Exiting.")
- // This tells Agon to shutdown this Game Server
+ // This tells Agones to shutdown this Game Server
err := s.Shutdown()
if err != nil {
log.Printf("Could not shutdown")
diff --git a/examples/xonotic/Makefile b/examples/xonotic/Makefile
index 1a2ba64103f9be565a9c361c098ef0c0c9f6e1e7..614aa8c481166b43222b51b5988eaf094b78d99c 100644
--- a/examples/xonotic/Makefile
+++ b/examples/xonotic/Makefile
@@ -23,11 +23,11 @@
# \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/
#
-REPOSITORY = gcr.io/agon-images
+REPOSITORY = gcr.io/agones-images
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
project_path := $(dir $(mkfile_path))
-agon_path := $(realpath $(project_path)/../..)
+agones_path := $(realpath $(project_path)/../..)
image_tag = $(REPOSITORY)/xonotic-example:0.1
# _____ _
@@ -42,9 +42,9 @@ build: build-go-binary
docker build $(project_path) --tag=$(image_tag)
# build the go binary with Docker, so you don't have to install anything
-build-go-binary: MOUNTPATH="/go/src/github.com/agonio/agon"
+build-go-binary: MOUNTPATH="/go/src/agones.dev/agones"
build-go-binary:
- docker run --rm -v $(agon_path):$(MOUNTPATH) golang:1.9.2 go build -o $(MOUNTPATH)/examples/xonotic/bin/sdk github.com/agonio/agon/examples/xonotic
+ docker run --rm -v $(agones_path):$(MOUNTPATH) golang:1.9.2 go build -o $(MOUNTPATH)/examples/xonotic/bin/sdk agones.dev/agones/examples/xonotic
diff --git a/examples/xonotic/gameserver.yaml b/examples/xonotic/gameserver.yaml
index 74d760c64bb104904f9ea96fcbac0c62bd452f2c..8a8aad2535037a64a31af1adf7b55bf560859540 100644
--- a/examples/xonotic/gameserver.yaml
+++ b/examples/xonotic/gameserver.yaml
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: "stable.agon.io/v1alpha1"
+apiVersion: "stable.agones.dev/v1alpha1"
kind: GameServer
metadata:
name: "xonotic"
@@ -23,5 +23,5 @@ spec:
spec:
containers:
- name: xonotic
- image: gcr.io/agon-images/xonotic-example:0.1
+ image: gcr.io/agones-images/xonotic-example:0.1
# imagePullPolicy: Always # add for development
\ No newline at end of file
diff --git a/examples/xonotic/main.go b/examples/xonotic/main.go
index e93aaf4ca5b829964e818912741f9c33b5631089..6c321d0de447f7f318ee9525a2d6aac76c28a9aa 100644
--- a/examples/xonotic/main.go
+++ b/examples/xonotic/main.go
@@ -18,7 +18,7 @@ import (
"log"
"time"
- "github.com/agonio/agon/sdks/go"
+ "agones.dev/agones/sdks/go"
)
// main cheats a little, and just declares the game server as ready
diff --git a/examples/xonotic/server.cfg b/examples/xonotic/server.cfg
index b23d12b7d78d8efa3562fa1447465910feb606e6..daa8a1a48dc9cc75eb1f6855a5ef302948b1075b 100644
--- a/examples/xonotic/server.cfg
+++ b/examples/xonotic/server.cfg
@@ -15,7 +15,7 @@
sv_public 1 // 0 if the server should not be on the public servers list
//sv_status_privacy 1 // 1 hides IP addresses from "status" replies shown to clients, 0 shows them. Enables players to identify wellknown punks on your server OR is a thread to anonymity.. depending on your point of view :)
-hostname "Xonotic Agon $g_xonoticversion Server" // this name will appear on the server list (the $g_xonoticversion gets replaced with the current version)
+hostname "Xonotic Agones $g_xonoticversion Server" // this name will appear on the server list (the $g_xonoticversion gets replaced with the current version)
//sv_motd "" // this message (unless "") is displayed to players on connect
maxplayers 8 // number of players allowed on the server
diff --git a/install.yaml b/install.yaml
index 4750447031bd7ef0e31755da34bb13ff2e4c2e37..bd5f287f95f27cd7b9f55ffcebad740c6c705a10 100644
--- a/install.yaml
+++ b/install.yaml
@@ -15,9 +15,9 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
- name: gameservers.stable.agon.io
+ name: gameservers.stable.agones.dev
spec:
- group: stable.agon.io
+ group: stable.agones.dev
version: v1alpha1
scope: Namespaced
names:
@@ -30,7 +30,7 @@ spec:
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- name: agon-controller
+ name: agones-controller
spec:
replicas: 1
strategy:
@@ -38,11 +38,11 @@ spec:
template:
metadata:
labels:
- stable.agon.io/role: controller
+ stable.agones.dev/role: controller
spec:
containers:
- - name: agon-controller
- image: gcr.io/agon-images/agon-controller:0.1
+ - name: agones-controller
+ image: gcr.io/agones-images/agones-controller:0.1
env:
# minimum port that can be exposed to GameServer traffic
- name: MIN_PORT
@@ -51,7 +51,7 @@ spec:
- name: MAX_PORT
value: "8000"
# - name: SIDECAR # overwrite the GameServer sidecar image that is used
- # value: gcr.io/agon-images/agon-sdk:0.1
+ # value: gcr.io/agones-images/agones-sdk:0.1
livenessProbe:
httpGet:
path: /healthz
diff --git a/pkg/apis/stable/register.go b/pkg/apis/stable/register.go
index 623b330cc48f039bd9f922a839d19d99a71899df..0638823cbdf40c8f9b87c0e2ee79d49bd7eced6a 100644
--- a/pkg/apis/stable/register.go
+++ b/pkg/apis/stable/register.go
@@ -15,6 +15,6 @@
package stable
const (
- // GroupName is the Scheme Group Name for Agon Custom Resource Definitions
- GroupName = "stable.agon.io"
+ // GroupName is the Scheme Group Name for Agones Custom Resource Definitions
+ GroupName = "stable.agones.dev"
)
diff --git a/pkg/apis/stable/v1alpha1/doc.go b/pkg/apis/stable/v1alpha1/doc.go
index e1ddac34a9c6ca5d69df76f4b1048371f5280dec..ebb4a5c0ff4f5e3979e7ccefa25ea42a8f8bce51 100644
--- a/pkg/apis/stable/v1alpha1/doc.go
+++ b/pkg/apis/stable/v1alpha1/doc.go
@@ -15,5 +15,5 @@
// +k8s:deepcopy-gen=package,register
// Package v1alpha1 is the v1alpha1 version of the API.
-// +groupName=stable.agon.io
+// +groupName=stable.agones.dev
package v1alpha1
diff --git a/pkg/apis/stable/v1alpha1/register.go b/pkg/apis/stable/v1alpha1/register.go
index 54fdbab8105866b51459799b006e2e5708035228..56af76902fcea79af2373be8a087cfa5f63c50ca 100644
--- a/pkg/apis/stable/v1alpha1/register.go
+++ b/pkg/apis/stable/v1alpha1/register.go
@@ -15,8 +15,8 @@
package v1alpha1
import (
- "github.com/agonio/agon/pkg/apis/stable"
- "github.com/agonio/agon/pkg/util/runtime"
+ "agones.dev/agones/pkg/apis/stable"
+ "agones.dev/agones/pkg/util/runtime"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
k8sruntime "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/apis/stable/v1alpha1/types.go b/pkg/apis/stable/v1alpha1/types.go
index f63405044977ff8bb25259774690eac938cf8d48..25ce8a8794a0e263f048f7b07bdb92d88ad9a898 100644
--- a/pkg/apis/stable/v1alpha1/types.go
+++ b/pkg/apis/stable/v1alpha1/types.go
@@ -15,7 +15,7 @@
package v1alpha1
import (
- "github.com/agonio/agon/pkg/apis/stable"
+ "agones.dev/agones/pkg/apis/stable"
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -50,7 +50,7 @@ const (
// port for the GameServer in question
Dynamic PortPolicy = "dynamic"
- // RoleLabel is the label in which the Agon role is specified.
+ // RoleLabel is the label in which the Agones role is specified.
// Pods from a GameServer will have the value "gameserver"
RoleLabel = stable.GroupName + "/role"
// GameServerLabelRole is the GameServer label value for RoleLabel
diff --git a/pkg/apis/stable/v1alpha1/types_test.go b/pkg/apis/stable/v1alpha1/types_test.go
index 1876fb09a7d347a79f702dd17ec80f6f52e0ebd0..8a2220ebde78595bfa4a259e869a97b988434590 100644
--- a/pkg/apis/stable/v1alpha1/types_test.go
+++ b/pkg/apis/stable/v1alpha1/types_test.go
@@ -17,7 +17,7 @@ package v1alpha1
import (
"testing"
- "github.com/agonio/agon/pkg/apis/stable"
+ "agones.dev/agones/pkg/apis/stable"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
diff --git a/pkg/apis/stable/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/stable/v1alpha1/zz_generated.deepcopy.go
index d4a4f48b094df6535dd883b22d787d504bcd5d54..fa637430f15993f577d1912555a4e8757a6e2b1a 100644
--- a/pkg/apis/stable/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/stable/v1alpha1/zz_generated.deepcopy.go
@@ -1,6 +1,6 @@
// +build !ignore_autogenerated
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -53,6 +53,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
in.(*GameServerStatus).DeepCopyInto(out.(*GameServerStatus))
return nil
}, InType: reflect.TypeOf(&GameServerStatus{})},
+ conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error {
+ in.(*Health).DeepCopyInto(out.(*Health))
+ return nil
+ }, InType: reflect.TypeOf(&Health{})},
)
}
@@ -122,6 +126,7 @@ func (in *GameServerList) DeepCopyObject() runtime.Object {
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *GameServerSpec) DeepCopyInto(out *GameServerSpec) {
*out = *in
+ out.Health = in.Health
in.Template.DeepCopyInto(&out.Template)
return
}
@@ -151,3 +156,19 @@ func (in *GameServerStatus) DeepCopy() *GameServerStatus {
in.DeepCopyInto(out)
return out
}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Health) DeepCopyInto(out *Health) {
+ *out = *in
+ return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Health.
+func (in *Health) DeepCopy() *Health {
+ if in == nil {
+ return nil
+ }
+ out := new(Health)
+ in.DeepCopyInto(out)
+ return out
+}
diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go
index 72518d3f116b2b9cdb5146e4e8a25ae5036cf7c8..a33b09a679f976cedb747e5a0a738e8a1a543469 100644
--- a/pkg/client/clientset/versioned/clientset.go
+++ b/pkg/client/clientset/versioned/clientset.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
package versioned
import (
- stablev1alpha1 "github.com/agonio/agon/pkg/client/clientset/versioned/typed/stable/v1alpha1"
+ stablev1alpha1 "agones.dev/agones/pkg/client/clientset/versioned/typed/stable/v1alpha1"
glog "github.com/golang/glog"
discovery "k8s.io/client-go/discovery"
rest "k8s.io/client-go/rest"
diff --git a/pkg/client/clientset/versioned/doc.go b/pkg/client/clientset/versioned/doc.go
index 9d7eaad141df0a463353bbabff23a9ca41ed1105..3cdbec250b5d9e9f66db75e48c18899301365815 100644
--- a/pkg/client/clientset/versioned/doc.go
+++ b/pkg/client/clientset/versioned/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go
index bce0f539ba8bb2d9459d6c376ef773533c5d8f03..649765ea15e15beb0078462bfa18cc422e5dd615 100644
--- a/pkg/client/clientset/versioned/fake/clientset_generated.go
+++ b/pkg/client/clientset/versioned/fake/clientset_generated.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
package fake
import (
- clientset "github.com/agonio/agon/pkg/client/clientset/versioned"
- stablev1alpha1 "github.com/agonio/agon/pkg/client/clientset/versioned/typed/stable/v1alpha1"
- fakestablev1alpha1 "github.com/agonio/agon/pkg/client/clientset/versioned/typed/stable/v1alpha1/fake"
+ clientset "agones.dev/agones/pkg/client/clientset/versioned"
+ stablev1alpha1 "agones.dev/agones/pkg/client/clientset/versioned/typed/stable/v1alpha1"
+ fakestablev1alpha1 "agones.dev/agones/pkg/client/clientset/versioned/typed/stable/v1alpha1/fake"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/discovery"
diff --git a/pkg/client/clientset/versioned/fake/doc.go b/pkg/client/clientset/versioned/fake/doc.go
index 66cfbd9d4bd22f8ecb011d776720bcc8d1e76f4e..a5e54a96509d5f873d532bf26aacefac1b03cf98 100644
--- a/pkg/client/clientset/versioned/fake/doc.go
+++ b/pkg/client/clientset/versioned/fake/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go
index ece44610df1039b2a5fa5da65cf8f970d4d832df..755c2e9f668d42f3fdd85ee1b70a9941c062eb98 100644
--- a/pkg/client/clientset/versioned/fake/register.go
+++ b/pkg/client/clientset/versioned/fake/register.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
package fake
import (
- stablev1alpha1 "github.com/agonio/agon/pkg/apis/stable/v1alpha1"
+ stablev1alpha1 "agones.dev/agones/pkg/apis/stable/v1alpha1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/client/clientset/versioned/scheme/doc.go b/pkg/client/clientset/versioned/scheme/doc.go
index a7dde952db9f9bad315ae91810989ed93e54f8fc..fda1aa8b3c6cad752054154b08931f95135bd3a0 100644
--- a/pkg/client/clientset/versioned/scheme/doc.go
+++ b/pkg/client/clientset/versioned/scheme/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go
index 27e5ae95e265bdf3a1e39f0b850ae6003a8e01a3..2c50d57d96c33a55dab7b947bc1406cb80a75b67 100644
--- a/pkg/client/clientset/versioned/scheme/register.go
+++ b/pkg/client/clientset/versioned/scheme/register.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
package scheme
import (
- stablev1alpha1 "github.com/agonio/agon/pkg/apis/stable/v1alpha1"
+ stablev1alpha1 "agones.dev/agones/pkg/apis/stable/v1alpha1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/client/clientset/versioned/typed/stable/v1alpha1/doc.go b/pkg/client/clientset/versioned/typed/stable/v1alpha1/doc.go
index f9a2d0966a1820ca08d84156a86b328b18e7e8e4..832171fac465e9d438a5e66485a29d2d5b85fa00 100644
--- a/pkg/client/clientset/versioned/typed/stable/v1alpha1/doc.go
+++ b/pkg/client/clientset/versioned/typed/stable/v1alpha1/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/pkg/client/clientset/versioned/typed/stable/v1alpha1/fake/doc.go b/pkg/client/clientset/versioned/typed/stable/v1alpha1/fake/doc.go
index c5ccba3f138eacdf163a22ddbc4d44eabdbae81d..71c0fe353af7b6a81f82d5c23700bfb9173c2ad0 100644
--- a/pkg/client/clientset/versioned/typed/stable/v1alpha1/fake/doc.go
+++ b/pkg/client/clientset/versioned/typed/stable/v1alpha1/fake/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/pkg/client/clientset/versioned/typed/stable/v1alpha1/fake/fake_gameserver.go b/pkg/client/clientset/versioned/typed/stable/v1alpha1/fake/fake_gameserver.go
index bb6c7f164ddd16a5bc4ee3cc4aea74f9fcc603f9..db5a7dfef7b258f67cc376422dcec8e7d8ee3df7 100644
--- a/pkg/client/clientset/versioned/typed/stable/v1alpha1/fake/fake_gameserver.go
+++ b/pkg/client/clientset/versioned/typed/stable/v1alpha1/fake/fake_gameserver.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
package fake
import (
- v1alpha1 "github.com/agonio/agon/pkg/apis/stable/v1alpha1"
+ v1alpha1 "agones.dev/agones/pkg/apis/stable/v1alpha1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -31,9 +31,9 @@ type FakeGameServers struct {
ns string
}
-var gameserversResource = schema.GroupVersionResource{Group: "stable.agon.io", Version: "v1alpha1", Resource: "gameservers"}
+var gameserversResource = schema.GroupVersionResource{Group: "stable.agones.dev", Version: "v1alpha1", Resource: "gameservers"}
-var gameserversKind = schema.GroupVersionKind{Group: "stable.agon.io", Version: "v1alpha1", Kind: "GameServer"}
+var gameserversKind = schema.GroupVersionKind{Group: "stable.agones.dev", Version: "v1alpha1", Kind: "GameServer"}
// Get takes name of the gameServer, and returns the corresponding gameServer object, and an error if there is any.
func (c *FakeGameServers) Get(name string, options v1.GetOptions) (result *v1alpha1.GameServer, err error) {
diff --git a/pkg/client/clientset/versioned/typed/stable/v1alpha1/fake/fake_stable_client.go b/pkg/client/clientset/versioned/typed/stable/v1alpha1/fake/fake_stable_client.go
index 2d4e1447c53526dc5aed15bc25534903d62e9aa1..921fe9f7d470f8808bb002b8702b9960ee2d7b5b 100644
--- a/pkg/client/clientset/versioned/typed/stable/v1alpha1/fake/fake_stable_client.go
+++ b/pkg/client/clientset/versioned/typed/stable/v1alpha1/fake/fake_stable_client.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
package fake
import (
- v1alpha1 "github.com/agonio/agon/pkg/client/clientset/versioned/typed/stable/v1alpha1"
+ v1alpha1 "agones.dev/agones/pkg/client/clientset/versioned/typed/stable/v1alpha1"
rest "k8s.io/client-go/rest"
testing "k8s.io/client-go/testing"
)
diff --git a/pkg/client/clientset/versioned/typed/stable/v1alpha1/gameserver.go b/pkg/client/clientset/versioned/typed/stable/v1alpha1/gameserver.go
index 4535158c406c7993460929286c0a84bf06947f75..0b2d4386e596e0e34736a45e6903d411d087728a 100644
--- a/pkg/client/clientset/versioned/typed/stable/v1alpha1/gameserver.go
+++ b/pkg/client/clientset/versioned/typed/stable/v1alpha1/gameserver.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
package v1alpha1
import (
- v1alpha1 "github.com/agonio/agon/pkg/apis/stable/v1alpha1"
- scheme "github.com/agonio/agon/pkg/client/clientset/versioned/scheme"
+ v1alpha1 "agones.dev/agones/pkg/apis/stable/v1alpha1"
+ scheme "agones.dev/agones/pkg/client/clientset/versioned/scheme"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/clientset/versioned/typed/stable/v1alpha1/generated_expansion.go b/pkg/client/clientset/versioned/typed/stable/v1alpha1/generated_expansion.go
index 812a2adb48f5753aef8d19ea4f886c83ba882ac6..582bc0ccd13996b955db0b8b0bdaa26cd46f328f 100644
--- a/pkg/client/clientset/versioned/typed/stable/v1alpha1/generated_expansion.go
+++ b/pkg/client/clientset/versioned/typed/stable/v1alpha1/generated_expansion.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/pkg/client/clientset/versioned/typed/stable/v1alpha1/stable_client.go b/pkg/client/clientset/versioned/typed/stable/v1alpha1/stable_client.go
index 1b50293295786767a0f55efc9ca383ae413449a3..1bb994e211528a820d9dcbad4924a260b7a9bbc3 100644
--- a/pkg/client/clientset/versioned/typed/stable/v1alpha1/stable_client.go
+++ b/pkg/client/clientset/versioned/typed/stable/v1alpha1/stable_client.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
package v1alpha1
import (
- v1alpha1 "github.com/agonio/agon/pkg/apis/stable/v1alpha1"
- "github.com/agonio/agon/pkg/client/clientset/versioned/scheme"
+ v1alpha1 "agones.dev/agones/pkg/apis/stable/v1alpha1"
+ "agones.dev/agones/pkg/client/clientset/versioned/scheme"
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
rest "k8s.io/client-go/rest"
)
@@ -27,7 +27,7 @@ type StableV1alpha1Interface interface {
GameServersGetter
}
-// StableV1alpha1Client is used to interact with features provided by the stable.agon.io group.
+// StableV1alpha1Client is used to interact with features provided by the stable.agones.dev group.
type StableV1alpha1Client struct {
restClient rest.Interface
}
diff --git a/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go
index 9f6a8bd064f958cd6abfaa4d65a8be07e308221f..8dc7c1e211b9cbddfce59ef433f388efc0597497 100644
--- a/pkg/client/informers/externalversions/factory.go
+++ b/pkg/client/informers/externalversions/factory.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@ import (
sync "sync"
time "time"
- versioned "github.com/agonio/agon/pkg/client/clientset/versioned"
- internalinterfaces "github.com/agonio/agon/pkg/client/informers/externalversions/internalinterfaces"
- stable "github.com/agonio/agon/pkg/client/informers/externalversions/stable"
+ versioned "agones.dev/agones/pkg/client/clientset/versioned"
+ internalinterfaces "agones.dev/agones/pkg/client/informers/externalversions/internalinterfaces"
+ stable "agones.dev/agones/pkg/client/informers/externalversions/stable"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
cache "k8s.io/client-go/tools/cache"
diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go
index cdfd2a0638596e479665696d15cfa15efd71c076..5d86ff1daec36edc16e5abfc486b07447384e879 100644
--- a/pkg/client/informers/externalversions/generic.go
+++ b/pkg/client/informers/externalversions/generic.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ package externalversions
import (
"fmt"
- v1alpha1 "github.com/agonio/agon/pkg/apis/stable/v1alpha1"
+ v1alpha1 "agones.dev/agones/pkg/apis/stable/v1alpha1"
schema "k8s.io/apimachinery/pkg/runtime/schema"
cache "k8s.io/client-go/tools/cache"
)
diff --git a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go
index 506aa6a72abe08864f2398b4afab4576910393ab..89ff28a8213666e5c1f332d3e5a17fbc5dddcce0 100644
--- a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go
+++ b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ package internalinterfaces
import (
time "time"
- versioned "github.com/agonio/agon/pkg/client/clientset/versioned"
+ versioned "agones.dev/agones/pkg/client/clientset/versioned"
runtime "k8s.io/apimachinery/pkg/runtime"
cache "k8s.io/client-go/tools/cache"
)
diff --git a/pkg/client/informers/externalversions/stable/interface.go b/pkg/client/informers/externalversions/stable/interface.go
index 3fc0de04984577eb42098d7caa77963131e7b36a..3c498bb992f89dd2d375695d1eedb37127275e4f 100644
--- a/pkg/client/informers/externalversions/stable/interface.go
+++ b/pkg/client/informers/externalversions/stable/interface.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
package stable
import (
- internalinterfaces "github.com/agonio/agon/pkg/client/informers/externalversions/internalinterfaces"
- v1alpha1 "github.com/agonio/agon/pkg/client/informers/externalversions/stable/v1alpha1"
+ internalinterfaces "agones.dev/agones/pkg/client/informers/externalversions/internalinterfaces"
+ v1alpha1 "agones.dev/agones/pkg/client/informers/externalversions/stable/v1alpha1"
)
// Interface provides access to each of this group's versions.
diff --git a/pkg/client/informers/externalversions/stable/v1alpha1/gameserver.go b/pkg/client/informers/externalversions/stable/v1alpha1/gameserver.go
index e33595fa4cb9786b7d7b54c92530621d9740186c..957825d735d420b8a304646e6566fd1d2a8a181c 100644
--- a/pkg/client/informers/externalversions/stable/v1alpha1/gameserver.go
+++ b/pkg/client/informers/externalversions/stable/v1alpha1/gameserver.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ package v1alpha1
import (
time "time"
- stable_v1alpha1 "github.com/agonio/agon/pkg/apis/stable/v1alpha1"
- versioned "github.com/agonio/agon/pkg/client/clientset/versioned"
- internalinterfaces "github.com/agonio/agon/pkg/client/informers/externalversions/internalinterfaces"
- v1alpha1 "github.com/agonio/agon/pkg/client/listers/stable/v1alpha1"
+ stable_v1alpha1 "agones.dev/agones/pkg/apis/stable/v1alpha1"
+ versioned "agones.dev/agones/pkg/client/clientset/versioned"
+ internalinterfaces "agones.dev/agones/pkg/client/informers/externalversions/internalinterfaces"
+ v1alpha1 "agones.dev/agones/pkg/client/listers/stable/v1alpha1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/informers/externalversions/stable/v1alpha1/interface.go b/pkg/client/informers/externalversions/stable/v1alpha1/interface.go
index 6358b43806e7f66fea37c9d6ebb53384c7c7de5c..92f1ea518da376225b5a83c9c23bf0bd1e2d4c3f 100644
--- a/pkg/client/informers/externalversions/stable/v1alpha1/interface.go
+++ b/pkg/client/informers/externalversions/stable/v1alpha1/interface.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
package v1alpha1
import (
- internalinterfaces "github.com/agonio/agon/pkg/client/informers/externalversions/internalinterfaces"
+ internalinterfaces "agones.dev/agones/pkg/client/informers/externalversions/internalinterfaces"
)
// Interface provides access to all the informers in this group version.
diff --git a/pkg/client/listers/stable/v1alpha1/expansion_generated.go b/pkg/client/listers/stable/v1alpha1/expansion_generated.go
index bb514a1acfc636905f7e2569cc7ec925ff949363..0d05436cfb118166ee067f17abb466f977c2a86b 100644
--- a/pkg/client/listers/stable/v1alpha1/expansion_generated.go
+++ b/pkg/client/listers/stable/v1alpha1/expansion_generated.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/pkg/client/listers/stable/v1alpha1/gameserver.go b/pkg/client/listers/stable/v1alpha1/gameserver.go
index 0153844955eb0bc58c75c6a3dd8e226dda8d1e73..7d0122a0cdf2e903692b2a9fa8152ee87b215516 100644
--- a/pkg/client/listers/stable/v1alpha1/gameserver.go
+++ b/pkg/client/listers/stable/v1alpha1/gameserver.go
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
package v1alpha1
import (
- v1alpha1 "github.com/agonio/agon/pkg/apis/stable/v1alpha1"
+ v1alpha1 "agones.dev/agones/pkg/apis/stable/v1alpha1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache"
diff --git a/pkg/gameservers/controller.go b/pkg/gameservers/controller.go
index 4364336cca1cdcda28af239c29291b26a6cba695..98c8e4be71f72e03e8548d4a1e656b0e8f4040d2 100644
--- a/pkg/gameservers/controller.go
+++ b/pkg/gameservers/controller.go
@@ -19,13 +19,13 @@ import (
"net/http"
"time"
- "github.com/agonio/agon/pkg/apis/stable"
- stablev1alpha1 "github.com/agonio/agon/pkg/apis/stable/v1alpha1"
- "github.com/agonio/agon/pkg/client/clientset/versioned"
- getterv1alpha1 "github.com/agonio/agon/pkg/client/clientset/versioned/typed/stable/v1alpha1"
- "github.com/agonio/agon/pkg/client/informers/externalversions"
- listerv1alpha1 "github.com/agonio/agon/pkg/client/listers/stable/v1alpha1"
- "github.com/agonio/agon/pkg/util/runtime"
+ "agones.dev/agones/pkg/apis/stable"
+ stablev1alpha1 "agones.dev/agones/pkg/apis/stable/v1alpha1"
+ "agones.dev/agones/pkg/client/clientset/versioned"
+ getterv1alpha1 "agones.dev/agones/pkg/client/clientset/versioned/typed/stable/v1alpha1"
+ "agones.dev/agones/pkg/client/informers/externalversions"
+ listerv1alpha1 "agones.dev/agones/pkg/client/listers/stable/v1alpha1"
+ "agones.dev/agones/pkg/util/runtime"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
@@ -78,10 +78,10 @@ func NewController(minPort, maxPort int32,
kubeClient kubernetes.Interface,
kubeInformerFactory informers.SharedInformerFactory,
extClient extclientset.Interface,
- agonClient versioned.Interface,
- agonInformerFactory externalversions.SharedInformerFactory) *Controller {
+ agonesClient versioned.Interface,
+ agonesInformerFactory externalversions.SharedInformerFactory) *Controller {
- gameServers := agonInformerFactory.Stable().V1alpha1().GameServers()
+ gameServers := agonesInformerFactory.Stable().V1alpha1().GameServers()
gsInformer := gameServers.Informer()
eventBroadcaster := record.NewBroadcaster()
@@ -95,13 +95,13 @@ func NewController(minPort, maxPort int32,
crdGetter: extClient.ApiextensionsV1beta1().CustomResourceDefinitions(),
podGetter: kubeClient.CoreV1(),
podLister: kubeInformerFactory.Core().V1().Pods().Lister(),
- gameServerGetter: agonClient.StableV1alpha1(),
+ gameServerGetter: agonesClient.StableV1alpha1(),
gameServerLister: gameServers.Lister(),
gameServerSynced: gsInformer.HasSynced,
nodeLister: kubeInformerFactory.Core().V1().Nodes().Lister(),
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), stable.GroupName+".GameServerController"),
- portAllocator: NewPortAllocator(minPort, maxPort, kubeInformerFactory, agonInformerFactory),
- healthController: NewHealthController(kubeClient, agonClient, kubeInformerFactory, agonInformerFactory),
+ portAllocator: NewPortAllocator(minPort, maxPort, kubeInformerFactory, agonesInformerFactory),
+ healthController: NewHealthController(kubeClient, agonesClient, kubeInformerFactory, agonesInformerFactory),
recorder: recorder,
}
@@ -410,7 +410,7 @@ func (c *Controller) syncGameServerCreatingState(gs *stablev1alpha1.GameServer)
// sidecar creates the sidecar container for a given GameServer
func (c *Controller) sidecar(gs *stablev1alpha1.GameServer) corev1.Container {
sidecar := corev1.Container{
- Name: "agon-gameserver-sidecar",
+ Name: "agones-gameserver-sidecar",
Image: c.sidecarImage,
Env: []corev1.EnvVar{
{
@@ -607,7 +607,7 @@ func (c Controller) Address(pod *corev1.Pod) (string, error) {
// Has a deadline of 60 seconds for this to occur.
func (c Controller) waitForEstablishedCRD() error {
return wait.PollImmediate(500*time.Millisecond, 60*time.Second, func() (done bool, err error) {
- crd, err := c.crdGetter.Get("gameservers.stable.agon.io", metav1.GetOptions{})
+ crd, err := c.crdGetter.Get("gameservers.stable.agones.dev", metav1.GetOptions{})
if err != nil {
return false, err
}
diff --git a/pkg/gameservers/controller_test.go b/pkg/gameservers/controller_test.go
index 5bacb2504603f80194b93a1d03db1a9bb439b4ec..1c4f01a5460c752530e10722908d6b0cbd5f1ba5 100644
--- a/pkg/gameservers/controller_test.go
+++ b/pkg/gameservers/controller_test.go
@@ -21,8 +21,8 @@ import (
"testing"
"time"
- "github.com/agonio/agon/pkg/apis/stable"
- "github.com/agonio/agon/pkg/apis/stable/v1alpha1"
+ "agones.dev/agones/pkg/apis/stable"
+ "agones.dev/agones/pkg/apis/stable/v1alpha1"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
@@ -96,11 +96,11 @@ func TestSyncGameServer(t *testing.T) {
assert.Equal(t, fixture.ObjectMeta.Name+"-", pod.ObjectMeta.GenerateName)
return false, pod, nil
})
- mocks.agonClient.AddReactor("list", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ mocks.agonesClient.AddReactor("list", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
gameServers := &v1alpha1.GameServerList{Items: []v1alpha1.GameServer{fixture}}
return true, gameServers, nil
})
- mocks.agonClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ mocks.agonesClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
ua := action.(k8stesting.UpdateAction)
gs := ua.GetObject().(*v1alpha1.GameServer)
updateCount++
@@ -131,10 +131,10 @@ func TestSyncGameServer(t *testing.T) {
fixture := &v1alpha1.GameServer{ObjectMeta: metav1.ObjectMeta{Name: "test", Namespace: "default"},
Spec: newSingleContainerSpec(),
Status: v1alpha1.GameServerStatus{State: v1alpha1.Ready}}
- agonWatch := watch.NewFake()
+ agonesWatch := watch.NewFake()
podAction := false
- mocks.agonClient.AddWatchReactor("gameservers", k8stesting.DefaultWatchReactor(agonWatch, nil))
+ mocks.agonesClient.AddWatchReactor("gameservers", k8stesting.DefaultWatchReactor(agonesWatch, nil))
mocks.kubeClient.AddReactor("*", "pods", func(action k8stesting.Action) (bool, runtime.Object, error) {
if action.GetVerb() == "update" || action.GetVerb() == "delete" || action.GetVerb() == "create" || action.GetVerb() == "patch" {
podAction = true
@@ -145,7 +145,7 @@ func TestSyncGameServer(t *testing.T) {
_, cancel := startInformers(mocks, c.gameServerSynced)
defer cancel()
- agonWatch.Delete(fixture)
+ agonesWatch.Delete(fixture)
err := c.syncGameServer("default/test")
assert.Nil(t, err, fmt.Sprintf("Shouldn't be an error from syncGameServer: %+v", err))
@@ -163,7 +163,7 @@ func TestWatchGameServers(t *testing.T) {
gsWatch := watch.NewFake()
podWatch := watch.NewFake()
- mocks.agonClient.AddWatchReactor("gameservers", k8stesting.DefaultWatchReactor(gsWatch, nil))
+ mocks.agonesClient.AddWatchReactor("gameservers", k8stesting.DefaultWatchReactor(gsWatch, nil))
mocks.kubeClient.AddWatchReactor("pods", k8stesting.DefaultWatchReactor(podWatch, nil))
mocks.extClient.AddReactor("get", "customresourcedefinitions", func(action k8stesting.Action) (bool, runtime.Object, error) {
return true, newEstablishedCRD(), nil
@@ -272,7 +272,7 @@ func TestSyncGameServerDeletionTimestamp(t *testing.T) {
fixture.ApplyDefaults()
updated := false
- mocks.agonClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ mocks.agonesClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
updated = true
ua := action.(k8stesting.UpdateAction)
@@ -301,7 +301,7 @@ func TestSyncGameServerBlankState(t *testing.T) {
fixture := &v1alpha1.GameServer{ObjectMeta: metav1.ObjectMeta{Name: "test", Namespace: "default"}, Spec: newSingleContainerSpec()}
updated := false
- mocks.agonClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ mocks.agonesClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
updated = true
ua := action.(k8stesting.UpdateAction)
gs := ua.GetObject().(*v1alpha1.GameServer)
@@ -338,7 +338,7 @@ func TestSyncGameServerBlankState(t *testing.T) {
updated := false
- mocks.agonClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ mocks.agonesClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
updated = true
ua := action.(k8stesting.UpdateAction)
gs := ua.GetObject().(*v1alpha1.GameServer)
@@ -419,7 +419,7 @@ func TestSyncGameServerCreatingState(t *testing.T) {
assert.Equal(t, "POD_NAMESPACE", pod.Spec.Containers[1].Env[1].Name)
return true, pod, nil
})
- mocks.agonClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ mocks.agonesClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
gsUpdated = true
ua := action.(k8stesting.UpdateAction)
gs := ua.GetObject().(*v1alpha1.GameServer)
@@ -451,7 +451,7 @@ func TestSyncGameServerCreatingState(t *testing.T) {
podCreated = true
return true, nil, nil
})
- mocks.agonClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ mocks.agonesClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
gsUpdated = true
ua := action.(k8stesting.UpdateAction)
gs := ua.GetObject().(*v1alpha1.GameServer)
@@ -479,7 +479,7 @@ func TestSyncGameServerCreatingState(t *testing.T) {
podCreated = true
return true, nil, k8serrors.NewInvalid(schema.GroupKind{}, "test", field.ErrorList{})
})
- mocks.agonClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ mocks.agonesClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
gsUpdated = true
ua := action.(k8stesting.UpdateAction)
gs := ua.GetObject().(*v1alpha1.GameServer)
@@ -533,7 +533,7 @@ func TestSyncGameServerRequestReadyState(t *testing.T) {
mocks.kubeClient.AddReactor("list", "nodes", func(action k8stesting.Action) (bool, runtime.Object, error) {
return true, &corev1.NodeList{Items: []corev1.Node{node}}, nil
})
- mocks.agonClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ mocks.agonesClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
gsUpdated = true
ua := action.(k8stesting.UpdateAction)
gs := ua.GetObject().(*v1alpha1.GameServer)
@@ -583,7 +583,7 @@ func TestSyncGameServerShutdownState(t *testing.T) {
gsFixture.ApplyDefaults()
checkDeleted := false
- mocks.agonClient.AddReactor("delete", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ mocks.agonesClient.AddReactor("delete", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
checkDeleted = true
assert.Equal(t, "default", action.GetNamespace())
da := action.(k8stesting.DeleteAction)
@@ -744,7 +744,7 @@ func testNoChange(t *testing.T, state v1alpha1.State, f func(*Controller, *v1alp
Spec: newSingleContainerSpec(), Status: v1alpha1.GameServerStatus{State: state}}
fixture.ApplyDefaults()
updated := false
- mocks.agonClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ mocks.agonesClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
updated = true
return true, nil, nil
})
@@ -764,7 +764,7 @@ func testWithNonZeroDeletionTimestamp(t *testing.T, state v1alpha1.State, f func
Spec: newSingleContainerSpec(), Status: v1alpha1.GameServerStatus{State: state}}
fixture.ApplyDefaults()
updated := false
- mocks.agonClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ mocks.agonesClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
updated = true
return true, nil, nil
})
@@ -779,7 +779,7 @@ func testWithNonZeroDeletionTimestamp(t *testing.T, state v1alpha1.State, f func
func newFakeController() (*Controller, mocks) {
m := newMocks()
c := NewController(10, 20, "sidecar:dev", false,
- m.kubeClient, m.kubeInformationFactory, m.extClient, m.agonClient, m.agonInformerFactory)
+ m.kubeClient, m.kubeInformationFactory, m.extClient, m.agonesClient, m.agonesInformerFactory)
c.recorder = m.fakeRecorder
return c, m
}
diff --git a/pkg/gameservers/health.go b/pkg/gameservers/health.go
index 35f1ddce9f0bfab8da445a5e66fdd6a1d988fd3d..76592baaafe9e8d03261a290c5df5492941be892 100644
--- a/pkg/gameservers/health.go
+++ b/pkg/gameservers/health.go
@@ -17,13 +17,13 @@ package gameservers
import (
"time"
- "github.com/agonio/agon/pkg/apis/stable"
- "github.com/agonio/agon/pkg/apis/stable/v1alpha1"
- "github.com/agonio/agon/pkg/client/clientset/versioned"
- getterv1alpha1 "github.com/agonio/agon/pkg/client/clientset/versioned/typed/stable/v1alpha1"
- "github.com/agonio/agon/pkg/client/informers/externalversions"
- listerv1alpha1 "github.com/agonio/agon/pkg/client/listers/stable/v1alpha1"
- "github.com/agonio/agon/pkg/util/runtime"
+ "agones.dev/agones/pkg/apis/stable"
+ "agones.dev/agones/pkg/apis/stable/v1alpha1"
+ "agones.dev/agones/pkg/client/clientset/versioned"
+ getterv1alpha1 "agones.dev/agones/pkg/client/clientset/versioned/typed/stable/v1alpha1"
+ "agones.dev/agones/pkg/client/informers/externalversions"
+ listerv1alpha1 "agones.dev/agones/pkg/client/listers/stable/v1alpha1"
+ "agones.dev/agones/pkg/util/runtime"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
@@ -54,15 +54,15 @@ type HealthController struct {
}
// NewHealthController returns a HealthController
-func NewHealthController(kubeClient kubernetes.Interface, agonClient versioned.Interface, kubeInformerFactory informers.SharedInformerFactory,
- agonInformerFactory externalversions.SharedInformerFactory) *HealthController {
+func NewHealthController(kubeClient kubernetes.Interface, agonesClient versioned.Interface, kubeInformerFactory informers.SharedInformerFactory,
+ agonesInformerFactory externalversions.SharedInformerFactory) *HealthController {
podInformer := kubeInformerFactory.Core().V1().Pods().Informer()
hc := &HealthController{
podSynced: podInformer.HasSynced,
podLister: kubeInformerFactory.Core().V1().Pods().Lister(),
- gameServerGetter: agonClient.StableV1alpha1(),
- gameServerLister: agonInformerFactory.Stable().V1alpha1().GameServers().Lister(),
+ gameServerGetter: agonesClient.StableV1alpha1(),
+ gameServerLister: agonesInformerFactory.Stable().V1alpha1().GameServers().Lister(),
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), stable.GroupName+".HealthController"),
}
diff --git a/pkg/gameservers/health_test.go b/pkg/gameservers/health_test.go
index 490a3083f6a8d8312279066c9fc3ed64844bfbf2..b2b3cae2b6302ff6b526b3131a0fa647b17a5d0c 100644
--- a/pkg/gameservers/health_test.go
+++ b/pkg/gameservers/health_test.go
@@ -18,7 +18,7 @@ import (
"testing"
"time"
- "github.com/agonio/agon/pkg/apis/stable/v1alpha1"
+ "agones.dev/agones/pkg/apis/stable/v1alpha1"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -31,7 +31,7 @@ func TestHealthControllerFailedContainer(t *testing.T) {
t.Parallel()
m := newMocks()
- hc := NewHealthController(m.kubeClient, m.agonClient, m.kubeInformationFactory, m.agonInformerFactory)
+ hc := NewHealthController(m.kubeClient, m.agonesClient, m.kubeInformationFactory, m.agonesInformerFactory)
gs := v1alpha1.GameServer{ObjectMeta: v1.ObjectMeta{Name: "test"}, Spec: newSingleContainerSpec()}
gs.ApplyDefaults()
@@ -81,7 +81,7 @@ func TestHealthControllerSyncGameServer(t *testing.T) {
for name, test := range fixtures {
t.Run(name, func(t *testing.T) {
m := newMocks()
- hc := NewHealthController(m.kubeClient, m.agonClient, m.kubeInformationFactory, m.agonInformerFactory)
+ hc := NewHealthController(m.kubeClient, m.agonesClient, m.kubeInformationFactory, m.agonesInformerFactory)
gs := v1alpha1.GameServer{ObjectMeta: v1.ObjectMeta{Namespace: "default", Name: "test"}, Spec: newSingleContainerSpec(),
Status: v1alpha1.GameServerStatus{State: test.state}}
@@ -89,11 +89,11 @@ func TestHealthControllerSyncGameServer(t *testing.T) {
got := false
updated := false
- m.agonClient.AddReactor("list", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ m.agonesClient.AddReactor("list", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
got = true
return true, &v1alpha1.GameServerList{Items: []v1alpha1.GameServer{gs}}, nil
})
- m.agonClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ m.agonesClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
updated = true
ua := action.(k8stesting.UpdateAction)
gsObj := ua.GetObject().(*v1alpha1.GameServer)
@@ -115,17 +115,17 @@ func TestHealthControllerSyncGameServer(t *testing.T) {
func TestHealthControllerRun(t *testing.T) {
m := newMocks()
- hc := NewHealthController(m.kubeClient, m.agonClient, m.kubeInformationFactory, m.agonInformerFactory)
+ hc := NewHealthController(m.kubeClient, m.agonesClient, m.kubeInformationFactory, m.agonesInformerFactory)
hc.recorder = m.fakeRecorder
gsWatch := watch.NewFake()
- m.agonClient.AddWatchReactor("gameservers", k8stesting.DefaultWatchReactor(gsWatch, nil))
+ m.agonesClient.AddWatchReactor("gameservers", k8stesting.DefaultWatchReactor(gsWatch, nil))
podWatch := watch.NewFake()
m.kubeClient.AddWatchReactor("pods", k8stesting.DefaultWatchReactor(podWatch, nil))
updated := make(chan bool)
- m.agonClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ m.agonesClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
defer close(updated)
ua := action.(k8stesting.UpdateAction)
gsObj := ua.GetObject().(*v1alpha1.GameServer)
diff --git a/pkg/gameservers/helper_test.go b/pkg/gameservers/helper_test.go
index 3da649483fc3384dbb34852b549710538e9e3a98..02f3300099f9291dfedeefcfd95c569fb94d9388 100644
--- a/pkg/gameservers/helper_test.go
+++ b/pkg/gameservers/helper_test.go
@@ -23,10 +23,10 @@ import (
"net/http"
"testing"
- "github.com/agonio/agon/pkg/apis/stable/v1alpha1"
- agonfake "github.com/agonio/agon/pkg/client/clientset/versioned/fake"
- "github.com/agonio/agon/pkg/client/informers/externalversions"
- "github.com/agonio/agon/pkg/sdk"
+ "agones.dev/agones/pkg/apis/stable/v1alpha1"
+ agonesfake "agones.dev/agones/pkg/client/clientset/versioned/fake"
+ "agones.dev/agones/pkg/client/informers/externalversions"
+ "agones.dev/agones/pkg/sdk"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"google.golang.org/grpc/metadata"
@@ -44,8 +44,8 @@ type mocks struct {
kubeClient *kubefake.Clientset
kubeInformationFactory informers.SharedInformerFactory
extClient *extfake.Clientset
- agonClient *agonfake.Clientset
- agonInformerFactory externalversions.SharedInformerFactory
+ agonesClient *agonesfake.Clientset
+ agonesInformerFactory externalversions.SharedInformerFactory
fakeRecorder *record.FakeRecorder
}
@@ -53,14 +53,14 @@ func newMocks() mocks {
kubeClient := &kubefake.Clientset{}
kubeInformationFactory := informers.NewSharedInformerFactory(kubeClient, 30*time.Second)
extClient := &extfake.Clientset{}
- agonClient := &agonfake.Clientset{}
- agonInformerFactory := externalversions.NewSharedInformerFactory(agonClient, 30*time.Second)
+ agonesClient := &agonesfake.Clientset{}
+ agonesInformerFactory := externalversions.NewSharedInformerFactory(agonesClient, 30*time.Second)
m := mocks{
kubeClient: kubeClient,
kubeInformationFactory: kubeInformationFactory,
extClient: extClient,
- agonClient: agonClient,
- agonInformerFactory: agonInformerFactory,
+ agonesClient: agonesClient,
+ agonesInformerFactory: agonesInformerFactory,
fakeRecorder: record.NewFakeRecorder(10),
}
return m
@@ -71,7 +71,7 @@ func startInformers(mocks mocks, sync ...cache.InformerSynced) (<-chan struct{},
stop := ctx.Done()
mocks.kubeInformationFactory.Start(stop)
- mocks.agonInformerFactory.Start(stop)
+ mocks.agonesInformerFactory.Start(stop)
logrus.Info("Wait for cache sync")
if !cache.WaitForCacheSync(stop, sync...) {
diff --git a/pkg/gameservers/localsdk.go b/pkg/gameservers/localsdk.go
index 4214ca6585326e21672050e0f3b3f89b2a883a4e..f8ddb29fd87cc3639dde24e4d736ec9c33ad7bb3 100644
--- a/pkg/gameservers/localsdk.go
+++ b/pkg/gameservers/localsdk.go
@@ -17,7 +17,7 @@ package gameservers
import (
"io"
- "github.com/agonio/agon/pkg/sdk"
+ "agones.dev/agones/pkg/sdk"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
diff --git a/pkg/gameservers/localsdk_test.go b/pkg/gameservers/localsdk_test.go
index 43c01481e5473f73a3907cb4c3a49fd28f901148..80eeea283f7c21cb2712bbb40cd3f2728bb7cec2 100644
--- a/pkg/gameservers/localsdk_test.go
+++ b/pkg/gameservers/localsdk_test.go
@@ -18,7 +18,7 @@ import (
"sync"
"testing"
- "github.com/agonio/agon/pkg/sdk"
+ "agones.dev/agones/pkg/sdk"
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
)
diff --git a/pkg/gameservers/portallocator.go b/pkg/gameservers/portallocator.go
index 206d17a3ee28148185bc5f99202ada1a0c06ad9c..86dc261c1397f9e70ed885e4c14cac3d4b08132d 100644
--- a/pkg/gameservers/portallocator.go
+++ b/pkg/gameservers/portallocator.go
@@ -17,10 +17,10 @@ package gameservers
import (
"sync"
- "github.com/agonio/agon/pkg/apis/stable/v1alpha1"
- "github.com/agonio/agon/pkg/client/informers/externalversions"
- listerv1alpha1 "github.com/agonio/agon/pkg/client/listers/stable/v1alpha1"
- "github.com/agonio/agon/pkg/util/runtime"
+ "agones.dev/agones/pkg/apis/stable/v1alpha1"
+ "agones.dev/agones/pkg/client/informers/externalversions"
+ listerv1alpha1 "agones.dev/agones/pkg/client/listers/stable/v1alpha1"
+ "agones.dev/agones/pkg/util/runtime"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
@@ -59,12 +59,12 @@ type PortAllocator struct {
// the game servers
func NewPortAllocator(minPort, maxPort int32,
kubeInformerFactory informers.SharedInformerFactory,
- agonInformerFactory externalversions.SharedInformerFactory) *PortAllocator {
+ agonesInformerFactory externalversions.SharedInformerFactory) *PortAllocator {
logrus.WithField("minPort", minPort).WithField("maxPort", maxPort).Info("Starting port allocator")
v1 := kubeInformerFactory.Core().V1()
nodes := v1.Nodes()
- gameServers := agonInformerFactory.Stable().V1alpha1().GameServers()
+ gameServers := agonesInformerFactory.Stable().V1alpha1().GameServers()
pa := &PortAllocator{
mutex: sync.RWMutex{},
diff --git a/pkg/gameservers/portallocator_test.go b/pkg/gameservers/portallocator_test.go
index 65767f98ea729ed20b12103cfa0ef437d77d78a1..86119e051bf1dde486edf1457dcf03559540a344 100644
--- a/pkg/gameservers/portallocator_test.go
+++ b/pkg/gameservers/portallocator_test.go
@@ -20,7 +20,7 @@ import (
"sync"
- "github.com/agonio/agon/pkg/apis/stable/v1alpha1"
+ "agones.dev/agones/pkg/apis/stable/v1alpha1"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
@@ -42,7 +42,7 @@ func TestPortAllocatorAllocate(t *testing.T) {
t.Run("ports are all allocated", func(t *testing.T) {
m := newMocks()
- pa := NewPortAllocator(10, 20, m.kubeInformationFactory, m.agonInformerFactory)
+ pa := NewPortAllocator(10, 20, m.kubeInformationFactory, m.agonesInformerFactory)
nodeWatch := watch.NewFake()
m.kubeClient.AddWatchReactor("nodes", k8stesting.DefaultWatchReactor(nodeWatch, nil))
@@ -74,7 +74,7 @@ func TestPortAllocatorAllocate(t *testing.T) {
t.Run("ports are unique in a node", func(t *testing.T) {
m := newMocks()
- pa := NewPortAllocator(10, 20, m.kubeInformationFactory, m.agonInformerFactory)
+ pa := NewPortAllocator(10, 20, m.kubeInformationFactory, m.agonesInformerFactory)
m.kubeClient.AddReactor("list", "nodes", func(action k8stesting.Action) (bool, runtime.Object, error) {
nl := &corev1.NodeList{Items: []corev1.Node{n1}}
@@ -96,7 +96,7 @@ func TestPortAllocatorAllocate(t *testing.T) {
func TestPortAllocatorMultithreadAllocate(t *testing.T) {
m := newMocks()
- pa := NewPortAllocator(10, 110, m.kubeInformationFactory, m.agonInformerFactory)
+ pa := NewPortAllocator(10, 110, m.kubeInformationFactory, m.agonesInformerFactory)
m.kubeClient.AddReactor("list", "nodes", func(action k8stesting.Action) (bool, runtime.Object, error) {
nl := &corev1.NodeList{Items: []corev1.Node{n1, n2}}
@@ -127,14 +127,14 @@ func TestPortAllocatorSyncPortAllocations(t *testing.T) {
t.Parallel()
m := newMocks()
- pa := NewPortAllocator(10, 20, m.kubeInformationFactory, m.agonInformerFactory)
+ pa := NewPortAllocator(10, 20, m.kubeInformationFactory, m.agonesInformerFactory)
m.kubeClient.AddReactor("list", "nodes", func(action k8stesting.Action) (bool, runtime.Object, error) {
nl := &corev1.NodeList{Items: []corev1.Node{n1, n2, n3}}
return true, nl, nil
})
- m.agonClient.AddReactor("list", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ m.agonesClient.AddReactor("list", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
gs1 := v1alpha1.GameServer{ObjectMeta: metav1.ObjectMeta{Name: "gs1"}, Spec: v1alpha1.GameServerSpec{HostPort: 10},
Status: v1alpha1.GameServerStatus{State: v1alpha1.Ready, Port: 10, NodeName: n1.ObjectMeta.Name}}
gs2 := v1alpha1.GameServer{ObjectMeta: metav1.ObjectMeta{Name: "gs2"}, Spec: v1alpha1.GameServerSpec{HostPort: 10},
@@ -172,20 +172,20 @@ func TestPortAllocatorSyncDeleteGameServer(t *testing.T) {
m := newMocks()
fakeWatch := watch.NewFake()
- m.agonClient.AddWatchReactor("gameservers", k8stesting.DefaultWatchReactor(fakeWatch, nil))
+ m.agonesClient.AddWatchReactor("gameservers", k8stesting.DefaultWatchReactor(fakeWatch, nil))
gs1Fixture := &v1alpha1.GameServer{ObjectMeta: metav1.ObjectMeta{Name: "gs4"}, Spec: v1alpha1.GameServerSpec{HostPort: 10}}
gs2Fixture := gs1Fixture.DeepCopy()
gs2Fixture.ObjectMeta.Name = "gs5"
- pa := NewPortAllocator(10, 20, m.kubeInformationFactory, m.agonInformerFactory)
+ pa := NewPortAllocator(10, 20, m.kubeInformationFactory, m.agonesInformerFactory)
m.kubeClient.AddReactor("list", "nodes", func(action k8stesting.Action) (bool, runtime.Object, error) {
nl := &corev1.NodeList{Items: []corev1.Node{n1, n2, n3}}
return true, nl, nil
})
- m.agonClient.AddReactor("list", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ m.agonesClient.AddReactor("list", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
gs1 := v1alpha1.GameServer{ObjectMeta: metav1.ObjectMeta{Name: "gs1"}, Spec: v1alpha1.GameServerSpec{HostPort: 10},
Status: v1alpha1.GameServerStatus{State: v1alpha1.Ready, Port: 10, NodeName: n1.ObjectMeta.Name}}
gs2 := v1alpha1.GameServer{ObjectMeta: metav1.ObjectMeta{Name: "gs2"}, Spec: v1alpha1.GameServerSpec{HostPort: 11},
@@ -237,11 +237,11 @@ func TestPortAllocatorSyncDeleteGameServer(t *testing.T) {
func TestPortAllocatorNodeEvents(t *testing.T) {
m := newMocks()
- pa := NewPortAllocator(10, 20, m.kubeInformationFactory, m.agonInformerFactory)
+ pa := NewPortAllocator(10, 20, m.kubeInformationFactory, m.agonesInformerFactory)
nodeWatch := watch.NewFake()
gsWatch := watch.NewFake()
m.kubeClient.AddWatchReactor("nodes", k8stesting.DefaultWatchReactor(nodeWatch, nil))
- m.agonClient.AddWatchReactor("gameservers", k8stesting.DefaultWatchReactor(gsWatch, nil))
+ m.agonesClient.AddWatchReactor("gameservers", k8stesting.DefaultWatchReactor(gsWatch, nil))
stop, cancel := startInformers(m)
defer cancel()
@@ -311,7 +311,7 @@ func TestNodePortAllocation(t *testing.T) {
t.Parallel()
m := newMocks()
- pa := NewPortAllocator(10, 20, m.kubeInformationFactory, m.agonInformerFactory)
+ pa := NewPortAllocator(10, 20, m.kubeInformationFactory, m.agonesInformerFactory)
nodes := []corev1.Node{n1, n2, n3}
m.kubeClient.AddReactor("list", "nodes", func(action k8stesting.Action) (bool, runtime.Object, error) {
nl := &corev1.NodeList{Items: nodes}
diff --git a/pkg/gameservers/sdkserver.go b/pkg/gameservers/sdkserver.go
index c7f3cfb01efcf39c87b2cdb5b39073ba5a3e85b9..c8ae690f132b82be6de3e8c6d0f21fe5f20b5dcc 100644
--- a/pkg/gameservers/sdkserver.go
+++ b/pkg/gameservers/sdkserver.go
@@ -21,12 +21,12 @@ import (
"sync"
"time"
- "github.com/agonio/agon/pkg/apis/stable"
- stablev1alpha1 "github.com/agonio/agon/pkg/apis/stable/v1alpha1"
- "github.com/agonio/agon/pkg/client/clientset/versioned"
- typedv1alpha1 "github.com/agonio/agon/pkg/client/clientset/versioned/typed/stable/v1alpha1"
- "github.com/agonio/agon/pkg/sdk"
- "github.com/agonio/agon/pkg/util/runtime"
+ "agones.dev/agones/pkg/apis/stable"
+ stablev1alpha1 "agones.dev/agones/pkg/apis/stable/v1alpha1"
+ "agones.dev/agones/pkg/client/clientset/versioned"
+ typedv1alpha1 "agones.dev/agones/pkg/client/clientset/versioned/typed/stable/v1alpha1"
+ "agones.dev/agones/pkg/sdk"
+ "agones.dev/agones/pkg/util/runtime"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
@@ -66,7 +66,7 @@ type SDKServer struct {
func NewSDKServer(gameServerName, namespace string,
healthDisabled bool, healthTimeout time.Duration, healthFailureThreshold int64, healthInitialDelay time.Duration,
kubeClient kubernetes.Interface,
- agonClient versioned.Interface) (*SDKServer, error) {
+ agonesClient versioned.Interface) (*SDKServer, error) {
mux := http.NewServeMux()
mux.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) {
_, err := w.Write([]byte("ok"))
@@ -84,7 +84,7 @@ func NewSDKServer(gameServerName, namespace string,
s := &SDKServer{
gameServerName: gameServerName,
namespace: namespace,
- gameServerGetter: agonClient.StableV1alpha1(),
+ gameServerGetter: agonesClient.StableV1alpha1(),
server: &http.Server{
Addr: ":8080",
Handler: mux,
diff --git a/pkg/gameservers/sdkserver_test.go b/pkg/gameservers/sdkserver_test.go
index 358c159364977665a29cc44ace2c34b61a84ae48..9dfa99823e9d78b87322d72d29feab964689bb47 100644
--- a/pkg/gameservers/sdkserver_test.go
+++ b/pkg/gameservers/sdkserver_test.go
@@ -20,8 +20,8 @@ import (
"testing"
"time"
- "github.com/agonio/agon/pkg/apis/stable/v1alpha1"
- "github.com/agonio/agon/pkg/sdk"
+ "agones.dev/agones/pkg/apis/stable/v1alpha1"
+ "agones.dev/agones/pkg/sdk"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
@@ -64,7 +64,7 @@ func TestSidecarRun(t *testing.T) {
m := newMocks()
done := make(chan bool)
- m.agonClient.AddReactor("get", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ m.agonesClient.AddReactor("get", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
gs := &v1alpha1.GameServer{
Status: v1alpha1.GameServerStatus{
State: v1alpha1.Starting,
@@ -72,7 +72,7 @@ func TestSidecarRun(t *testing.T) {
}
return true, gs, nil
})
- m.agonClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ m.agonesClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
defer close(done)
ua := action.(k8stesting.UpdateAction)
gs := ua.GetObject().(*v1alpha1.GameServer)
@@ -83,7 +83,7 @@ func TestSidecarRun(t *testing.T) {
})
sc, err := NewSDKServer("test", "default",
- false, time.Second, 1, 0, m.kubeClient, m.agonClient)
+ false, time.Second, 1, 0, m.kubeClient, m.agonesClient)
sc.recorder = m.fakeRecorder
assert.Nil(t, err)
@@ -118,7 +118,7 @@ func TestSidecarUpdateState(t *testing.T) {
updated := false
- m.agonClient.AddReactor("get", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ m.agonesClient.AddReactor("get", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
gs := &v1alpha1.GameServer{
Status: v1alpha1.GameServerStatus{
State: v1alpha1.Unhealthy,
@@ -126,7 +126,7 @@ func TestSidecarUpdateState(t *testing.T) {
}
return true, gs, nil
})
- m.agonClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
+ m.agonesClient.AddReactor("update", "gameservers", func(action k8stesting.Action) (bool, runtime.Object, error) {
updated = true
return true, nil, nil
})
@@ -285,7 +285,7 @@ func TestSidecarHealthy(t *testing.T) {
func TestSidecarHTTPHealthCheck(t *testing.T) {
m := newMocks()
sc, err := NewSDKServer("test", "default",
- false, 1*time.Second, 1, 0, m.kubeClient, m.agonClient)
+ false, 1*time.Second, 1, 0, m.kubeClient, m.agonesClient)
assert.Nil(t, err)
now := time.Now().Add(time.Hour).UTC()
fc := clock.NewFakeClock(now)
@@ -309,7 +309,7 @@ func TestSidecarHTTPHealthCheck(t *testing.T) {
func defaultSidecar(mocks mocks) (*SDKServer, error) {
return NewSDKServer("test", "default",
- true, 5*time.Second, 1, 0, mocks.kubeClient, mocks.agonClient)
+ true, 5*time.Second, 1, 0, mocks.kubeClient, mocks.agonesClient)
}
func waitForMessage(sc *SDKServer) error {
diff --git a/pkg/sdk/sdk.pb.go b/pkg/sdk/sdk.pb.go
index 10596f332285f62e64d5939b9e27ec91d45096e4..481de84a0edd368f1ab96ec2dbcd9675e7ca098d 100644
--- a/pkg/sdk/sdk.pb.go
+++ b/pkg/sdk/sdk.pb.go
@@ -56,7 +56,7 @@ func (*Empty) ProtoMessage() {}
func (*Empty) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
func init() {
- proto.RegisterType((*Empty)(nil), "stable.agon.io.sdk.Empty")
+ proto.RegisterType((*Empty)(nil), "stable.agones.dev.sdk.Empty")
}
// Reference imports to suppress errors if they are not otherwise used.
@@ -88,7 +88,7 @@ func NewSDKClient(cc *grpc.ClientConn) SDKClient {
func (c *sDKClient) Ready(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error) {
out := new(Empty)
- err := grpc.Invoke(ctx, "/stable.agon.io.sdk.SDK/Ready", in, out, c.cc, opts...)
+ err := grpc.Invoke(ctx, "/stable.agones.dev.sdk.SDK/Ready", in, out, c.cc, opts...)
if err != nil {
return nil, err
}
@@ -97,7 +97,7 @@ func (c *sDKClient) Ready(ctx context.Context, in *Empty, opts ...grpc.CallOptio
func (c *sDKClient) Shutdown(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error) {
out := new(Empty)
- err := grpc.Invoke(ctx, "/stable.agon.io.sdk.SDK/Shutdown", in, out, c.cc, opts...)
+ err := grpc.Invoke(ctx, "/stable.agones.dev.sdk.SDK/Shutdown", in, out, c.cc, opts...)
if err != nil {
return nil, err
}
@@ -105,7 +105,7 @@ func (c *sDKClient) Shutdown(ctx context.Context, in *Empty, opts ...grpc.CallOp
}
func (c *sDKClient) Health(ctx context.Context, opts ...grpc.CallOption) (SDK_HealthClient, error) {
- stream, err := grpc.NewClientStream(ctx, &_SDK_serviceDesc.Streams[0], c.cc, "/stable.agon.io.sdk.SDK/Health", opts...)
+ stream, err := grpc.NewClientStream(ctx, &_SDK_serviceDesc.Streams[0], c.cc, "/stable.agones.dev.sdk.SDK/Health", opts...)
if err != nil {
return nil, err
}
@@ -163,7 +163,7 @@ func _SDK_Ready_Handler(srv interface{}, ctx context.Context, dec func(interface
}
info := &grpc.UnaryServerInfo{
Server: srv,
- FullMethod: "/stable.agon.io.sdk.SDK/Ready",
+ FullMethod: "/stable.agones.dev.sdk.SDK/Ready",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(SDKServer).Ready(ctx, req.(*Empty))
@@ -181,7 +181,7 @@ func _SDK_Shutdown_Handler(srv interface{}, ctx context.Context, dec func(interf
}
info := &grpc.UnaryServerInfo{
Server: srv,
- FullMethod: "/stable.agon.io.sdk.SDK/Shutdown",
+ FullMethod: "/stable.agones.dev.sdk.SDK/Shutdown",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(SDKServer).Shutdown(ctx, req.(*Empty))
@@ -216,7 +216,7 @@ func (x *sDKHealthServer) Recv() (*Empty, error) {
}
var _SDK_serviceDesc = grpc.ServiceDesc{
- ServiceName: "stable.agon.io.sdk.SDK",
+ ServiceName: "stable.agones.dev.sdk.SDK",
HandlerType: (*SDKServer)(nil),
Methods: []grpc.MethodDesc{
{
@@ -241,14 +241,14 @@ var _SDK_serviceDesc = grpc.ServiceDesc{
func init() { proto.RegisterFile("sdk.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{
- // 133 bytes of a gzipped FileDescriptorProto
+ // 136 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2c, 0x4e, 0xc9, 0xd6,
- 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x2a, 0x2e, 0x49, 0x4c, 0xca, 0x49, 0xd5, 0x4b, 0x4c,
- 0xcf, 0xcf, 0xd3, 0xcb, 0xcc, 0xd7, 0x2b, 0x4e, 0xc9, 0x56, 0x62, 0xe7, 0x62, 0x75, 0xcd, 0x2d,
- 0x28, 0xa9, 0x34, 0x3a, 0xc7, 0xc8, 0xc5, 0x1c, 0xec, 0xe2, 0x2d, 0x64, 0xcf, 0xc5, 0x1a, 0x94,
- 0x9a, 0x98, 0x52, 0x29, 0x24, 0xa9, 0x87, 0xa9, 0x5c, 0x0f, 0xac, 0x56, 0x0a, 0xb7, 0x94, 0x12,
- 0x83, 0x90, 0x13, 0x17, 0x47, 0x70, 0x46, 0x69, 0x49, 0x4a, 0x7e, 0x79, 0x1e, 0x05, 0x66, 0xb0,
- 0x79, 0xa4, 0x26, 0xe6, 0x94, 0x64, 0x90, 0x6b, 0x82, 0x06, 0xa3, 0x13, 0x6b, 0x14, 0x73, 0x71,
- 0x4a, 0x76, 0x12, 0x1b, 0xd8, 0xef, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x22, 0x81,
- 0x1e, 0x08, 0x01, 0x00, 0x00,
+ 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x2d, 0x2e, 0x49, 0x4c, 0xca, 0x49, 0xd5, 0x4b, 0x4c,
+ 0xcf, 0xcf, 0x4b, 0x2d, 0xd6, 0x4b, 0x49, 0x2d, 0xd3, 0x2b, 0x4e, 0xc9, 0x56, 0x62, 0xe7, 0x62,
+ 0x75, 0xcd, 0x2d, 0x28, 0xa9, 0x34, 0x7a, 0xc0, 0xc8, 0xc5, 0x1c, 0xec, 0xe2, 0x2d, 0xe4, 0xca,
+ 0xc5, 0x1a, 0x94, 0x9a, 0x98, 0x52, 0x29, 0x24, 0xa3, 0x87, 0x55, 0x87, 0x1e, 0x58, 0xb9, 0x14,
+ 0x5e, 0x59, 0x25, 0x06, 0x21, 0x0f, 0x2e, 0x8e, 0xe0, 0x8c, 0xd2, 0x92, 0x94, 0xfc, 0xf2, 0x3c,
+ 0x8a, 0x4d, 0x62, 0xf3, 0x48, 0x4d, 0xcc, 0x29, 0xc9, 0xa0, 0xcc, 0x1c, 0x0d, 0x46, 0x27, 0xd6,
+ 0x28, 0xe6, 0xe2, 0x94, 0xec, 0x24, 0x36, 0x70, 0x80, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff,
+ 0x67, 0x99, 0xbb, 0xc6, 0x1d, 0x01, 0x00, 0x00,
}
diff --git a/pkg/version.go b/pkg/version.go
index ade4470e42b9db80cf8231210bd8132267c395b9..030919b1bc6909607ae27a852155ebca64d144d0 100644
--- a/pkg/version.go
+++ b/pkg/version.go
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package pkg
+package pkg // import "agones.dev/agones/pkg"
var (
// Version is the global version for all binaries
diff --git a/sdk.proto b/sdk.proto
index d38fb0752b2ce1ca0a3b11ad077ccc00044eb789..7fa1647dea7e255cf245c79f2ba3ff3c05a067f6 100644
--- a/sdk.proto
+++ b/sdk.proto
@@ -14,7 +14,7 @@
syntax = "proto3";
-package stable.agon.io.sdk;
+package stable.agones.dev.sdk;
option go_package = "sdk";
// SDK service to be used in the GameServer SDK to the Pod Sidecar
diff --git a/sdks/README.md b/sdks/README.md
index b79e6e7cd627948a48b84293fefb4395543e1111..2894370bcbede2e9a834f5bef42ddc32c0e561e8 100644
--- a/sdks/README.md
+++ b/sdks/README.md
@@ -1,15 +1,15 @@
-# Agon Game Server Client SDKs
+# Agones Game Server Client SDKs
-The SDKs are integration points for game servers with Agon itself.
+The SDKs are integration points for game servers with Agones itself.
-They are required for a game server to work with Agon.
+They are required for a game server to work with Agones.
There are currently two support SDKs:
- [C++](cpp)
- [Go](go)
The SDKs are relatively thin wrappers around [gRPC](https://grpc.io), generated clients,
-which connects to a small process that Agon coordinates to run alongside the Game Server
+which connects to a small process that Agones coordinates to run alongside the Game Server
in a Kubernetes [`Pod`](https://kubernetes.io/docs/concepts/workloads/pods/pod-overview/).
This means that more languages can be supported in the future with minimal effort
(but pull requests are welcome! 😊 ).
@@ -23,7 +23,7 @@ For language specific documentation, have a look at the respective source (linke
and the [examples](../examples)
### Ready()
-This tells Agon that the Game Server is ready to take player connections.
+This tells Agones that the Game Server is ready to take player connections.
One a Game Server has specified that it is `Ready`, then the Kubernetes
GameServer record will be moved to the `Ready` state, and the details
for its public address and connection port will be populated.
@@ -37,28 +37,28 @@ See the [gameserver.yaml](../examples/gameserver.yaml) for all health checking
configurations.
### Shutdown()
-This tells Agon to shut down the currently running game server.
+This tells Agones to shut down the currently running game server.
The GameServer state will be set `Shutdown` and the
backing Pod will be deleted, if they have not shut themselves down already.
## Local Development
-_Note:_ There has yet to be a release of Agon, so if you want the local
+_Note:_ There has yet to be a release of Agones, so if you want the local
development tools, you will need to [build from source](build/README.md).
If you do not wish to `make build` and build everything,
-the `make` target `build-agon-sdk-binary` will compile the necessary binaries
+the `make` target `build-agones-sdk-binary` will compile the necessary binaries
for all supported operating systems (64 bit windows, linux and osx).
You can find the binaries in the `bin` folder in [`cmd/sdk-server`](../cmd/sdk-server)
once compilation is complete.
-When the game server is running on Agon, the SDK communicates over TCP to a small
-gRPC server that Agon coordinated to runs in a container in the same network
+When the game server is running on Agones, the SDK communicates over TCP to a small
+gRPC server that Agones coordinated to runs in a container in the same network
namespace as it - usually referred to in Kubernetes terms as a "sidecar".
Therefore, when developing locally, we also need a process for the SDK to connect to!
-To do this, we can run the same binary that runs inside Agon, but pass in a flag
+To do this, we can run the same binary that runs inside Agones, but pass in a flag
to run it in "local mode". Local mode means that the sidecar binary
won't try and connect to anything, and will just send logs messages to stdout so
that you can see exactly what the SDK in your game server is doing, and can
diff --git a/sdks/cpp/Makefile b/sdks/cpp/Makefile
index fc70bd9b78d1afa09541a0c92766619e41b7bc95..c62815ad9b53e03b492d46902f081d9f4aecc14e 100644
--- a/sdks/cpp/Makefile
+++ b/sdks/cpp/Makefile
@@ -40,18 +40,18 @@ build_path := $(dir $(mkfile_path))
# |___/
# build the library
-build: ensure-bin libagonsdk
+build: ensure-bin libagonessdk
# install into /usr/local in the appropriate places
# make sure to install protoc and grpc from source first to build dependencies
install:
- cp $(build_path)/bin/libagonsdk.* /usr/local/lib
- -mkdir -p /usr/local/include/agon
- cp $(build_path)/*.h /usr/local/include/agon/
+ cp $(build_path)/bin/libagonessdk.* /usr/local/lib
+ -mkdir -p /usr/local/include/agones
+ cp $(build_path)/*.h /usr/local/include/agones/
ldconfig
# make the .so build
-libagonsdk: sdk.grpc.pb.o sdk.pb.o sdk.o
+libagonessdk: sdk.grpc.pb.o sdk.pb.o sdk.o
$(CXX) $^ $(LDFLAGS) -shared -o $(build_path)/bin/$@.so
ar rcs $(build_path)/bin/$@.a $^
@@ -62,15 +62,15 @@ ensure-bin:
# build dev and runtime tarballs
archive: VERSION = "dev"
archive:
- -rm $(build_path)/bin/argonsdk-$(VERSION)-dev-linux-arch_64.tar.gz
- -rm $(build_path)/bin/argonsdk-$(VERSION)-runtime-linux-arch_64.tar.gz
+ -rm $(build_path)/bin/agonessdk-$(VERSION)-dev-linux-arch_64.tar.gz
+ -rm $(build_path)/bin/agonessdk-$(VERSION)-runtime-linux-arch_64.tar.gz
cp /usr/local/lib/libgrpc.so.5 $(build_path)/bin/
cp /usr/local/lib/libprotobuf.so.15 $(build_path)/bin/
- cp /usr/local/lib/libagonsdk.so $(build_path)/bin/
+ cp /usr/local/lib/libagonessdk.so $(build_path)/bin/
cp /usr/local/lib/libgpr.so.5 $(build_path)/bin/
cp /usr/local/lib/libgrpc_unsecure.so.5 $(build_path)/bin/
- cd $(build_path)/bin && tar cvf argonsdk-$(VERSION)-runtime-linux-arch_64.tar.gz *
- cd /usr/local && tar cvf $(build_path)/bin/argonsdk-$(VERSION)-dev-linux-arch_64.tar.gz lib include
+ cd $(build_path)/bin && tar cvf agonessdk-$(VERSION)-runtime-linux-arch_64.tar.gz *
+ cd /usr/local && tar cvf $(build_path)/bin/agonessdk-$(VERSION)-dev-linux-arch_64.tar.gz lib include
clean:
-rm -r $(build_path)/bin
diff --git a/sdks/cpp/README.md b/sdks/cpp/README.md
index bbd34dd7dc760bc22f6bd3c254b31455b537ab65..207e1b5f01ddee5372837d69b089b28af8213c7d 100644
--- a/sdks/cpp/README.md
+++ b/sdks/cpp/README.md
@@ -5,7 +5,7 @@ Read the [SDK Overview](../), check out [sdk.h](sdk.h) and also look at the
[C++ example](../../examples/cpp-simple).
## Dynamic and Static Libraries
-_Note:_ There has yet to be a release of Agon, so if you want static and dynamic libraries,
+_Note:_ There has yet to be a release of Agones, so if you want static and dynamic libraries,
you will need to [build from source](build/README.md).
If you do not wish to `make build` and build everything,
diff --git a/sdks/cpp/sdk.cc b/sdks/cpp/sdk.cc
index 773c5094d1955c224e41c2d6e880ed7c9e6aafb4..4cc211f9200a8f1bd42e4b857ecb387a3fc27934 100644
--- a/sdks/cpp/sdk.cc
+++ b/sdks/cpp/sdk.cc
@@ -15,7 +15,7 @@
#include "sdk.h"
#include "sdk.pb.h"
-namespace agon {
+namespace agones {
const int port = 59357;
@@ -28,10 +28,10 @@ namespace agon {
return false;
}
- stub = stable::agon::io::sdk::SDK::NewStub(channel);
+ stub = stable::agones::dev::sdk::SDK::NewStub(channel);
// make the health connection
- stable::agon::io::sdk::Empty response;
+ stable::agones::dev::sdk::Empty response;
health = stub->Health(new grpc::ClientContext(), &response);
return true;
@@ -40,22 +40,22 @@ namespace agon {
grpc::Status SDK::Ready() {
grpc::ClientContext *context = new grpc::ClientContext();
context->set_deadline(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_seconds(30, GPR_TIMESPAN)));
- stable::agon::io::sdk::Empty request;
- stable::agon::io::sdk::Empty response;
+ stable::agones::dev::sdk::Empty request;
+ stable::agones::dev::sdk::Empty response;
return stub->Ready(context, request, &response);
}
bool SDK::Health() {
- stable::agon::io::sdk::Empty request;
+ stable::agones::dev::sdk::Empty request;
return health->Write(request);
}
grpc::Status SDK::Shutdown() {
grpc::ClientContext *context = new grpc::ClientContext();
context->set_deadline(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_seconds(30, GPR_TIMESPAN)));
- stable::agon::io::sdk::Empty request;
- stable::agon::io::sdk::Empty response;
+ stable::agones::dev::sdk::Empty request;
+ stable::agones::dev::sdk::Empty response;
return stub->Shutdown(context, request, &response);
}
diff --git a/sdks/cpp/sdk.grpc.pb.cc b/sdks/cpp/sdk.grpc.pb.cc
index 4dcd6e156e8c1be1d3ee5d5ced437fd07852dbc0..664bf89eab5b9827e5c0317e7b43270098c340ed 100644
--- a/sdks/cpp/sdk.grpc.pb.cc
+++ b/sdks/cpp/sdk.grpc.pb.cc
@@ -29,14 +29,14 @@
#include <grpc++/impl/codegen/service_type.h>
#include <grpc++/impl/codegen/sync_stream.h>
namespace stable {
-namespace agon {
-namespace io {
+namespace agones {
+namespace dev {
namespace sdk {
static const char* SDK_method_names[] = {
- "/stable.agon.io.sdk.SDK/Ready",
- "/stable.agon.io.sdk.SDK/Shutdown",
- "/stable.agon.io.sdk.SDK/Health",
+ "/stable.agones.dev.sdk.SDK/Ready",
+ "/stable.agones.dev.sdk.SDK/Shutdown",
+ "/stable.agones.dev.sdk.SDK/Health",
};
std::unique_ptr< SDK::Stub> SDK::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) {
@@ -50,78 +50,78 @@ SDK::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel)
, rpcmethod_Health_(SDK_method_names[2], ::grpc::internal::RpcMethod::CLIENT_STREAMING, channel)
{}
-::grpc::Status SDK::Stub::Ready(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::stable::agon::io::sdk::Empty* response) {
+::grpc::Status SDK::Stub::Ready(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::stable::agones::dev::sdk::Empty* response) {
return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_Ready_, context, request, response);
}
-::grpc::ClientAsyncResponseReader< ::stable::agon::io::sdk::Empty>* SDK::Stub::AsyncReadyRaw(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
- return ::grpc::internal::ClientAsyncResponseReaderFactory< ::stable::agon::io::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_Ready_, context, request, true);
+::grpc::ClientAsyncResponseReader< ::stable::agones::dev::sdk::Empty>* SDK::Stub::AsyncReadyRaw(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
+ return ::grpc::internal::ClientAsyncResponseReaderFactory< ::stable::agones::dev::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_Ready_, context, request, true);
}
-::grpc::ClientAsyncResponseReader< ::stable::agon::io::sdk::Empty>* SDK::Stub::PrepareAsyncReadyRaw(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
- return ::grpc::internal::ClientAsyncResponseReaderFactory< ::stable::agon::io::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_Ready_, context, request, false);
+::grpc::ClientAsyncResponseReader< ::stable::agones::dev::sdk::Empty>* SDK::Stub::PrepareAsyncReadyRaw(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
+ return ::grpc::internal::ClientAsyncResponseReaderFactory< ::stable::agones::dev::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_Ready_, context, request, false);
}
-::grpc::Status SDK::Stub::Shutdown(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::stable::agon::io::sdk::Empty* response) {
+::grpc::Status SDK::Stub::Shutdown(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::stable::agones::dev::sdk::Empty* response) {
return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_Shutdown_, context, request, response);
}
-::grpc::ClientAsyncResponseReader< ::stable::agon::io::sdk::Empty>* SDK::Stub::AsyncShutdownRaw(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
- return ::grpc::internal::ClientAsyncResponseReaderFactory< ::stable::agon::io::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_Shutdown_, context, request, true);
+::grpc::ClientAsyncResponseReader< ::stable::agones::dev::sdk::Empty>* SDK::Stub::AsyncShutdownRaw(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
+ return ::grpc::internal::ClientAsyncResponseReaderFactory< ::stable::agones::dev::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_Shutdown_, context, request, true);
}
-::grpc::ClientAsyncResponseReader< ::stable::agon::io::sdk::Empty>* SDK::Stub::PrepareAsyncShutdownRaw(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
- return ::grpc::internal::ClientAsyncResponseReaderFactory< ::stable::agon::io::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_Shutdown_, context, request, false);
+::grpc::ClientAsyncResponseReader< ::stable::agones::dev::sdk::Empty>* SDK::Stub::PrepareAsyncShutdownRaw(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
+ return ::grpc::internal::ClientAsyncResponseReaderFactory< ::stable::agones::dev::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_Shutdown_, context, request, false);
}
-::grpc::ClientWriter< ::stable::agon::io::sdk::Empty>* SDK::Stub::HealthRaw(::grpc::ClientContext* context, ::stable::agon::io::sdk::Empty* response) {
- return ::grpc::internal::ClientWriterFactory< ::stable::agon::io::sdk::Empty>::Create(channel_.get(), rpcmethod_Health_, context, response);
+::grpc::ClientWriter< ::stable::agones::dev::sdk::Empty>* SDK::Stub::HealthRaw(::grpc::ClientContext* context, ::stable::agones::dev::sdk::Empty* response) {
+ return ::grpc::internal::ClientWriterFactory< ::stable::agones::dev::sdk::Empty>::Create(channel_.get(), rpcmethod_Health_, context, response);
}
-::grpc::ClientAsyncWriter< ::stable::agon::io::sdk::Empty>* SDK::Stub::AsyncHealthRaw(::grpc::ClientContext* context, ::stable::agon::io::sdk::Empty* response, ::grpc::CompletionQueue* cq, void* tag) {
- return ::grpc::internal::ClientAsyncWriterFactory< ::stable::agon::io::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_Health_, context, response, true, tag);
+::grpc::ClientAsyncWriter< ::stable::agones::dev::sdk::Empty>* SDK::Stub::AsyncHealthRaw(::grpc::ClientContext* context, ::stable::agones::dev::sdk::Empty* response, ::grpc::CompletionQueue* cq, void* tag) {
+ return ::grpc::internal::ClientAsyncWriterFactory< ::stable::agones::dev::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_Health_, context, response, true, tag);
}
-::grpc::ClientAsyncWriter< ::stable::agon::io::sdk::Empty>* SDK::Stub::PrepareAsyncHealthRaw(::grpc::ClientContext* context, ::stable::agon::io::sdk::Empty* response, ::grpc::CompletionQueue* cq) {
- return ::grpc::internal::ClientAsyncWriterFactory< ::stable::agon::io::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_Health_, context, response, false, nullptr);
+::grpc::ClientAsyncWriter< ::stable::agones::dev::sdk::Empty>* SDK::Stub::PrepareAsyncHealthRaw(::grpc::ClientContext* context, ::stable::agones::dev::sdk::Empty* response, ::grpc::CompletionQueue* cq) {
+ return ::grpc::internal::ClientAsyncWriterFactory< ::stable::agones::dev::sdk::Empty>::Create(channel_.get(), cq, rpcmethod_Health_, context, response, false, nullptr);
}
SDK::Service::Service() {
AddMethod(new ::grpc::internal::RpcServiceMethod(
SDK_method_names[0],
::grpc::internal::RpcMethod::NORMAL_RPC,
- new ::grpc::internal::RpcMethodHandler< SDK::Service, ::stable::agon::io::sdk::Empty, ::stable::agon::io::sdk::Empty>(
+ new ::grpc::internal::RpcMethodHandler< SDK::Service, ::stable::agones::dev::sdk::Empty, ::stable::agones::dev::sdk::Empty>(
std::mem_fn(&SDK::Service::Ready), this)));
AddMethod(new ::grpc::internal::RpcServiceMethod(
SDK_method_names[1],
::grpc::internal::RpcMethod::NORMAL_RPC,
- new ::grpc::internal::RpcMethodHandler< SDK::Service, ::stable::agon::io::sdk::Empty, ::stable::agon::io::sdk::Empty>(
+ new ::grpc::internal::RpcMethodHandler< SDK::Service, ::stable::agones::dev::sdk::Empty, ::stable::agones::dev::sdk::Empty>(
std::mem_fn(&SDK::Service::Shutdown), this)));
AddMethod(new ::grpc::internal::RpcServiceMethod(
SDK_method_names[2],
::grpc::internal::RpcMethod::CLIENT_STREAMING,
- new ::grpc::internal::ClientStreamingHandler< SDK::Service, ::stable::agon::io::sdk::Empty, ::stable::agon::io::sdk::Empty>(
+ new ::grpc::internal::ClientStreamingHandler< SDK::Service, ::stable::agones::dev::sdk::Empty, ::stable::agones::dev::sdk::Empty>(
std::mem_fn(&SDK::Service::Health), this)));
}
SDK::Service::~Service() {
}
-::grpc::Status SDK::Service::Ready(::grpc::ServerContext* context, const ::stable::agon::io::sdk::Empty* request, ::stable::agon::io::sdk::Empty* response) {
+::grpc::Status SDK::Service::Ready(::grpc::ServerContext* context, const ::stable::agones::dev::sdk::Empty* request, ::stable::agones::dev::sdk::Empty* response) {
(void) context;
(void) request;
(void) response;
return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
}
-::grpc::Status SDK::Service::Shutdown(::grpc::ServerContext* context, const ::stable::agon::io::sdk::Empty* request, ::stable::agon::io::sdk::Empty* response) {
+::grpc::Status SDK::Service::Shutdown(::grpc::ServerContext* context, const ::stable::agones::dev::sdk::Empty* request, ::stable::agones::dev::sdk::Empty* response) {
(void) context;
(void) request;
(void) response;
return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
}
-::grpc::Status SDK::Service::Health(::grpc::ServerContext* context, ::grpc::ServerReader< ::stable::agon::io::sdk::Empty>* reader, ::stable::agon::io::sdk::Empty* response) {
+::grpc::Status SDK::Service::Health(::grpc::ServerContext* context, ::grpc::ServerReader< ::stable::agones::dev::sdk::Empty>* reader, ::stable::agones::dev::sdk::Empty* response) {
(void) context;
(void) reader;
(void) response;
@@ -130,7 +130,7 @@ SDK::Service::~Service() {
} // namespace stable
-} // namespace agon
-} // namespace io
+} // namespace agones
+} // namespace dev
} // namespace sdk
diff --git a/sdks/cpp/sdk.grpc.pb.h b/sdks/cpp/sdk.grpc.pb.h
index db294c1e31a9ae45a58b2a95242b7886e3f8ced7..15114898f54236bd7f02f038ca2ab6cb3a6bb21a 100644
--- a/sdks/cpp/sdk.grpc.pb.h
+++ b/sdks/cpp/sdk.grpc.pb.h
@@ -39,90 +39,90 @@ class ServerContext;
} // namespace grpc
namespace stable {
-namespace agon {
-namespace io {
+namespace agones {
+namespace dev {
namespace sdk {
// SDK service to be used in the GameServer SDK to the Pod Sidecar
class SDK final {
public:
static constexpr char const* service_full_name() {
- return "stable.agon.io.sdk.SDK";
+ return "stable.agones.dev.sdk.SDK";
}
class StubInterface {
public:
virtual ~StubInterface() {}
// Call when the GameServer is ready
- virtual ::grpc::Status Ready(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::stable::agon::io::sdk::Empty* response) = 0;
- std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::stable::agon::io::sdk::Empty>> AsyncReady(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
- return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::stable::agon::io::sdk::Empty>>(AsyncReadyRaw(context, request, cq));
+ virtual ::grpc::Status Ready(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::stable::agones::dev::sdk::Empty* response) = 0;
+ std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::stable::agones::dev::sdk::Empty>> AsyncReady(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
+ return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::stable::agones::dev::sdk::Empty>>(AsyncReadyRaw(context, request, cq));
}
- std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::stable::agon::io::sdk::Empty>> PrepareAsyncReady(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
- return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::stable::agon::io::sdk::Empty>>(PrepareAsyncReadyRaw(context, request, cq));
+ std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::stable::agones::dev::sdk::Empty>> PrepareAsyncReady(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
+ return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::stable::agones::dev::sdk::Empty>>(PrepareAsyncReadyRaw(context, request, cq));
}
// Call when the GmaeServer is shutting down
- virtual ::grpc::Status Shutdown(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::stable::agon::io::sdk::Empty* response) = 0;
- std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::stable::agon::io::sdk::Empty>> AsyncShutdown(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
- return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::stable::agon::io::sdk::Empty>>(AsyncShutdownRaw(context, request, cq));
+ virtual ::grpc::Status Shutdown(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::stable::agones::dev::sdk::Empty* response) = 0;
+ std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::stable::agones::dev::sdk::Empty>> AsyncShutdown(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
+ return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::stable::agones::dev::sdk::Empty>>(AsyncShutdownRaw(context, request, cq));
}
- std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::stable::agon::io::sdk::Empty>> PrepareAsyncShutdown(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
- return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::stable::agon::io::sdk::Empty>>(PrepareAsyncShutdownRaw(context, request, cq));
+ std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::stable::agones::dev::sdk::Empty>> PrepareAsyncShutdown(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
+ return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::stable::agones::dev::sdk::Empty>>(PrepareAsyncShutdownRaw(context, request, cq));
}
// Send a Empty every d Duration to declare that this GameSever is healthy
- std::unique_ptr< ::grpc::ClientWriterInterface< ::stable::agon::io::sdk::Empty>> Health(::grpc::ClientContext* context, ::stable::agon::io::sdk::Empty* response) {
- return std::unique_ptr< ::grpc::ClientWriterInterface< ::stable::agon::io::sdk::Empty>>(HealthRaw(context, response));
+ std::unique_ptr< ::grpc::ClientWriterInterface< ::stable::agones::dev::sdk::Empty>> Health(::grpc::ClientContext* context, ::stable::agones::dev::sdk::Empty* response) {
+ return std::unique_ptr< ::grpc::ClientWriterInterface< ::stable::agones::dev::sdk::Empty>>(HealthRaw(context, response));
}
- std::unique_ptr< ::grpc::ClientAsyncWriterInterface< ::stable::agon::io::sdk::Empty>> AsyncHealth(::grpc::ClientContext* context, ::stable::agon::io::sdk::Empty* response, ::grpc::CompletionQueue* cq, void* tag) {
- return std::unique_ptr< ::grpc::ClientAsyncWriterInterface< ::stable::agon::io::sdk::Empty>>(AsyncHealthRaw(context, response, cq, tag));
+ std::unique_ptr< ::grpc::ClientAsyncWriterInterface< ::stable::agones::dev::sdk::Empty>> AsyncHealth(::grpc::ClientContext* context, ::stable::agones::dev::sdk::Empty* response, ::grpc::CompletionQueue* cq, void* tag) {
+ return std::unique_ptr< ::grpc::ClientAsyncWriterInterface< ::stable::agones::dev::sdk::Empty>>(AsyncHealthRaw(context, response, cq, tag));
}
- std::unique_ptr< ::grpc::ClientAsyncWriterInterface< ::stable::agon::io::sdk::Empty>> PrepareAsyncHealth(::grpc::ClientContext* context, ::stable::agon::io::sdk::Empty* response, ::grpc::CompletionQueue* cq) {
- return std::unique_ptr< ::grpc::ClientAsyncWriterInterface< ::stable::agon::io::sdk::Empty>>(PrepareAsyncHealthRaw(context, response, cq));
+ std::unique_ptr< ::grpc::ClientAsyncWriterInterface< ::stable::agones::dev::sdk::Empty>> PrepareAsyncHealth(::grpc::ClientContext* context, ::stable::agones::dev::sdk::Empty* response, ::grpc::CompletionQueue* cq) {
+ return std::unique_ptr< ::grpc::ClientAsyncWriterInterface< ::stable::agones::dev::sdk::Empty>>(PrepareAsyncHealthRaw(context, response, cq));
}
private:
- virtual ::grpc::ClientAsyncResponseReaderInterface< ::stable::agon::io::sdk::Empty>* AsyncReadyRaw(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) = 0;
- virtual ::grpc::ClientAsyncResponseReaderInterface< ::stable::agon::io::sdk::Empty>* PrepareAsyncReadyRaw(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) = 0;
- virtual ::grpc::ClientAsyncResponseReaderInterface< ::stable::agon::io::sdk::Empty>* AsyncShutdownRaw(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) = 0;
- virtual ::grpc::ClientAsyncResponseReaderInterface< ::stable::agon::io::sdk::Empty>* PrepareAsyncShutdownRaw(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) = 0;
- virtual ::grpc::ClientWriterInterface< ::stable::agon::io::sdk::Empty>* HealthRaw(::grpc::ClientContext* context, ::stable::agon::io::sdk::Empty* response) = 0;
- virtual ::grpc::ClientAsyncWriterInterface< ::stable::agon::io::sdk::Empty>* AsyncHealthRaw(::grpc::ClientContext* context, ::stable::agon::io::sdk::Empty* response, ::grpc::CompletionQueue* cq, void* tag) = 0;
- virtual ::grpc::ClientAsyncWriterInterface< ::stable::agon::io::sdk::Empty>* PrepareAsyncHealthRaw(::grpc::ClientContext* context, ::stable::agon::io::sdk::Empty* response, ::grpc::CompletionQueue* cq) = 0;
+ virtual ::grpc::ClientAsyncResponseReaderInterface< ::stable::agones::dev::sdk::Empty>* AsyncReadyRaw(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) = 0;
+ virtual ::grpc::ClientAsyncResponseReaderInterface< ::stable::agones::dev::sdk::Empty>* PrepareAsyncReadyRaw(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) = 0;
+ virtual ::grpc::ClientAsyncResponseReaderInterface< ::stable::agones::dev::sdk::Empty>* AsyncShutdownRaw(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) = 0;
+ virtual ::grpc::ClientAsyncResponseReaderInterface< ::stable::agones::dev::sdk::Empty>* PrepareAsyncShutdownRaw(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) = 0;
+ virtual ::grpc::ClientWriterInterface< ::stable::agones::dev::sdk::Empty>* HealthRaw(::grpc::ClientContext* context, ::stable::agones::dev::sdk::Empty* response) = 0;
+ virtual ::grpc::ClientAsyncWriterInterface< ::stable::agones::dev::sdk::Empty>* AsyncHealthRaw(::grpc::ClientContext* context, ::stable::agones::dev::sdk::Empty* response, ::grpc::CompletionQueue* cq, void* tag) = 0;
+ virtual ::grpc::ClientAsyncWriterInterface< ::stable::agones::dev::sdk::Empty>* PrepareAsyncHealthRaw(::grpc::ClientContext* context, ::stable::agones::dev::sdk::Empty* response, ::grpc::CompletionQueue* cq) = 0;
};
class Stub final : public StubInterface {
public:
Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel);
- ::grpc::Status Ready(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::stable::agon::io::sdk::Empty* response) override;
- std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::stable::agon::io::sdk::Empty>> AsyncReady(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
- return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::stable::agon::io::sdk::Empty>>(AsyncReadyRaw(context, request, cq));
+ ::grpc::Status Ready(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::stable::agones::dev::sdk::Empty* response) override;
+ std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::stable::agones::dev::sdk::Empty>> AsyncReady(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
+ return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::stable::agones::dev::sdk::Empty>>(AsyncReadyRaw(context, request, cq));
}
- std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::stable::agon::io::sdk::Empty>> PrepareAsyncReady(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
- return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::stable::agon::io::sdk::Empty>>(PrepareAsyncReadyRaw(context, request, cq));
+ std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::stable::agones::dev::sdk::Empty>> PrepareAsyncReady(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
+ return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::stable::agones::dev::sdk::Empty>>(PrepareAsyncReadyRaw(context, request, cq));
}
- ::grpc::Status Shutdown(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::stable::agon::io::sdk::Empty* response) override;
- std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::stable::agon::io::sdk::Empty>> AsyncShutdown(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
- return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::stable::agon::io::sdk::Empty>>(AsyncShutdownRaw(context, request, cq));
+ ::grpc::Status Shutdown(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::stable::agones::dev::sdk::Empty* response) override;
+ std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::stable::agones::dev::sdk::Empty>> AsyncShutdown(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
+ return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::stable::agones::dev::sdk::Empty>>(AsyncShutdownRaw(context, request, cq));
}
- std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::stable::agon::io::sdk::Empty>> PrepareAsyncShutdown(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
- return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::stable::agon::io::sdk::Empty>>(PrepareAsyncShutdownRaw(context, request, cq));
+ std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::stable::agones::dev::sdk::Empty>> PrepareAsyncShutdown(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) {
+ return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::stable::agones::dev::sdk::Empty>>(PrepareAsyncShutdownRaw(context, request, cq));
}
- std::unique_ptr< ::grpc::ClientWriter< ::stable::agon::io::sdk::Empty>> Health(::grpc::ClientContext* context, ::stable::agon::io::sdk::Empty* response) {
- return std::unique_ptr< ::grpc::ClientWriter< ::stable::agon::io::sdk::Empty>>(HealthRaw(context, response));
+ std::unique_ptr< ::grpc::ClientWriter< ::stable::agones::dev::sdk::Empty>> Health(::grpc::ClientContext* context, ::stable::agones::dev::sdk::Empty* response) {
+ return std::unique_ptr< ::grpc::ClientWriter< ::stable::agones::dev::sdk::Empty>>(HealthRaw(context, response));
}
- std::unique_ptr< ::grpc::ClientAsyncWriter< ::stable::agon::io::sdk::Empty>> AsyncHealth(::grpc::ClientContext* context, ::stable::agon::io::sdk::Empty* response, ::grpc::CompletionQueue* cq, void* tag) {
- return std::unique_ptr< ::grpc::ClientAsyncWriter< ::stable::agon::io::sdk::Empty>>(AsyncHealthRaw(context, response, cq, tag));
+ std::unique_ptr< ::grpc::ClientAsyncWriter< ::stable::agones::dev::sdk::Empty>> AsyncHealth(::grpc::ClientContext* context, ::stable::agones::dev::sdk::Empty* response, ::grpc::CompletionQueue* cq, void* tag) {
+ return std::unique_ptr< ::grpc::ClientAsyncWriter< ::stable::agones::dev::sdk::Empty>>(AsyncHealthRaw(context, response, cq, tag));
}
- std::unique_ptr< ::grpc::ClientAsyncWriter< ::stable::agon::io::sdk::Empty>> PrepareAsyncHealth(::grpc::ClientContext* context, ::stable::agon::io::sdk::Empty* response, ::grpc::CompletionQueue* cq) {
- return std::unique_ptr< ::grpc::ClientAsyncWriter< ::stable::agon::io::sdk::Empty>>(PrepareAsyncHealthRaw(context, response, cq));
+ std::unique_ptr< ::grpc::ClientAsyncWriter< ::stable::agones::dev::sdk::Empty>> PrepareAsyncHealth(::grpc::ClientContext* context, ::stable::agones::dev::sdk::Empty* response, ::grpc::CompletionQueue* cq) {
+ return std::unique_ptr< ::grpc::ClientAsyncWriter< ::stable::agones::dev::sdk::Empty>>(PrepareAsyncHealthRaw(context, response, cq));
}
private:
std::shared_ptr< ::grpc::ChannelInterface> channel_;
- ::grpc::ClientAsyncResponseReader< ::stable::agon::io::sdk::Empty>* AsyncReadyRaw(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) override;
- ::grpc::ClientAsyncResponseReader< ::stable::agon::io::sdk::Empty>* PrepareAsyncReadyRaw(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) override;
- ::grpc::ClientAsyncResponseReader< ::stable::agon::io::sdk::Empty>* AsyncShutdownRaw(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) override;
- ::grpc::ClientAsyncResponseReader< ::stable::agon::io::sdk::Empty>* PrepareAsyncShutdownRaw(::grpc::ClientContext* context, const ::stable::agon::io::sdk::Empty& request, ::grpc::CompletionQueue* cq) override;
- ::grpc::ClientWriter< ::stable::agon::io::sdk::Empty>* HealthRaw(::grpc::ClientContext* context, ::stable::agon::io::sdk::Empty* response) override;
- ::grpc::ClientAsyncWriter< ::stable::agon::io::sdk::Empty>* AsyncHealthRaw(::grpc::ClientContext* context, ::stable::agon::io::sdk::Empty* response, ::grpc::CompletionQueue* cq, void* tag) override;
- ::grpc::ClientAsyncWriter< ::stable::agon::io::sdk::Empty>* PrepareAsyncHealthRaw(::grpc::ClientContext* context, ::stable::agon::io::sdk::Empty* response, ::grpc::CompletionQueue* cq) override;
+ ::grpc::ClientAsyncResponseReader< ::stable::agones::dev::sdk::Empty>* AsyncReadyRaw(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) override;
+ ::grpc::ClientAsyncResponseReader< ::stable::agones::dev::sdk::Empty>* PrepareAsyncReadyRaw(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) override;
+ ::grpc::ClientAsyncResponseReader< ::stable::agones::dev::sdk::Empty>* AsyncShutdownRaw(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) override;
+ ::grpc::ClientAsyncResponseReader< ::stable::agones::dev::sdk::Empty>* PrepareAsyncShutdownRaw(::grpc::ClientContext* context, const ::stable::agones::dev::sdk::Empty& request, ::grpc::CompletionQueue* cq) override;
+ ::grpc::ClientWriter< ::stable::agones::dev::sdk::Empty>* HealthRaw(::grpc::ClientContext* context, ::stable::agones::dev::sdk::Empty* response) override;
+ ::grpc::ClientAsyncWriter< ::stable::agones::dev::sdk::Empty>* AsyncHealthRaw(::grpc::ClientContext* context, ::stable::agones::dev::sdk::Empty* response, ::grpc::CompletionQueue* cq, void* tag) override;
+ ::grpc::ClientAsyncWriter< ::stable::agones::dev::sdk::Empty>* PrepareAsyncHealthRaw(::grpc::ClientContext* context, ::stable::agones::dev::sdk::Empty* response, ::grpc::CompletionQueue* cq) override;
const ::grpc::internal::RpcMethod rpcmethod_Ready_;
const ::grpc::internal::RpcMethod rpcmethod_Shutdown_;
const ::grpc::internal::RpcMethod rpcmethod_Health_;
@@ -134,11 +134,11 @@ class SDK final {
Service();
virtual ~Service();
// Call when the GameServer is ready
- virtual ::grpc::Status Ready(::grpc::ServerContext* context, const ::stable::agon::io::sdk::Empty* request, ::stable::agon::io::sdk::Empty* response);
+ virtual ::grpc::Status Ready(::grpc::ServerContext* context, const ::stable::agones::dev::sdk::Empty* request, ::stable::agones::dev::sdk::Empty* response);
// Call when the GmaeServer is shutting down
- virtual ::grpc::Status Shutdown(::grpc::ServerContext* context, const ::stable::agon::io::sdk::Empty* request, ::stable::agon::io::sdk::Empty* response);
+ virtual ::grpc::Status Shutdown(::grpc::ServerContext* context, const ::stable::agones::dev::sdk::Empty* request, ::stable::agones::dev::sdk::Empty* response);
// Send a Empty every d Duration to declare that this GameSever is healthy
- virtual ::grpc::Status Health(::grpc::ServerContext* context, ::grpc::ServerReader< ::stable::agon::io::sdk::Empty>* reader, ::stable::agon::io::sdk::Empty* response);
+ virtual ::grpc::Status Health(::grpc::ServerContext* context, ::grpc::ServerReader< ::stable::agones::dev::sdk::Empty>* reader, ::stable::agones::dev::sdk::Empty* response);
};
template <class BaseClass>
class WithAsyncMethod_Ready : public BaseClass {
@@ -152,11 +152,11 @@ class SDK final {
BaseClassMustBeDerivedFromService(this);
}
// disable synchronous version of this method
- ::grpc::Status Ready(::grpc::ServerContext* context, const ::stable::agon::io::sdk::Empty* request, ::stable::agon::io::sdk::Empty* response) final override {
+ ::grpc::Status Ready(::grpc::ServerContext* context, const ::stable::agones::dev::sdk::Empty* request, ::stable::agones::dev::sdk::Empty* response) final override {
abort();
return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
}
- void RequestReady(::grpc::ServerContext* context, ::stable::agon::io::sdk::Empty* request, ::grpc::ServerAsyncResponseWriter< ::stable::agon::io::sdk::Empty>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
+ void RequestReady(::grpc::ServerContext* context, ::stable::agones::dev::sdk::Empty* request, ::grpc::ServerAsyncResponseWriter< ::stable::agones::dev::sdk::Empty>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
}
};
@@ -172,11 +172,11 @@ class SDK final {
BaseClassMustBeDerivedFromService(this);
}
// disable synchronous version of this method
- ::grpc::Status Shutdown(::grpc::ServerContext* context, const ::stable::agon::io::sdk::Empty* request, ::stable::agon::io::sdk::Empty* response) final override {
+ ::grpc::Status Shutdown(::grpc::ServerContext* context, const ::stable::agones::dev::sdk::Empty* request, ::stable::agones::dev::sdk::Empty* response) final override {
abort();
return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
}
- void RequestShutdown(::grpc::ServerContext* context, ::stable::agon::io::sdk::Empty* request, ::grpc::ServerAsyncResponseWriter< ::stable::agon::io::sdk::Empty>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
+ void RequestShutdown(::grpc::ServerContext* context, ::stable::agones::dev::sdk::Empty* request, ::grpc::ServerAsyncResponseWriter< ::stable::agones::dev::sdk::Empty>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
}
};
@@ -192,11 +192,11 @@ class SDK final {
BaseClassMustBeDerivedFromService(this);
}
// disable synchronous version of this method
- ::grpc::Status Health(::grpc::ServerContext* context, ::grpc::ServerReader< ::stable::agon::io::sdk::Empty>* reader, ::stable::agon::io::sdk::Empty* response) final override {
+ ::grpc::Status Health(::grpc::ServerContext* context, ::grpc::ServerReader< ::stable::agones::dev::sdk::Empty>* reader, ::stable::agones::dev::sdk::Empty* response) final override {
abort();
return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
}
- void RequestHealth(::grpc::ServerContext* context, ::grpc::ServerAsyncReader< ::stable::agon::io::sdk::Empty, ::stable::agon::io::sdk::Empty>* reader, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
+ void RequestHealth(::grpc::ServerContext* context, ::grpc::ServerAsyncReader< ::stable::agones::dev::sdk::Empty, ::stable::agones::dev::sdk::Empty>* reader, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
::grpc::Service::RequestAsyncClientStreaming(2, context, reader, new_call_cq, notification_cq, tag);
}
};
@@ -213,7 +213,7 @@ class SDK final {
BaseClassMustBeDerivedFromService(this);
}
// disable synchronous version of this method
- ::grpc::Status Ready(::grpc::ServerContext* context, const ::stable::agon::io::sdk::Empty* request, ::stable::agon::io::sdk::Empty* response) final override {
+ ::grpc::Status Ready(::grpc::ServerContext* context, const ::stable::agones::dev::sdk::Empty* request, ::stable::agones::dev::sdk::Empty* response) final override {
abort();
return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
}
@@ -230,7 +230,7 @@ class SDK final {
BaseClassMustBeDerivedFromService(this);
}
// disable synchronous version of this method
- ::grpc::Status Shutdown(::grpc::ServerContext* context, const ::stable::agon::io::sdk::Empty* request, ::stable::agon::io::sdk::Empty* response) final override {
+ ::grpc::Status Shutdown(::grpc::ServerContext* context, const ::stable::agones::dev::sdk::Empty* request, ::stable::agones::dev::sdk::Empty* response) final override {
abort();
return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
}
@@ -247,7 +247,7 @@ class SDK final {
BaseClassMustBeDerivedFromService(this);
}
// disable synchronous version of this method
- ::grpc::Status Health(::grpc::ServerContext* context, ::grpc::ServerReader< ::stable::agon::io::sdk::Empty>* reader, ::stable::agon::io::sdk::Empty* response) final override {
+ ::grpc::Status Health(::grpc::ServerContext* context, ::grpc::ServerReader< ::stable::agones::dev::sdk::Empty>* reader, ::stable::agones::dev::sdk::Empty* response) final override {
abort();
return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
}
@@ -259,18 +259,18 @@ class SDK final {
public:
WithStreamedUnaryMethod_Ready() {
::grpc::Service::MarkMethodStreamed(0,
- new ::grpc::internal::StreamedUnaryHandler< ::stable::agon::io::sdk::Empty, ::stable::agon::io::sdk::Empty>(std::bind(&WithStreamedUnaryMethod_Ready<BaseClass>::StreamedReady, this, std::placeholders::_1, std::placeholders::_2)));
+ new ::grpc::internal::StreamedUnaryHandler< ::stable::agones::dev::sdk::Empty, ::stable::agones::dev::sdk::Empty>(std::bind(&WithStreamedUnaryMethod_Ready<BaseClass>::StreamedReady, this, std::placeholders::_1, std::placeholders::_2)));
}
~WithStreamedUnaryMethod_Ready() override {
BaseClassMustBeDerivedFromService(this);
}
// disable regular version of this method
- ::grpc::Status Ready(::grpc::ServerContext* context, const ::stable::agon::io::sdk::Empty* request, ::stable::agon::io::sdk::Empty* response) final override {
+ ::grpc::Status Ready(::grpc::ServerContext* context, const ::stable::agones::dev::sdk::Empty* request, ::stable::agones::dev::sdk::Empty* response) final override {
abort();
return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
}
// replace default version of method with streamed unary
- virtual ::grpc::Status StreamedReady(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::stable::agon::io::sdk::Empty,::stable::agon::io::sdk::Empty>* server_unary_streamer) = 0;
+ virtual ::grpc::Status StreamedReady(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::stable::agones::dev::sdk::Empty,::stable::agones::dev::sdk::Empty>* server_unary_streamer) = 0;
};
template <class BaseClass>
class WithStreamedUnaryMethod_Shutdown : public BaseClass {
@@ -279,18 +279,18 @@ class SDK final {
public:
WithStreamedUnaryMethod_Shutdown() {
::grpc::Service::MarkMethodStreamed(1,
- new ::grpc::internal::StreamedUnaryHandler< ::stable::agon::io::sdk::Empty, ::stable::agon::io::sdk::Empty>(std::bind(&WithStreamedUnaryMethod_Shutdown<BaseClass>::StreamedShutdown, this, std::placeholders::_1, std::placeholders::_2)));
+ new ::grpc::internal::StreamedUnaryHandler< ::stable::agones::dev::sdk::Empty, ::stable::agones::dev::sdk::Empty>(std::bind(&WithStreamedUnaryMethod_Shutdown<BaseClass>::StreamedShutdown, this, std::placeholders::_1, std::placeholders::_2)));
}
~WithStreamedUnaryMethod_Shutdown() override {
BaseClassMustBeDerivedFromService(this);
}
// disable regular version of this method
- ::grpc::Status Shutdown(::grpc::ServerContext* context, const ::stable::agon::io::sdk::Empty* request, ::stable::agon::io::sdk::Empty* response) final override {
+ ::grpc::Status Shutdown(::grpc::ServerContext* context, const ::stable::agones::dev::sdk::Empty* request, ::stable::agones::dev::sdk::Empty* response) final override {
abort();
return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
}
// replace default version of method with streamed unary
- virtual ::grpc::Status StreamedShutdown(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::stable::agon::io::sdk::Empty,::stable::agon::io::sdk::Empty>* server_unary_streamer) = 0;
+ virtual ::grpc::Status StreamedShutdown(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::stable::agones::dev::sdk::Empty,::stable::agones::dev::sdk::Empty>* server_unary_streamer) = 0;
};
typedef WithStreamedUnaryMethod_Ready<WithStreamedUnaryMethod_Shutdown<Service > > StreamedUnaryService;
typedef Service SplitStreamedService;
@@ -298,8 +298,8 @@ class SDK final {
};
} // namespace sdk
-} // namespace io
-} // namespace agon
+} // namespace dev
+} // namespace agones
} // namespace stable
diff --git a/sdks/cpp/sdk.h b/sdks/cpp/sdk.h
index 7b58a75784a81862fded4647e6ca2b5c69335c2b..ab7577bf58b79bd8fa55f04be73b7bfc85273a78 100644
--- a/sdks/cpp/sdk.h
+++ b/sdks/cpp/sdk.h
@@ -15,9 +15,9 @@
#include <grpc++/grpc++.h>
#include "sdk.grpc.pb.h"
-namespace agon {
+namespace agones {
- // The Agon SDK
+ // The Agones SDK
class SDK {
public:
// Creates a new instance of the SDK.
@@ -43,7 +43,7 @@ namespace agon {
private:
std::shared_ptr<grpc::Channel> channel;
- std::unique_ptr<stable::agon::io::sdk::SDK::Stub> stub;
- std::unique_ptr< ::grpc::ClientWriter< ::stable::agon::io::sdk::Empty>> health;
+ std::unique_ptr<stable::agones::dev::sdk::SDK::Stub> stub;
+ std::unique_ptr< ::grpc::ClientWriter< ::stable::agones::dev::sdk::Empty>> health;
};
}
diff --git a/sdks/cpp/sdk.pb.cc b/sdks/cpp/sdk.pb.cc
index 121b1b9e722478fc19a406b6efdbff4c231be412..cf68357c29fcfc06b4a39f8aa5048598fa893769 100644
--- a/sdks/cpp/sdk.pb.cc
+++ b/sdks/cpp/sdk.pb.cc
@@ -35,8 +35,8 @@
#endif
// @@protoc_insertion_point(includes)
namespace stable {
-namespace agon {
-namespace io {
+namespace agones {
+namespace dev {
namespace sdk {
class EmptyDefaultTypeInternal {
public:
@@ -44,8 +44,8 @@ class EmptyDefaultTypeInternal {
_instance;
} _Empty_default_instance_;
} // namespace sdk
-} // namespace io
-} // namespace agon
+} // namespace dev
+} // namespace agones
} // namespace stable
namespace protobuf_sdk_2eproto {
void InitDefaultsEmptyImpl() {
@@ -57,11 +57,11 @@ void InitDefaultsEmptyImpl() {
::google::protobuf::internal::InitProtobufDefaults();
#endif // GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS
{
- void* ptr = &::stable::agon::io::sdk::_Empty_default_instance_;
- new (ptr) ::stable::agon::io::sdk::Empty();
+ void* ptr = &::stable::agones::dev::sdk::_Empty_default_instance_;
+ new (ptr) ::stable::agones::dev::sdk::Empty();
::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
}
- ::stable::agon::io::sdk::Empty::InitAsDefaultInstance();
+ ::stable::agones::dev::sdk::Empty::InitAsDefaultInstance();
}
void InitDefaultsEmpty() {
@@ -73,17 +73,17 @@ void InitDefaultsEmpty() {
const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
~0u, // no _has_bits_
- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::stable::agon::io::sdk::Empty, _internal_metadata_),
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::stable::agones::dev::sdk::Empty, _internal_metadata_),
~0u, // no _extensions_
~0u, // no _oneof_case_
~0u, // no _weak_field_map_
};
static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
- { 0, -1, sizeof(::stable::agon::io::sdk::Empty)},
+ { 0, -1, sizeof(::stable::agones::dev::sdk::Empty)},
};
static ::google::protobuf::Message const * const file_default_instances[] = {
- reinterpret_cast<const ::google::protobuf::Message*>(&::stable::agon::io::sdk::_Empty_default_instance_),
+ reinterpret_cast<const ::google::protobuf::Message*>(&::stable::agones::dev::sdk::_Empty_default_instance_),
};
void protobuf_AssignDescriptors() {
@@ -108,16 +108,17 @@ void protobuf_RegisterTypes(const ::std::string&) {
void AddDescriptorsImpl() {
InitDefaults();
static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
- "\n\tsdk.proto\022\022stable.agon.io.sdk\"\007\n\005Empty"
- "2\316\001\n\003SDK\022\?\n\005Ready\022\031.stable.agon.io.sdk.E"
- "mpty\032\031.stable.agon.io.sdk.Empty\"\000\022B\n\010Shu"
- "tdown\022\031.stable.agon.io.sdk.Empty\032\031.stabl"
- "e.agon.io.sdk.Empty\"\000\022B\n\006Health\022\031.stable"
- ".agon.io.sdk.Empty\032\031.stable.agon.io.sdk."
- "Empty\"\000(\001B\005Z\003sdkb\006proto3"
+ "\n\tsdk.proto\022\025stable.agones.dev.sdk\"\007\n\005Em"
+ "pty2\340\001\n\003SDK\022E\n\005Ready\022\034.stable.agones.dev"
+ ".sdk.Empty\032\034.stable.agones.dev.sdk.Empty"
+ "\"\000\022H\n\010Shutdown\022\034.stable.agones.dev.sdk.E"
+ "mpty\032\034.stable.agones.dev.sdk.Empty\"\000\022H\n\006"
+ "Health\022\034.stable.agones.dev.sdk.Empty\032\034.s"
+ "table.agones.dev.sdk.Empty\"\000(\001B\005Z\003sdkb\006p"
+ "roto3"
};
::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
- descriptor, 264);
+ descriptor, 285);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"sdk.proto", &protobuf_RegisterTypes);
}
@@ -134,8 +135,8 @@ struct StaticDescriptorInitializer {
} static_descriptor_initializer;
} // namespace protobuf_sdk_2eproto
namespace stable {
-namespace agon {
-namespace io {
+namespace agones {
+namespace dev {
namespace sdk {
// ===================================================================
@@ -151,14 +152,14 @@ Empty::Empty()
::protobuf_sdk_2eproto::InitDefaultsEmpty();
}
SharedCtor();
- // @@protoc_insertion_point(constructor:stable.agon.io.sdk.Empty)
+ // @@protoc_insertion_point(constructor:stable.agones.dev.sdk.Empty)
}
Empty::Empty(const Empty& from)
: ::google::protobuf::Message(),
_internal_metadata_(NULL),
_cached_size_(0) {
_internal_metadata_.MergeFrom(from._internal_metadata_);
- // @@protoc_insertion_point(copy_constructor:stable.agon.io.sdk.Empty)
+ // @@protoc_insertion_point(copy_constructor:stable.agones.dev.sdk.Empty)
}
void Empty::SharedCtor() {
@@ -166,7 +167,7 @@ void Empty::SharedCtor() {
}
Empty::~Empty() {
- // @@protoc_insertion_point(destructor:stable.agon.io.sdk.Empty)
+ // @@protoc_insertion_point(destructor:stable.agones.dev.sdk.Empty)
SharedDtor();
}
@@ -197,7 +198,7 @@ Empty* Empty::New(::google::protobuf::Arena* arena) const {
}
void Empty::Clear() {
-// @@protoc_insertion_point(message_clear_start:stable.agon.io.sdk.Empty)
+// @@protoc_insertion_point(message_clear_start:stable.agones.dev.sdk.Empty)
::google::protobuf::uint32 cached_has_bits = 0;
// Prevent compiler warnings about cached_has_bits being unused
(void) cached_has_bits;
@@ -209,7 +210,7 @@ bool Empty::MergePartialFromCodedStream(
::google::protobuf::io::CodedInputStream* input) {
#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
::google::protobuf::uint32 tag;
- // @@protoc_insertion_point(parse_start:stable.agon.io.sdk.Empty)
+ // @@protoc_insertion_point(parse_start:stable.agones.dev.sdk.Empty)
for (;;) {
::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
tag = p.first;
@@ -222,17 +223,17 @@ bool Empty::MergePartialFromCodedStream(
input, tag, _internal_metadata_.mutable_unknown_fields()));
}
success:
- // @@protoc_insertion_point(parse_success:stable.agon.io.sdk.Empty)
+ // @@protoc_insertion_point(parse_success:stable.agones.dev.sdk.Empty)
return true;
failure:
- // @@protoc_insertion_point(parse_failure:stable.agon.io.sdk.Empty)
+ // @@protoc_insertion_point(parse_failure:stable.agones.dev.sdk.Empty)
return false;
#undef DO_
}
void Empty::SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const {
- // @@protoc_insertion_point(serialize_start:stable.agon.io.sdk.Empty)
+ // @@protoc_insertion_point(serialize_start:stable.agones.dev.sdk.Empty)
::google::protobuf::uint32 cached_has_bits = 0;
(void) cached_has_bits;
@@ -240,13 +241,13 @@ void Empty::SerializeWithCachedSizes(
::google::protobuf::internal::WireFormat::SerializeUnknownFields(
(::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), output);
}
- // @@protoc_insertion_point(serialize_end:stable.agon.io.sdk.Empty)
+ // @@protoc_insertion_point(serialize_end:stable.agones.dev.sdk.Empty)
}
::google::protobuf::uint8* Empty::InternalSerializeWithCachedSizesToArray(
bool deterministic, ::google::protobuf::uint8* target) const {
(void)deterministic; // Unused
- // @@protoc_insertion_point(serialize_to_array_start:stable.agon.io.sdk.Empty)
+ // @@protoc_insertion_point(serialize_to_array_start:stable.agones.dev.sdk.Empty)
::google::protobuf::uint32 cached_has_bits = 0;
(void) cached_has_bits;
@@ -254,12 +255,12 @@ void Empty::SerializeWithCachedSizes(
target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
(::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance()), target);
}
- // @@protoc_insertion_point(serialize_to_array_end:stable.agon.io.sdk.Empty)
+ // @@protoc_insertion_point(serialize_to_array_end:stable.agones.dev.sdk.Empty)
return target;
}
size_t Empty::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:stable.agon.io.sdk.Empty)
+// @@protoc_insertion_point(message_byte_size_start:stable.agones.dev.sdk.Empty)
size_t total_size = 0;
if ((_internal_metadata_.have_unknown_fields() && ::google::protobuf::internal::GetProto3PreserveUnknownsDefault())) {
@@ -275,22 +276,22 @@ size_t Empty::ByteSizeLong() const {
}
void Empty::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:stable.agon.io.sdk.Empty)
+// @@protoc_insertion_point(generalized_merge_from_start:stable.agones.dev.sdk.Empty)
GOOGLE_DCHECK_NE(&from, this);
const Empty* source =
::google::protobuf::internal::DynamicCastToGenerated<const Empty>(
&from);
if (source == NULL) {
- // @@protoc_insertion_point(generalized_merge_from_cast_fail:stable.agon.io.sdk.Empty)
+ // @@protoc_insertion_point(generalized_merge_from_cast_fail:stable.agones.dev.sdk.Empty)
::google::protobuf::internal::ReflectionOps::Merge(from, this);
} else {
- // @@protoc_insertion_point(generalized_merge_from_cast_success:stable.agon.io.sdk.Empty)
+ // @@protoc_insertion_point(generalized_merge_from_cast_success:stable.agones.dev.sdk.Empty)
MergeFrom(*source);
}
}
void Empty::MergeFrom(const Empty& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:stable.agon.io.sdk.Empty)
+// @@protoc_insertion_point(class_specific_merge_from_start:stable.agones.dev.sdk.Empty)
GOOGLE_DCHECK_NE(&from, this);
_internal_metadata_.MergeFrom(from._internal_metadata_);
::google::protobuf::uint32 cached_has_bits = 0;
@@ -299,14 +300,14 @@ void Empty::MergeFrom(const Empty& from) {
}
void Empty::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:stable.agon.io.sdk.Empty)
+// @@protoc_insertion_point(generalized_copy_from_start:stable.agones.dev.sdk.Empty)
if (&from == this) return;
Clear();
MergeFrom(from);
}
void Empty::CopyFrom(const Empty& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:stable.agon.io.sdk.Empty)
+// @@protoc_insertion_point(class_specific_copy_from_start:stable.agones.dev.sdk.Empty)
if (&from == this) return;
Clear();
MergeFrom(from);
@@ -334,8 +335,8 @@ void Empty::InternalSwap(Empty* other) {
// @@protoc_insertion_point(namespace_scope)
} // namespace sdk
-} // namespace io
-} // namespace agon
+} // namespace dev
+} // namespace agones
} // namespace stable
// @@protoc_insertion_point(global_scope)
diff --git a/sdks/cpp/sdk.pb.h b/sdks/cpp/sdk.pb.h
index 9f0e4a303e6aa084f1f099a9750cbe1effb13a13..085ef7b2b00751b70a0fc1840e86ca723700876b 100644
--- a/sdks/cpp/sdk.pb.h
+++ b/sdks/cpp/sdk.pb.h
@@ -64,24 +64,24 @@ inline void InitDefaults() {
}
} // namespace protobuf_sdk_2eproto
namespace stable {
-namespace agon {
-namespace io {
+namespace agones {
+namespace dev {
namespace sdk {
class Empty;
class EmptyDefaultTypeInternal;
extern EmptyDefaultTypeInternal _Empty_default_instance_;
} // namespace sdk
-} // namespace io
-} // namespace agon
+} // namespace dev
+} // namespace agones
} // namespace stable
namespace stable {
-namespace agon {
-namespace io {
+namespace agones {
+namespace dev {
namespace sdk {
// ===================================================================
-class Empty : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:stable.agon.io.sdk.Empty) */ {
+class Empty : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:stable.agones.dev.sdk.Empty) */ {
public:
Empty();
virtual ~Empty();
@@ -163,7 +163,7 @@ class Empty : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
// accessors -------------------------------------------------------
- // @@protoc_insertion_point(class_scope:stable.agon.io.sdk.Empty)
+ // @@protoc_insertion_point(class_scope:stable.agones.dev.sdk.Empty)
private:
::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
@@ -189,8 +189,8 @@ class Empty : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
// @@protoc_insertion_point(namespace_scope)
} // namespace sdk
-} // namespace io
-} // namespace agon
+} // namespace dev
+} // namespace agones
} // namespace stable
// @@protoc_insertion_point(global_scope)
diff --git a/sdks/go/sdk.go b/sdks/go/sdk.go
index 11b4d45a1a9d3968c9b5da6e914e90a031835700..042bcbba2e5165160a6d550270e6986fc2b884b9 100644
--- a/sdks/go/sdk.go
+++ b/sdks/go/sdk.go
@@ -26,7 +26,7 @@ import (
const port = 59357
-// SDK is an instance of the Agon SDK
+// SDK is an instance of the Agones SDK
type SDK struct {
client SDKClient
ctx context.Context
diff --git a/sdks/go/sdk.pb.go b/sdks/go/sdk.pb.go
index 10596f332285f62e64d5939b9e27ec91d45096e4..481de84a0edd368f1ab96ec2dbcd9675e7ca098d 100644
--- a/sdks/go/sdk.pb.go
+++ b/sdks/go/sdk.pb.go
@@ -56,7 +56,7 @@ func (*Empty) ProtoMessage() {}
func (*Empty) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
func init() {
- proto.RegisterType((*Empty)(nil), "stable.agon.io.sdk.Empty")
+ proto.RegisterType((*Empty)(nil), "stable.agones.dev.sdk.Empty")
}
// Reference imports to suppress errors if they are not otherwise used.
@@ -88,7 +88,7 @@ func NewSDKClient(cc *grpc.ClientConn) SDKClient {
func (c *sDKClient) Ready(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error) {
out := new(Empty)
- err := grpc.Invoke(ctx, "/stable.agon.io.sdk.SDK/Ready", in, out, c.cc, opts...)
+ err := grpc.Invoke(ctx, "/stable.agones.dev.sdk.SDK/Ready", in, out, c.cc, opts...)
if err != nil {
return nil, err
}
@@ -97,7 +97,7 @@ func (c *sDKClient) Ready(ctx context.Context, in *Empty, opts ...grpc.CallOptio
func (c *sDKClient) Shutdown(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*Empty, error) {
out := new(Empty)
- err := grpc.Invoke(ctx, "/stable.agon.io.sdk.SDK/Shutdown", in, out, c.cc, opts...)
+ err := grpc.Invoke(ctx, "/stable.agones.dev.sdk.SDK/Shutdown", in, out, c.cc, opts...)
if err != nil {
return nil, err
}
@@ -105,7 +105,7 @@ func (c *sDKClient) Shutdown(ctx context.Context, in *Empty, opts ...grpc.CallOp
}
func (c *sDKClient) Health(ctx context.Context, opts ...grpc.CallOption) (SDK_HealthClient, error) {
- stream, err := grpc.NewClientStream(ctx, &_SDK_serviceDesc.Streams[0], c.cc, "/stable.agon.io.sdk.SDK/Health", opts...)
+ stream, err := grpc.NewClientStream(ctx, &_SDK_serviceDesc.Streams[0], c.cc, "/stable.agones.dev.sdk.SDK/Health", opts...)
if err != nil {
return nil, err
}
@@ -163,7 +163,7 @@ func _SDK_Ready_Handler(srv interface{}, ctx context.Context, dec func(interface
}
info := &grpc.UnaryServerInfo{
Server: srv,
- FullMethod: "/stable.agon.io.sdk.SDK/Ready",
+ FullMethod: "/stable.agones.dev.sdk.SDK/Ready",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(SDKServer).Ready(ctx, req.(*Empty))
@@ -181,7 +181,7 @@ func _SDK_Shutdown_Handler(srv interface{}, ctx context.Context, dec func(interf
}
info := &grpc.UnaryServerInfo{
Server: srv,
- FullMethod: "/stable.agon.io.sdk.SDK/Shutdown",
+ FullMethod: "/stable.agones.dev.sdk.SDK/Shutdown",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(SDKServer).Shutdown(ctx, req.(*Empty))
@@ -216,7 +216,7 @@ func (x *sDKHealthServer) Recv() (*Empty, error) {
}
var _SDK_serviceDesc = grpc.ServiceDesc{
- ServiceName: "stable.agon.io.sdk.SDK",
+ ServiceName: "stable.agones.dev.sdk.SDK",
HandlerType: (*SDKServer)(nil),
Methods: []grpc.MethodDesc{
{
@@ -241,14 +241,14 @@ var _SDK_serviceDesc = grpc.ServiceDesc{
func init() { proto.RegisterFile("sdk.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{
- // 133 bytes of a gzipped FileDescriptorProto
+ // 136 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2c, 0x4e, 0xc9, 0xd6,
- 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x2a, 0x2e, 0x49, 0x4c, 0xca, 0x49, 0xd5, 0x4b, 0x4c,
- 0xcf, 0xcf, 0xd3, 0xcb, 0xcc, 0xd7, 0x2b, 0x4e, 0xc9, 0x56, 0x62, 0xe7, 0x62, 0x75, 0xcd, 0x2d,
- 0x28, 0xa9, 0x34, 0x3a, 0xc7, 0xc8, 0xc5, 0x1c, 0xec, 0xe2, 0x2d, 0x64, 0xcf, 0xc5, 0x1a, 0x94,
- 0x9a, 0x98, 0x52, 0x29, 0x24, 0xa9, 0x87, 0xa9, 0x5c, 0x0f, 0xac, 0x56, 0x0a, 0xb7, 0x94, 0x12,
- 0x83, 0x90, 0x13, 0x17, 0x47, 0x70, 0x46, 0x69, 0x49, 0x4a, 0x7e, 0x79, 0x1e, 0x05, 0x66, 0xb0,
- 0x79, 0xa4, 0x26, 0xe6, 0x94, 0x64, 0x90, 0x6b, 0x82, 0x06, 0xa3, 0x13, 0x6b, 0x14, 0x73, 0x71,
- 0x4a, 0x76, 0x12, 0x1b, 0xd8, 0xef, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x22, 0x81,
- 0x1e, 0x08, 0x01, 0x00, 0x00,
+ 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x2d, 0x2e, 0x49, 0x4c, 0xca, 0x49, 0xd5, 0x4b, 0x4c,
+ 0xcf, 0xcf, 0x4b, 0x2d, 0xd6, 0x4b, 0x49, 0x2d, 0xd3, 0x2b, 0x4e, 0xc9, 0x56, 0x62, 0xe7, 0x62,
+ 0x75, 0xcd, 0x2d, 0x28, 0xa9, 0x34, 0x7a, 0xc0, 0xc8, 0xc5, 0x1c, 0xec, 0xe2, 0x2d, 0xe4, 0xca,
+ 0xc5, 0x1a, 0x94, 0x9a, 0x98, 0x52, 0x29, 0x24, 0xa3, 0x87, 0x55, 0x87, 0x1e, 0x58, 0xb9, 0x14,
+ 0x5e, 0x59, 0x25, 0x06, 0x21, 0x0f, 0x2e, 0x8e, 0xe0, 0x8c, 0xd2, 0x92, 0x94, 0xfc, 0xf2, 0x3c,
+ 0x8a, 0x4d, 0x62, 0xf3, 0x48, 0x4d, 0xcc, 0x29, 0xc9, 0xa0, 0xcc, 0x1c, 0x0d, 0x46, 0x27, 0xd6,
+ 0x28, 0xe6, 0xe2, 0x94, 0xec, 0x24, 0x36, 0x70, 0x80, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff,
+ 0x67, 0x99, 0xbb, 0xc6, 0x1d, 0x01, 0x00, 0x00,
}