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

Updates for K8 client package #189

Closed
wants to merge 5 commits into from
Closed
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
Next Next commit
Update kubernetes client api to 1.10
rifelpet authored and Justin Nauman committed Feb 8, 2019
commit 37601ccb023de355becd056e3b4f847cd92add83
328 changes: 156 additions & 172 deletions glide.lock

Large diffs are not rendered by default.

15 changes: 11 additions & 4 deletions glide.yaml
Original file line number Diff line number Diff line change
@@ -11,12 +11,14 @@ import:
- package: github.com/karlseguin/ccache
- package: github.com/spf13/pflag
- package: k8s.io/apimachinery
- package: k8s.io/client-go
version: v2.0.0
version: kubernetes-1.10.12
subpackages:
- pkg/api/v1
- kubernetes
- pkg/fields
- package: k8s.io/client-go
version: v10.0.0
subpackages:
- kubernetes
- rest
- package: github.com/cenk/backoff
- package: github.com/coreos/go-iptables
@@ -29,4 +31,9 @@ import:
- package: github.com/prometheus/client_golang
version: v0.9.0-pre1
subpackages:
- prometheus/promhttp
- prometheus/promhttp
- package: github.com/go-errors/errors
- package: k8s.io/api
version: kubernetes-1.10.12
subpackages:
- core/v1
14 changes: 7 additions & 7 deletions k8s/k8s.go
Original file line number Diff line number Diff line change
@@ -5,10 +5,10 @@ import (
"time"

"github.com/jtblin/kube2iam"
v1 "k8s.io/api/core/v1"
selector "k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/pkg/api/v1"
selector "k8s.io/client-go/pkg/fields"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/cache"
)
@@ -23,9 +23,9 @@ const (
// Client represents a kubernetes client.
type Client struct {
*kubernetes.Clientset
namespaceController *cache.Controller
namespaceController cache.Controller
namespaceIndexer cache.Indexer
podController *cache.Controller
podController cache.Controller
podIndexer cache.Indexer
nodeName string
}
@@ -129,9 +129,9 @@ func NewClient(host, token, nodeName string, insecure bool) (*Client, error) {
var err error
if host != "" && token != "" {
config = &rest.Config{
Host: host,
BearerToken: token,
Insecure: insecure,
Host: host,
BearerToken: token,
TLSClientConfig: rest.TLSClientConfig{Insecure: insecure},
}
} else {
config, err = rest.InClusterConfig()
2 changes: 1 addition & 1 deletion mappings/mapper.go
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ import (

glob "github.com/ryanuber/go-glob"
log "github.com/sirupsen/logrus"
"k8s.io/client-go/pkg/api/v1"
v1 "k8s.io/api/core/v1"

"github.com/jtblin/kube2iam"
"github.com/jtblin/kube2iam/iam"
2 changes: 1 addition & 1 deletion mappings/mapper_test.go
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"k8s.io/client-go/pkg/api/v1"
v1 "k8s.io/api/core/v1"

"github.com/jtblin/kube2iam/iam"
)
2 changes: 1 addition & 1 deletion namespace.go
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ import (
"fmt"

log "github.com/sirupsen/logrus"
"k8s.io/client-go/pkg/api/v1"
v1 "k8s.io/api/core/v1"
)

// NamespaceHandler outputs change events from K8.
2 changes: 1 addition & 1 deletion namespace_test.go
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ package kube2iam
import (
"testing"

"k8s.io/client-go/pkg/api/v1"
v1 "k8s.io/api/core/v1"
)

func TestGetNamespaceRoleAnnotation(t *testing.T) {
7 changes: 4 additions & 3 deletions pod.go
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ import (
"fmt"

log "github.com/sirupsen/logrus"
"k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/pkg/api/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/tools/cache"
)

@@ -74,7 +74,8 @@ func (p *PodHandler) OnDelete(obj interface{}) {
func isPodActive(p *v1.Pod) bool {
podDeleted := false
if p.DeletionTimestamp != nil {
podDeleted = p.DeletionTimestamp.Before(unversioned.Now())
now := metav1.Now()
podDeleted = p.DeletionTimestamp.Before(&now)
}
return p.Status.PodIP != "" &&
v1.PodSucceeded != p.Status.Phase &&