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 tools - vetshadow is more aggressive #222

Merged
merged 2 commits into from
May 24, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# ForceUpdate 3 -- change here if you need to force a rebuild
# ForceUpdate 4 -- 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.
Expand Down
9 changes: 6 additions & 3 deletions cmd/sdk-server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,20 @@ func main() {
if isLocal {
sdk.RegisterSDKServer(grpcServer, &gameservers.LocalSDKServer{})
} else {
config, err := rest.InClusterConfig()
var config *rest.Config
config, err = rest.InClusterConfig()
if err != nil {
logger.WithError(err).Fatal("Could not create in cluster config")
}

kubeClient, err := kubernetes.NewForConfig(config)
var kubeClient *kubernetes.Clientset
kubeClient, err = kubernetes.NewForConfig(config)
if err != nil {
logger.WithError(err).Fatal("Could not create the kubernetes clientset")
}

agonesClient, err := versioned.NewForConfig(config)
var agonesClient *versioned.Clientset
agonesClient, err = versioned.NewForConfig(config)
if err != nil {
logger.WithError(err).Fatalf("Could not create the agones api clientset")
}
Expand Down
5 changes: 3 additions & 2 deletions pkg/gameservers/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ func (c *Controller) syncGameServerDeletionTimestamp(gs *stablev1alpha1.GameServ
if len(pods) > 0 {
c.logger.WithField("pods", pods).WithField("gsName", gs.ObjectMeta.Name).Info("Found pods, deleting")
for _, p := range pods {
err := c.podGetter.Pods(p.ObjectMeta.Namespace).Delete(p.ObjectMeta.Name, nil)
err = c.podGetter.Pods(p.ObjectMeta.Namespace).Delete(p.ObjectMeta.Name, nil)
if err != nil {
return gs, errors.Wrapf(err, "error deleting pod for GameServer %s, %s", gs.ObjectMeta.Name, p.ObjectMeta.Name)
}
Expand Down Expand Up @@ -368,7 +368,8 @@ func (c *Controller) syncGameServerCreatingState(gs *stablev1alpha1.GameServer)

if len(ret) == 0 {
sidecar := c.sidecar(gs)
pod, err := gs.Pod(sidecar)
var pod *corev1.Pod
pod, err = gs.Pod(sidecar)

// this shouldn't happen, but if it does.
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions pkg/gameservers/portallocator.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ func NewPortAllocator(minPort, maxPort int32,
if oldNode.Spec.Unschedulable != newNode.Spec.Unschedulable {
err := pa.syncPortAllocations()
if err != nil {
err := errors.Wrap(err, "error resetting ports on node update")
err = errors.Wrap(err, "error resetting ports on node update")
runtime.HandleError(pa.logger.WithField("node", newNode), err)
}
}
},
DeleteFunc: func(obj interface{}) {
err := pa.syncPortAllocations()
if err != nil {
err := errors.Wrap(err, "error on node deletion")
err = errors.Wrap(err, "error on node deletion")
runtime.HandleError(pa.logger.WithField("node", obj), err)
}
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/gameservers/sdkserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func (s *SDKServer) Run(stop <-chan struct{}) {
if err == http.ErrServerClosed {
s.logger.WithError(err).Info("health check: http server closed")
} else {
err := errors.Wrap(err, "Could not listen on :8080")
err = errors.Wrap(err, "Could not listen on :8080")
runtime.HandleError(s.logger.WithError(err), err)
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/workerqueue/workerqueue.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func (wq *WorkerQueue) Enqueue(obj interface{}) {
var key string
var err error
if key, err = cache.MetaNamespaceKeyFunc(obj); err != nil {
err := errors.Wrap(err, "Error creating key for object")
err = errors.Wrap(err, "Error creating key for object")
runtime.HandleError(wq.logger.WithField("obj", obj), err)
return
}
Expand Down