Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2015c19

Browse files
jmukjmuk
authored
update kubernetes client library package (istio#975)
Former-commit-id: f522cb62349d2f7feea89ab704bd52ae2707823f
1 parent 7ddc732 commit 2015c19

File tree

6 files changed

+59
-28
lines changed

6 files changed

+59
-28
lines changed

‎mixer/WORKSPACE‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ workspace(name = "com_github_istio_mixer")
22

33
git_repository(
44
name = "io_bazel_rules_go",
5-
commit = "4c9a52aba0b59511c5646af88d2f93a9c0193647", # May 5, 2017 (0.4.4)
5+
commit = "de4f17a549ec4b21566877f5a0f3fff0ba40931e", # July 17 2017 (0.5.2)
66
remote = "https://github.com/bazelbuild/rules_go.git",
77
)
88

@@ -299,9 +299,27 @@ new_go_repository(
299299
importpath = "github.com/bsm/redeo",
300300
)
301301

302+
new_go_repository(
303+
name = "io_k8s_api",
304+
build_file_generation = "on",
305+
build_file_name = "BUILD.bazel",
306+
commit = "4d5cc6efc5e84aa19fb1bd3f911c16a6723c1bb7", # Jul 19, 2017 (no releases)
307+
importpath = "k8s.io/api",
308+
)
309+
310+
new_go_repository(
311+
name = "io_k8s_apimachinery",
312+
build_file_generation = "on",
313+
build_file_name = "BUILD.bazel",
314+
commit = "6134cb2da6d90597b0434e349f90f94fafc9ae51", # Jun 19, 2017 (no releases)
315+
importpath = "k8s.io/apimachinery",
316+
)
317+
302318
new_go_repository(
303319
name = "io_k8s_client_go",
304-
commit = "243d8a9cb66a51ad8676157f79e71033b4014a2a", # Dec 11, 2016 (matches istio manager)
320+
build_file_generation = "on",
321+
build_file_name = "BUILD.bazel",
322+
commit = "7c69e980210777a6292351ac6873de083526f08e", # Jul 18, 2017 (no releases)
305323
importpath = "k8s.io/client-go",
306324
)
307325

@@ -335,12 +353,24 @@ new_go_repository(
335353
importpath = "github.com/google/gofuzz",
336354
)
337355

356+
new_go_repository(
357+
name = "com_github_googleapis_gnostic",
358+
commit = "0c5108395e2debce0d731cf0287ddf7242066aba", # Jul 29, 2017 (no releases)
359+
importpath = "github.com/googleapis/gnostic",
360+
)
361+
338362
new_go_repository(
339363
name = "com_github_emicklei_go_restful",
340364
commit = "09691a3b6378b740595c1002f40c34dd5f218a22", # Dec 12, 2016 (k8s deps)
341365
importpath = "github.com/emicklei/go-restful",
342366
)
343367

368+
new_go_repository(
369+
name = "com_github_emicklei_go_restful_swagger12",
370+
commit = "dcef7f55730566d41eae5db10e7d6981829720f6", # Feb 8, 2017 (no releases)
371+
importpath = "github.com/emicklei/go-restful-swagger12",
372+
)
373+
344374
new_go_repository(
345375
name = "com_github_go_openapi_jsonpointer",
346376
commit = "46af16f9f7b149af66e5d1bd010e3574dc06de98", # Jul 4, 2016 (no releases)
@@ -367,7 +397,7 @@ new_go_repository(
367397

368398
new_go_repository(
369399
name = "com_github_juju_ratelimit",
370-
commit = "acf38b000a03e4ab89e40f20f1e548f4e6ac7f72", # Mar 13, 2017 (no releases)
400+
commit = "5b9ff866471762aa2ab2dced63c9fb6f53921342", # May 23, 2017 (no releases)
371401
importpath = "github.com/juju/ratelimit",
372402
)
373403

‎mixer/adapter/kubernetes/BUILD‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ go_library(
1212
deps = [
1313
"//adapter/kubernetes/config:go_default_library",
1414
"//pkg/adapter:go_default_library",
15+
"@io_k8s_api//core/v1:go_default_library",
16+
"@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
17+
"@io_k8s_apimachinery//pkg/runtime:go_default_library",
18+
"@io_k8s_apimachinery//pkg/watch:go_default_library",
1519
"@io_k8s_client_go//kubernetes:go_default_library",
16-
"@io_k8s_client_go//pkg/api/v1:go_default_library",
17-
"@io_k8s_client_go//pkg/runtime:go_default_library",
18-
"@io_k8s_client_go//pkg/watch:go_default_library",
1920
"@io_k8s_client_go//rest:go_default_library",
2021
"@io_k8s_client_go//tools/cache:go_default_library",
2122
"@io_k8s_client_go//tools/clientcmd:go_default_library",
@@ -34,7 +35,8 @@ go_test(
3435
"//adapter/kubernetes/config:go_default_library",
3536
"//pkg/adapter:go_default_library",
3637
"//pkg/adapter/test:go_default_library",
37-
"@io_k8s_client_go//pkg/api/v1:go_default_library",
38+
"@io_k8s_api//core/v1:go_default_library",
39+
"@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
3840
"@io_k8s_client_go//tools/cache:go_default_library",
3941
],
4042
)

‎mixer/adapter/kubernetes/cache.go‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ import (
2020
"reflect"
2121
"time"
2222

23+
"k8s.io/api/core/v1"
24+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
25+
"k8s.io/apimachinery/pkg/runtime"
26+
"k8s.io/apimachinery/pkg/watch"
2327
"k8s.io/client-go/kubernetes"
24-
"k8s.io/client-go/pkg/api/v1"
25-
"k8s.io/client-go/pkg/runtime"
26-
"k8s.io/client-go/pkg/watch"
2728
"k8s.io/client-go/tools/cache"
2829

2930
"istio.io/mixer/pkg/adapter"
@@ -87,10 +88,10 @@ func newCacheController(clientset *kubernetes.Clientset, refreshDuration time.Du
8788

8889
c.pods = cache.NewSharedIndexInformer(
8990
&cache.ListWatch{
90-
ListFunc: func(opts v1.ListOptions) (runtime.Object, error) {
91+
ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
9192
return clientset.Pods(namespace).List(opts)
9293
},
93-
WatchFunc: func(opts v1.ListOptions) (watch.Interface, error) {
94+
WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
9495
return clientset.Pods(namespace).Watch(opts)
9596
},
9697
},
@@ -101,7 +102,7 @@ func newCacheController(clientset *kubernetes.Clientset, refreshDuration time.Du
101102

102103
// debug logging for pod update events
103104
if env.Logger().VerbosityLevel(debugVerbosityLevel) {
104-
eventErr := c.pods.AddEventHandler(
105+
c.pods.AddEventHandler(
105106
cache.ResourceEventHandlerFuncs{
106107
AddFunc: func(obj interface{}) {
107108
c.mutationsChan <- resourceMutation{addition, obj}
@@ -116,10 +117,6 @@ func newCacheController(clientset *kubernetes.Clientset, refreshDuration time.Du
116117
},
117118
},
118119
)
119-
120-
if eventErr != nil {
121-
c.env.Logger().Warningf("could not add logging event handlers: %v", eventErr)
122-
}
123120
}
124121

125122
return c

‎mixer/adapter/kubernetes/cache_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ import (
2020
"testing"
2121
"time"
2222

23-
"k8s.io/client-go/pkg/api/v1"
23+
"k8s.io/api/core/v1"
24+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2425
"k8s.io/client-go/tools/cache"
2526

2627
"istio.io/mixer/pkg/adapter/test"
@@ -171,7 +172,7 @@ func TestClusterInfoCache(t *testing.T) {
171172
{"Run", func(c *controllerImpl, informer *fakeInformer) {
172173
informer.SetSynced(true)
173174
c.mutationsChan <- resourceMutation{kind: addition, obj: &v1.Pod{
174-
ObjectMeta: v1.ObjectMeta{Name: "pod", Namespace: "ns"},
175+
ObjectMeta: metav1.ObjectMeta{Name: "pod", Namespace: "ns"},
175176
}}
176177
c.mutationsChan <- resourceMutation{kind: update, obj: v1.Pod{}}
177178
}},

‎mixer/adapter/kubernetes/kubernetes.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"sync"
2929
"time"
3030

31+
"k8s.io/api/core/v1"
3132
k8s "k8s.io/client-go/kubernetes"
32-
"k8s.io/client-go/pkg/api/v1"
3333
"k8s.io/client-go/rest"
3434
"k8s.io/client-go/tools/cache"
3535
"k8s.io/client-go/tools/clientcmd"

‎mixer/adapter/kubernetes/kubernetes_test.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ import (
2121
"testing"
2222
"time"
2323

24-
"k8s.io/client-go/pkg/api/v1"
24+
"k8s.io/api/core/v1"
25+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2526

2627
"istio.io/mixer/adapter/kubernetes/config"
2728
"istio.io/mixer/pkg/adapter"
@@ -194,7 +195,7 @@ func TestKubegen_Close(t *testing.T) {
194195
func TestKubegen_Generate(t *testing.T) {
195196
pods := map[string]*v1.Pod{
196197
"testns/testsvc": {
197-
ObjectMeta: v1.ObjectMeta{
198+
ObjectMeta: metav1.ObjectMeta{
198199
Name: "test_pod",
199200
Namespace: "testns",
200201
Labels: map[string]string{
@@ -211,7 +212,7 @@ func TestKubegen_Generate(t *testing.T) {
211212
},
212213
},
213214
"testns/empty": {
214-
ObjectMeta: v1.ObjectMeta{
215+
ObjectMeta: metav1.ObjectMeta{
215216
Name: "test_pod",
216217
Namespace: "testns",
217218
Labels: map[string]string{
@@ -220,7 +221,7 @@ func TestKubegen_Generate(t *testing.T) {
220221
},
221222
},
222223
"testns/badapplabel": {
223-
ObjectMeta: v1.ObjectMeta{
224+
ObjectMeta: metav1.ObjectMeta{
224225
Name: "test_pod",
225226
Namespace: "testns",
226227
Labels: map[string]string{
@@ -229,7 +230,7 @@ func TestKubegen_Generate(t *testing.T) {
229230
},
230231
},
231232
"testns/alt-svc": {
232-
ObjectMeta: v1.ObjectMeta{
233+
ObjectMeta: metav1.ObjectMeta{
233234
Name: "alt-svc",
234235
Namespace: "testns",
235236
Labels: map[string]string{
@@ -238,7 +239,7 @@ func TestKubegen_Generate(t *testing.T) {
238239
},
239240
},
240241
"testns/alt-svc-with-cluster": {
241-
ObjectMeta: v1.ObjectMeta{
242+
ObjectMeta: metav1.ObjectMeta{
242243
Name: "alt-svc-with-cluster",
243244
Namespace: "testns",
244245
Labels: map[string]string{
@@ -247,7 +248,7 @@ func TestKubegen_Generate(t *testing.T) {
247248
},
248249
},
249250
"testns/long-svc": {
250-
ObjectMeta: v1.ObjectMeta{
251+
ObjectMeta: metav1.ObjectMeta{
251252
Name: "long-svc",
252253
Namespace: "testns",
253254
Labels: map[string]string{
@@ -256,7 +257,7 @@ func TestKubegen_Generate(t *testing.T) {
256257
},
257258
},
258259
"testns/ipaddr-svc": {
259-
ObjectMeta: v1.ObjectMeta{
260+
ObjectMeta: metav1.ObjectMeta{
260261
Name: "ipaddr-svc",
261262
Namespace: "testns",
262263
Labels: map[string]string{

0 commit comments

Comments
 (0)