Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Commit 3a4626c

Browse files
aaronlevyaaronlevy
authored
Merge pull request #650 from aaronlevy/v170
Kubernetes v1.7.1
2 parents 3517908 + aad6e36 commit 3a4626c

File tree

1,629 files changed

+370375
-105669
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,629 files changed

+370375
-105669
lines changed

‎bill-of-materials.json‎

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
"license": "Apache License 2.0",
55
"confidence": 0.999
66
},
7+
{
8+
"project": "github.com/Azure/go-autorest/autorest",
9+
"license": "Apache License 2.0",
10+
"confidence": 0.968
11+
},
712
{
813
"project": "github.com/PuerkitoBio/purell",
914
"license": "BSD 3-clause \"New\" or \"Revised\" License",
@@ -29,18 +34,13 @@
2934
"license": "Apache License 2.0",
3035
"confidence": 1
3136
},
32-
{
33-
"project": "github.com/coreos/go-oidc",
34-
"license": "Apache License 2.0",
35-
"confidence": 1
36-
},
3737
{
3838
"project": "github.com/coreos/go-systemd/journal",
3939
"license": "Apache License 2.0",
4040
"confidence": 0.997
4141
},
4242
{
43-
"project": "github.com/coreos/pkg",
43+
"project": "github.com/coreos/pkg/capnslog",
4444
"license": "Apache License 2.0",
4545
"confidence": 1
4646
},
@@ -79,6 +79,11 @@
7979
"license": "MIT License",
8080
"confidence": 1
8181
},
82+
{
83+
"project": "github.com/emicklei/go-restful-swagger12",
84+
"license": "MIT License",
85+
"confidence": 1
86+
},
8287
{
8388
"project": "github.com/evanphx/json-patch",
8489
"license": "BSD 3-clause \"New\" or \"Revised\" License",
@@ -89,11 +94,21 @@
8994
"license": "MIT License",
9095
"confidence": 1
9196
},
97+
{
98+
"project": "github.com/fatih/camelcase",
99+
"license": "MIT License",
100+
"confidence": 1
101+
},
92102
{
93103
"project": "github.com/ghodss/yaml",
94104
"license": "BSD 3-clause \"New\" or \"Revised\" License",
95105
"confidence": 0.836
96106
},
107+
{
108+
"project": "github.com/go-openapi/analysis",
109+
"license": "Apache License 2.0",
110+
"confidence": 1
111+
},
97112
{
98113
"project": "github.com/go-openapi/jsonpointer",
99114
"license": "Apache License 2.0",
@@ -104,6 +119,11 @@
104119
"license": "Apache License 2.0",
105120
"confidence": 1
106121
},
122+
{
123+
"project": "github.com/go-openapi/loads",
124+
"license": "Apache License 2.0",
125+
"confidence": 1
126+
},
107127
{
108128
"project": "github.com/go-openapi/spec",
109129
"license": "Apache License 2.0",
@@ -149,6 +169,11 @@
149169
"license": "BSD 3-clause \"New\" or \"Revised\" License",
150170
"confidence": 0.979
151171
},
172+
{
173+
"project": "github.com/hashicorp/golang-lru",
174+
"license": "Mozilla Public License 2.0",
175+
"confidence": 1
176+
},
152177
{
153178
"project": "github.com/howeyc/gopass",
154179
"license": "ISC License",
@@ -159,11 +184,6 @@
159184
"license": "BSD 3-clause \"New\" or \"Revised\" License",
160185
"confidence": 0.966
161186
},
162-
{
163-
"project": "github.com/jonboulle/clockwork",
164-
"license": "Apache License 2.0",
165-
"confidence": 1
166-
},
167187
{
168188
"project": "github.com/juju/ratelimit",
169189
"license": "GNU Lesser General Public License v3.0",
@@ -259,6 +279,11 @@
259279
"license": "GNU Lesser General Public License v3.0",
260280
"confidence": 0.953
261281
},
282+
{
283+
"project": "k8s.io/api/core/v1",
284+
"license": "Apache License 2.0",
285+
"confidence": 1
286+
},
262287
{
263288
"project": "k8s.io/apimachinery",
264289
"license": "Apache License 2.0",
@@ -279,6 +304,11 @@
279304
"license": "Apache License 2.0",
280305
"confidence": 1
281306
},
307+
{
308+
"project": "k8s.io/metrics/pkg",
309+
"license": "Apache License 2.0",
310+
"confidence": 1
311+
},
282312
{
283313
"project": "vbom.ml/util/sortorder",
284314
"license": "MIT License",

‎cmd/checkpoint/main_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"reflect"
66
"testing"
77

8+
apiequality "k8s.io/apimachinery/pkg/api/equality"
89
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
9-
"k8s.io/client-go/pkg/api"
1010
"k8s.io/client-go/pkg/api/v1"
1111
)
1212

@@ -417,7 +417,7 @@ func TestSanitizeCheckpointPod(t *testing.T) {
417417
if err != nil {
418418
t.Errorf("\nUnexpected error: %v\n", err)
419419
}
420-
if !api.Semantic.DeepEqual(tc.expected, got) {
420+
if !apiequality.Semantic.DeepEqual(tc.expected, got) {
421421
t.Errorf("\nFor Test: %s\n\nExpected:\n%#v\nGot:\n%#v\n", tc.desc, tc.expected, got)
422422
}
423423
}
@@ -605,7 +605,7 @@ func TestCopyPod(t *testing.T) {
605605
if err != nil {
606606
t.Errorf("Unexpected error: %v", err)
607607
}
608-
if !api.Semantic.DeepEqual(pod, *got) {
608+
if !apiequality.Semantic.DeepEqual(pod, *got) {
609609
t.Errorf("Expected:\n%#v\nGot:\n%#v", pod, got)
610610
}
611611
}

‎e2e/checkpointer_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ func waitCluster(t *testing.T) *Cluster {
141141
// apiserver-managed ones.
142142
// TODO(diegs): do something more scientific, like talking to docker.
143143
func waitForCheckpointDeactivation(t *testing.T) {
144-
t.Log("Waiting 60 seconds for checkpoints to deactivate.")
145-
time.Sleep(60 * time.Second)
144+
t.Log("Waiting 120 seconds for checkpoints to deactivate.")
145+
time.Sleep(120 * time.Second)
146146
successes := 0
147147
if err := retry(20, 3*time.Second, func() error {
148148
_, err := client.Discovery().ServerVersion()

0 commit comments

Comments
 (0)