Skip to content

Commit

Permalink
Upgrade client-go and related to 1.15
Browse files Browse the repository at this point in the history
This upgrade client-go, apimachinery, apiextensions-apiserver and
related to support Kubernetes 1.15, as well as regenerated clients for
our CRDs.

Also included is a fix to gen-crd-client.sh such that it can now use Go
modules, as otherwise it was failing to generate clients.

Work on #1478
  • Loading branch information
markmandel committed May 8, 2020
1 parent 174f49e commit a4e277e
Show file tree
Hide file tree
Showing 309 changed files with 15,081 additions and 15,552 deletions.
2 changes: 1 addition & 1 deletion build/build-image/Dockerfile
Expand Up @@ -107,7 +107,7 @@ RUN echo "export EDITOR=nano" >> /root/.bashrc
# install terraform
RUN wget -nv -O terraform.zip https://releases.hashicorp.com/terraform/0.12.21/terraform_0.12.21_linux_amd64.zip && unzip ./terraform.zip && mv terraform /usr/local/bin/

# code generation scripts
# code generation scripts #v4
COPY *.sh /root/
RUN chmod +x /root/*.sh

Expand Down
8 changes: 1 addition & 7 deletions build/build-image/gen-crd-client.sh
Expand Up @@ -16,13 +16,7 @@

set -x

# k8s.io/code-generator/generate-groups is not module-ready so it breaks things.
export GO111MODULE=off
rm -r $GOPATH/src/agones.dev/agones/pkg/client
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" \
bash /go/src/k8s.io/code-generator/generate-groups.sh "all" \
agones.dev/agones/pkg/client \
agones.dev/agones/pkg/apis "allocation:v1 agones:v1 multicluster:v1 autoscaling:v1" \
--go-header-file=/go/src/agones.dev/agones/build/boilerplate.go.txt

13 changes: 5 additions & 8 deletions go.mod
Expand Up @@ -20,22 +20,20 @@ require (
github.com/grpc-ecosystem/grpc-gateway v1.11.3
github.com/hashicorp/golang-lru v0.5.1 // indirect
github.com/heptiolabs/healthcheck v0.0.0-20171201210846-da5fdee475fb
github.com/imdario/mergo v0.3.5 // indirect
github.com/joonix/log v0.0.0-20180502111528-d2d3f2f4a806
github.com/json-iterator/go v1.1.5 // indirect
github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a
github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d
github.com/onsi/ginkgo v1.8.0 // indirect
github.com/onsi/gomega v1.5.0 // indirect
github.com/pborman/uuid v1.2.0 // indirect
github.com/pkg/errors v0.8.1
github.com/prometheus/client_golang v0.9.2
github.com/sirupsen/logrus v1.2.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.3.1
github.com/stretchr/testify v1.5.0
go.opencensus.io v0.22.3
golang.org/x/net v0.0.0-20190620200207-3b0461eec859
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384
google.golang.org/api v0.0.0-20190117000611-43037ff31f69 // indirect
Expand All @@ -45,11 +43,10 @@ require (
gopkg.in/fsnotify.v1 v1.4.7
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3
k8s.io/api v0.0.0-20191004102349-159aefb8556b // kubernetes-1.14.10
k8s.io/apiextensions-apiserver v0.0.0-20191212015246-8fe0c124fb40 // kubernetes-1.14.10
k8s.io/apimachinery v0.0.0-20191004074956-c5d2f014d689 // kubernetes-1.14.10
k8s.io/client-go v11.0.1-0.20191029005444-8e4128053008+incompatible // kubernetes-1.14.10
k8s.io/api v0.15.11 // kubernetes-1.14.10
k8s.io/apiextensions-apiserver v0.0.0-20200318010201-8546efc3bc75 // kubernetes-1.14.10
k8s.io/apimachinery v0.15.11 // kubernetes-1.14.10
k8s.io/client-go v0.15.11 // kubernetes-1.14.10
k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058 // indirect
k8s.io/utils v0.0.0-20200124190032-861946025e34 // indirect
sigs.k8s.io/yaml v1.1.0 // indirect
)
153 changes: 145 additions & 8 deletions go.sum

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions pkg/apis/agones/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/apis/allocation/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/apis/autoscaling/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/apis/multicluster/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion pkg/client/clientset/versioned/fake/clientset_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Expand Up @@ -5060,7 +5060,6 @@ <h3 id="WebhookPolicy">WebhookPolicy
<p><code>service</code> is a reference to the service for this webhook. Either
<code>service</code> or <code>url</code> must be specified.</p>
<p>If the webhook is running within the cluster, then you should use <code>service</code>.</p>
<p>Port 443 will be used if it is open, otherwise it is an error.</p>
</td>
</tr>
<tr>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a4e277e

Please sign in to comment.