Permalink
Browse files

Update gRPC to v1.16.1

In preparation for #421, this updates gRPC (and associated libraries) to
v1.16.1. This also updates the simple-udp, cpp-simple and xonotic examples
as well.
  • Loading branch information...
markmandel committed Dec 1, 2018
1 parent 007d0ba commit 47825e48340388a6720531e4dac4834076b22e97
Showing 678 changed files with 89,837 additions and 21,986 deletions.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -46,11 +46,15 @@
[[constraint]]
name = "google.golang.org/grpc"
version = "1.12.0"
version = "1.16.0"
[[override]]
name = "golang.org/x/sys"
revision = "4ed8d59d0b35e1e29334a206d1b3f38b1e5dfb31"
[[constraint]]
name = "github.com/golang/protobuf"
version = "1.1.0"
version = "1.2.0"
[[constraint]]
branch = "master"
@@ -60,6 +64,6 @@
branch = "master"
name = "github.com/heptiolabs/healthcheck"
[[constraint]]
[[override]]
name = "github.com/grpc-ecosystem/grpc-gateway"
version = "1.4.1"
version = "1.5.1"
@@ -49,7 +49,7 @@ MINIKUBE_PROFILE ?= agones
GO_BUILD_TAGS ?= none
# Game Server image to use while doing end-to-end tests
GS_TEST_IMAGE ?= gcr.io/agones-images/udp-server:0.4
GS_TEST_IMAGE ?= gcr.io/agones-images/udp-server:0.5
# Directory that this Makefile is in.
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
@@ -16,12 +16,35 @@
# compiling proto + grpc takes an exceptionally long time
# so we'll use a base from `base` - which is manually built using the below tag.
FROM gcr.io/agones-images/grpc-cxx:1.12
FROM gcr.io/agones-images/grpc-cxx:1.16.1
RUN apt-get update && \
apt-get install -y wget psmisc rsync make python bash-completion zip nano jq graphviz && \
apt-get clean
# _
# | | __ _ _ __ __ _ _ _ __ _ __ _ ___ ___
# | | / _` | '_ \ / _` | | | |/ _` |/ _` |/ _ \ __|
# | |___ (_| | | | | (_| | |_| | (_| | (_| | __\__ \
# |_____\__,_|_| |_|\__, |\__,_|\__,_|\__, |\___|___/
# |___/ |___/
# install rust
ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH \
RUST_VERSION=1.26.1
ENV RUST_ARCH=x86_64-unknown-linux-gnu \
RUSTUP_SHA256=c9837990bce0faab4f6f52604311a19bb8d2cde989bea6a7b605c8e526db6f02
RUN wget -q https://static.rust-lang.org/rustup/archive/1.11.0/${RUST_ARCH}/rustup-init && \
echo "${RUSTUP_SHA256} *rustup-init" | sha256sum -c - && \
chmod +x rustup-init && \
./rustup-init -y --no-modify-path --default-toolchain $RUST_VERSION && \
rm rustup-init && \
rustup --version; \
cargo --version; \
rustc --version;
# install go
WORKDIR /usr/local
ENV GO_VERSION=1.11.1
@@ -58,12 +81,23 @@ RUN curl -L ${HELM_URL} > /tmp/helm.tar.gz \
&& rm /tmp/helm.tar.gz && rm -rf /tmp/linux-amd64
RUN echo "source <(helm completion bash)" >> /root/.bashrc
# ____ ____ ____ _____ _ _
# __ _| _ \| _ \ / ___| |_ _|__ ___ | (_)_ __ __ _
# / _` | |_) | |_) | | | |/ _ \ / _ \| | | '_ \ / _` |
# | (_| | _ <| __/| |___ | | (_) | (_) | | | | | | (_| |
# \__, |_| \_\_| \____| |_|\___/ \___/|_|_|_| |_|\__, |
# |___/ |___/
# install go-proto-gen 1.1
RUN mkdir -p /go/src/github.com/golang && cd /go/src/github.com/golang && \
git clone https://github.com/golang/protobuf.git && \
cd protobuf && git checkout v1.1.0 && \
cd protobuf && git checkout v1.2.0 && \
go install github.com/golang/protobuf/protoc-gen-go
# install rust tooling for SDK generation
RUN cargo install protobuf-codegen --vers 2.0.2
RUN cargo install grpcio-compiler --vers 0.3.0
# install go tooling for development, building and testing
RUN go get -u github.com/golang/dep/cmd/dep && \
go get -u golang.org/x/tools/cmd/goimports
@@ -75,26 +109,6 @@ RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.s
RUN mkdir -p /go/src && cd /go/src && mkdir -p k8s.io && cd k8s.io && \
git clone -b kubernetes-1.10.5 --depth=3 https://github.com/kubernetes/code-generator.git
# install rust
ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH \
RUST_VERSION=1.26.1
ENV RUST_ARCH=x86_64-unknown-linux-gnu \
RUSTUP_SHA256=c9837990bce0faab4f6f52604311a19bb8d2cde989bea6a7b605c8e526db6f02
RUN wget -q https://static.rust-lang.org/rustup/archive/1.11.0/${RUST_ARCH}/rustup-init && \
echo "${RUSTUP_SHA256} *rustup-init" | sha256sum -c - && \
chmod +x rustup-init && \
./rustup-init -y --no-modify-path --default-toolchain $RUST_VERSION && \
rm rustup-init && \
rustup --version; \
cargo --version; \
rustc --version;
# install rust tooling for SDK generation
RUN cargo install protobuf-codegen --vers 2.0.2
RUN cargo install grpcio-compiler --vers 0.3.0
# make sure we keep the path to go
RUN echo "export PATH=/usr/local/go/bin:/go/bin/:\$PATH" >> /root/.bashrc
# make nano the editor
@@ -15,7 +15,7 @@
#
# This image is manually built (for now)
# as gcr.io/agones-images/grpc-cxx:1.12
# as gcr.io/agones-images/grpc-cxx:1.16.1
#
FROM debian:stretch
@@ -26,14 +26,14 @@ RUN apt-get update && apt-get install -y \
&& apt-get clean
# install protobuf first, then grpc
ENV GRPC_RELEASE_TAG v1.12.x
RUN git clone -b ${GRPC_RELEASE_TAG} https://github.com/grpc/grpc /var/local/git/grpc && \
ENV GRPC_RELEASE_TAG v1.16.1
RUN git clone -b ${GRPC_RELEASE_TAG} --depth=5 https://github.com/grpc/grpc /var/local/git/grpc && \
cd /var/local/git/grpc && \
git submodule update --init && \
echo "--- installing protobuf ---" && \
cd third_party/protobuf && \
./autogen.sh && ./configure --enable-shared && \
make -j$(nproc) && make -j$(nproc) check && make install && make clean && ldconfig && \
make -j$(nproc) && make install && make clean && ldconfig && \
echo "--- installing grpc ---" && \
cd /var/local/git/grpc && \
make -j$(nproc) && make install && make clean && ldconfig
@@ -83,7 +83,7 @@ func main() {
Spec: v1alpha1.GameServerSpec{
Template: corev1.PodTemplateSpec{
Spec: corev1.PodSpec{
Containers: []corev1.Container{{Name: "udp-server", Image: "gcr.io/agones-images/udp-server:0.4"}},
Containers: []corev1.Container{{Name: "udp-server", Image: "gcr.io/agones-images/udp-server:0.5"}},
},
},
},
@@ -171,7 +171,7 @@ $ curl http://localhost:8001/apis/stable.agones.dev/v1alpha1/namespaces/default/
"kind": "GameServer",
"metadata": {
"annotations": {
"kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"stable.agones.dev/v1alpha1\",\"kind\":\"GameServer\",\"metadata\":{\"annotations\":{},\"name\":\"simple-udp\",\"namespace\":\"default\"},\"spec\":{\"containerPort\":7654,\"hostPort\":7777,\"portPolicy\":\"static\",\"template\":{\"spec\":{\"containers\":[{\"image\":\"gcr.io/agones-images/udp-server:0.4\",\"name\":\"simple-udp\"}]}}}}\n"
"kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"stable.agones.dev/v1alpha1\",\"kind\":\"GameServer\",\"metadata\":{\"annotations\":{},\"name\":\"simple-udp\",\"namespace\":\"default\"},\"spec\":{\"containerPort\":7654,\"hostPort\":7777,\"portPolicy\":\"static\",\"template\":{\"spec\":{\"containers\":[{\"image\":\"gcr.io/agones-images/udp-server:0.5\",\"name\":\"simple-udp\"}]}}}}\n"
},
"clusterName": "",
"creationTimestamp": "2018-03-02T21:41:05Z",
@@ -203,7 +203,7 @@ $ curl http://localhost:8001/apis/stable.agones.dev/v1alpha1/namespaces/default/
"spec": {
"containers": [
{
"image": "gcr.io/agones-images/udp-server:0.4",
"image": "gcr.io/agones-images/udp-server:0.5",
"name": "simple-udp",
"resources": {}
}
@@ -311,7 +311,7 @@ $ curl -d '{"apiVersion":"stable.agones.dev/v1alpha1","kind":"FleetAllocation","
"spec": {
"containers": [
{
"image": "gcr.io/agones-images/udp-server:0.4",
"image": "gcr.io/agones-images/udp-server:0.5",
"name": "simple-udp",
"resources": {}
}
@@ -109,7 +109,7 @@ Spec:
Creation Timestamp: <nil>
Spec:
Containers:
Image: gcr.io/agones-images/udp-server:0.4
Image: gcr.io/agones-images/udp-server:0.5
Name: simple-udp
Resources:
Status:
@@ -225,7 +225,7 @@ status:
creationTimestamp: null
spec:
containers:
- image: gcr.io/agones-images/udp-server:0.4
- image: gcr.io/agones-images/udp-server:0.5
name: simple-udp
resources: {}
status:
@@ -104,7 +104,7 @@ Spec:
Creation Timestamp: <nil>
Spec:
Containers:
Image: gcr.io/agones-images/udp-server:0.4
Image: gcr.io/agones-images/udp-server:0.5
Name: simple-udp
Resources:
Status:
@@ -35,7 +35,7 @@ spec:
spec:
containers:
- name: simple-udp
image: gcr.io/agones-images/udp-server:0.4
image: gcr.io/agones-images/udp-server:0.5
resources:
limit:
cpu: "250m" #this is our limit here
@@ -98,7 +98,7 @@ spec:
spec:
containers:
- name: simple-udp
image: gcr.io/agones-images/udp-server:0.4
image: gcr.io/agones-images/udp-server:0.5
```
This is the *default* Fleet scheduling strategy. It is designed for dynamic Kubernetes environments, wherein you wish
@@ -153,7 +153,7 @@ spec:
spec:
containers:
- name: simple-udp
image: gcr.io/agones-images/udp-server:0.4
image: gcr.io/agones-images/udp-server:0.5
```
This Fleet scheduling strategy is designed for static Kubernetes environments, such as when you are running Kubernetes
@@ -32,7 +32,7 @@ REPOSITORY = gcr.io/agones-images
# Directory that this Makefile is in.
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
project_path := $(dir $(mkfile_path))
server_tag = $(REPOSITORY)/cpp-simple-server:0.3
server_tag = $(REPOSITORY)/cpp-simple-server:0.4
# _____ _
# |_ _|_ _ _ __ __ _ ___| |_ ___
@@ -30,5 +30,5 @@ spec:
spec:
containers:
- name: cpp-simple
image: gcr.io/agones-images/cpp-simple-server:0.3
image: gcr.io/agones-images/cpp-simple-server:0.4
# imagePullPolicy: Always # add for development
Oops, something went wrong.

0 comments on commit 47825e4

Please sign in to comment.