Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update client-go for kubernetes-1.14.10 #1404

Merged
merged 2 commits into from
Mar 17, 2020
Merged

update client-go for kubernetes-1.14.10 #1404

merged 2 commits into from
Mar 17, 2020

Conversation

heartrobotninja
Copy link
Contributor

Update client-go
Remove vendor-fixes 🎉
Fix metric definitions to coincide with client-go update.

@heartrobotninja
Copy link
Contributor Author

/assign @roberthbailey

@agones-bot
Copy link
Collaborator

Build Succeeded 👏

Build Id: 80a4caf9-f10f-43f0-8a24-c8bdd5e871d8

The following development artifacts have been built, and will exist for the next 30 days:

A preview of the website (the last 30 builds are retained):

To install this version:

  • git fetch https://github.com/GoogleCloudPlatform/agones.git pull/1404/head:pr_1404 && git checkout pr_1404
  • helm install ./install/helm/agones --namespace agones-system --name agones --set agones.image.tag=1.5.0-3e9858f

@aLekSer
Copy link
Collaborator

aLekSer commented Mar 10, 2020

Thanks for this update!

I have just noticed when I do go mod tidy on your changes:

git diff                                                                                                                                                           
diff --git a/go.mod b/go.mod
index 149ac454..5557f2b3 100644
--- a/go.mod
+++ b/go.mod
@@ -36,11 +36,11 @@ require (
        github.com/stretchr/testify v1.3.0
        go.opencensus.io v0.18.0
        golang.org/x/net v0.0.0-20190311183353-d8887717615a
+       golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890
        golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect
        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
-       google.golang.org/appengine v1.4.0 // indirect
        google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03
        google.golang.org/grpc v1.20.1
        gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect

Let me know if someone also see this. Could be issue with my local setup.
go mod vendor also removes some files.

        modified:   go.mod                                                                                                                                                                               
        deleted:    vendor/golang.org/x/sys/unix/mkasm_darwin.go                                                                                                                                         
        deleted:    vendor/golang.org/x/sys/unix/mkpost.go                                                                                                                                               
        deleted:    vendor/golang.org/x/sys/unix/mksyscall.go                                                                                                                                            
        deleted:    vendor/golang.org/x/sys/unix/mksyscall_aix_ppc.go
        deleted:    vendor/golang.org/x/sys/unix/mksyscall_aix_ppc64.go

@heartrobotninja
Copy link
Contributor Author

I have done go clean -modcache; go mod tidy; go mod verify; and go mod vendor and I am not seeing the same diff, here is my go.mod file:

module agones.dev/agones

go 1.13

require (
        cloud.google.com/go v0.34.0
        contrib.go.opencensus.io/exporter/stackdriver v0.8.0
        fortio.org/fortio v1.3.1
        github.com/ahmetb/gen-crd-api-reference-docs v0.1.1
        github.com/aws/aws-sdk-go v1.16.20 // indirect
        github.com/evanphx/json-patch v4.5.0+incompatible // indirect
        github.com/fsnotify/fsnotify v1.4.7
        github.com/go-openapi/spec v0.19.0
        github.com/gogo/protobuf v1.2.1 // indirect
        github.com/golang/groupcache v0.0.0-20171101203131-84a468cf14b4 // indirect
        github.com/golang/protobuf v1.3.2
        github.com/google/gofuzz v1.0.0 // indirect
        github.com/google/uuid v1.1.0 // indirect
        github.com/googleapis/gnostic v0.1.0 // indirect
        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.3
        github.com/spf13/viper v1.3.1
        github.com/stretchr/testify v1.3.0
        go.opencensus.io v0.18.0
        golang.org/x/net v0.0.0-20190311183353-d8887717615a
        golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect
        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
        google.golang.org/appengine v1.4.0 // indirect
        google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03
        google.golang.org/grpc v1.20.1
        gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
        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
        gopkg.in/yaml.v2 v2.2.2
        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/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
)

@heartrobotninja
Copy link
Contributor Author

@aLekSer I am not sure what is causing the difference. Did you have changes in the client you did the diff from?

@aLekSer
Copy link
Collaborator

aLekSer commented Mar 11, 2020

@heartrobotninja I will double check this on a clean environment (fresh clone)

@aLekSer
Copy link
Collaborator

aLekSer commented Mar 11, 2020

This might be related to this ticket:
golang/go#33151
I am using go 1.13.3
Also there is an option to perform go mod tidy from make shell to have equivalent golang versions (go1.13.5 linux/amd64 in make shell).

@@ -1,6 +1,6 @@
{
"name": "@google-cloud/agones-sdk",
"version": "1.3.0",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@markmandel We may need to add a step to the process for publishing to prevent this file getting modified later as seen here and in other reviews. Here's what we do internally:

  1. Increment version in package.json
  2. Run npm i which will also update package-lock.json
  3. Run npm publish

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should revert the changes to this file in this PR and update nodejs dependencies independently of client-go dependencies.

@roberthbailey
Copy link
Member

/assign @aLekSer

@roberthbailey
Copy link
Member

@heartrobotninja - I took a look and other than the comment from @steven-supersolid I think we just need to resolve the delta between what you and @aLekSer are seeing in go.mod to get this merged.

@aLekSer
Copy link
Collaborator

aLekSer commented Mar 16, 2020

I found an issue that caused part of the diff:

go mod why -m golang.org/x/oauth2
# golang.org/x/oauth2
agones.dev/agones/test/sdk/restapi/swagger
golang.org/x/oauth2

make clean-sdk-conformance-tests helped to resolve this issue.

This line only left:

-       google.golang.org/appengine v1.4.0 // indirect

@aLekSer
Copy link
Collaborator

aLekSer commented Mar 16, 2020

@heartrobotninja I approve all other changes, but go.mod should be updated.
I assume you are using a Go version less than in base build image (1.12? ). In order to fix this discrepancy you can run go mod tidy command from make shell, or install version 1.13.5 or latest.

$ gvm use go1.13
Now using version go1.13
$ go mod tidy
git diff
diff --git a/go.mod b/go.mod
index 149ac454..6f643772 100644
--- a/go.mod
+++ b/go.mod
@@ -40,7 +40,6 @@ require (
        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
-       google.golang.org/appengine v1.4.0 // indirect
        google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03
        google.golang.org/grpc v1.20.1
        gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
$ gvm use go1.12
Now using version go1.12
$ go mod tidy
$ git diff | wc -l
0

@heartrobotninja
Copy link
Contributor Author

Ok it turns out I was using go-1.12.4. Updated and re-ran go mod tidy/verify/vendor and rebased on most current googleforgames/agones master.

@agones-bot
Copy link
Collaborator

Build Failed 😱

Build Id: 2cfc90ba-a25b-4001-a21a-d0c7e5ab4cdc

To get permission to view the Cloud Build view, join the agones-discuss Google Group.

Copy link
Collaborator

@aLekSer aLekSer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @heartrobotninja now we would not have issues with vendor_fixes.

@roberthbailey
Copy link
Member

--- FAIL: TestGameServerReserve (119.09s)
    gameserver_test.go:499: 
        	Error Trace:	gameserver_test.go:499
        	Error:      	Received unexpected error:
        	            	timed out waiting for the condition
        	            	waiting for GameServer to be Reserved default/udp-server2d6dl
        	            	agones.dev/agones/test/e2e/framework.(*Framework).WaitForGameServerStateWithLogger
        	            		/go/src/agones.dev/agones/test/e2e/framework/framework.go:166
        	            	agones.dev/agones/test/e2e.TestGameServerReserve
        	            		/go/src/agones.dev/agones/test/e2e/gameserver_test.go:498
        	            	testing.tRunner
        	            		/usr/local/go/src/testing/testing.go:909
        	            	runtime.goexit
        	            		/usr/local/go/src/runtime/asm_amd64.s:1357
        	Test:       	TestGameServerReserve
        	Messages:   	GameServer Name: udp-server2d6dl
    gameserver_test.go:500: 
        	Error Trace:	gameserver_test.go:500
        	Error:      	Not equal: 
        	            	expected: "Reserved"
        	            	actual  : "Ready"
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1,2 +1,2 @@
        	            	-(v1.GameServerState) (len=8) "Reserved"
        	            	+(v1.GameServerState) (len=5) "Ready"
        	            	 
        	Test:       	TestGameServerReserve
        	Messages:   	GameServer Name: udp-server2d6dl

@roberthbailey
Copy link
Member

I'm going to re-run the test to see if this is a flake or not.

@agones-bot
Copy link
Collaborator

Build Succeeded 👏

Build Id: a4be0fed-b8d5-4a5d-8427-bf091ca2000f

The following development artifacts have been built, and will exist for the next 30 days:

A preview of the website (the last 30 builds are retained):

To install this version:

  • git fetch https://github.com/GoogleCloudPlatform/agones.git pull/1404/head:pr_1404 && git checkout pr_1404
  • helm install ./install/helm/agones --namespace agones-system --name agones --set agones.image.tag=1.5.0-d724ae6

@google-oss-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aLekSer, heartrobotninja, roberthbailey

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@roberthbailey roberthbailey merged commit af20b4e into googleforgames:master Mar 17, 2020
@roberthbailey
Copy link
Member

xref #1329

@roberthbailey roberthbailey mentioned this pull request Mar 26, 2020
29 tasks
@markmandel markmandel added this to the 1.5.0 milestone Apr 7, 2020
@markmandel markmandel added the kind/cleanup Refactoring code, fixing up documentation, etc label Apr 7, 2020
ilkercelikyilmaz pushed a commit to ilkercelikyilmaz/agones that referenced this pull request Oct 23, 2020
* update client-go for kubernetes-1.14.10

* Update go.mod using go 1.13.8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved kind/cleanup Refactoring code, fixing up documentation, etc lgtm size/XXL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants