Skip to content

Commit c9dda34

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#77016 from jiatongw/e2e/framework/upgrade
[e2e] Move framework/upgrade_util.go to framework/lifecycle/upgrade.go
2 parents aafac3c + 30322ba commit c9dda34

File tree

5 files changed

+63
-31
lines changed

5 files changed

+63
-31
lines changed

‎test/e2e/framework/BUILD‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ go_library(
3030
"ssh.go",
3131
"statefulset_utils.go",
3232
"test_context.go",
33-
"upgrade_util.go",
3433
"util.go",
3534
],
3635
importpath = "k8s.io/kubernetes/test/e2e/framework",
@@ -91,7 +90,6 @@ go_library(
9190
"//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library",
9291
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
9392
"//staging/src/k8s.io/apimachinery/pkg/util/yaml:go_default_library",
94-
"//staging/src/k8s.io/apimachinery/pkg/version:go_default_library",
9593
"//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
9694
"//staging/src/k8s.io/apiserver/pkg/authentication/serviceaccount:go_default_library",
9795
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
@@ -152,6 +150,7 @@ filegroup(
152150
"//test/e2e/framework/gpu:all-srcs",
153151
"//test/e2e/framework/ingress:all-srcs",
154152
"//test/e2e/framework/job:all-srcs",
153+
"//test/e2e/framework/lifecycle:all-srcs",
155154
"//test/e2e/framework/log:all-srcs",
156155
"//test/e2e/framework/metrics:all-srcs",
157156
"//test/e2e/framework/podlogs:all-srcs",

‎test/e2e/framework/lifecycle/BUILD‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
load("@io_bazel_rules_go//go:def.bzl", "go_library")
2+
3+
go_library(
4+
name = "go_default_library",
5+
srcs = ["upgrade.go"],
6+
importpath = "k8s.io/kubernetes/test/e2e/framework/lifecycle",
7+
visibility = ["//visibility:public"],
8+
deps = [
9+
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
10+
"//staging/src/k8s.io/apimachinery/pkg/version:go_default_library",
11+
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
12+
"//test/e2e/framework:go_default_library",
13+
"//test/e2e/framework/log:go_default_library",
14+
],
15+
)
16+
17+
filegroup(
18+
name = "package-srcs",
19+
srcs = glob(["**"]),
20+
tags = ["automanaged"],
21+
visibility = ["//visibility:private"],
22+
)
23+
24+
filegroup(
25+
name = "all-srcs",
26+
srcs = [":package-srcs"],
27+
tags = ["automanaged"],
28+
visibility = ["//visibility:public"],
29+
)

‎test/e2e/framework/upgrade_util.go‎ renamed to ‎test/e2e/framework/lifecycle/upgrade.go‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package framework
17+
package lifecycle
1818

1919
import (
2020
"fmt"
@@ -26,39 +26,41 @@ import (
2626
"k8s.io/apimachinery/pkg/util/wait"
2727
"k8s.io/apimachinery/pkg/version"
2828
clientset "k8s.io/client-go/kubernetes"
29+
"k8s.io/kubernetes/test/e2e/framework"
30+
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
2931
)
3032

3133
// RealVersion turns a version constants into a version string deployable on
3234
// GKE. See hack/get-build.sh for more information.
3335
func RealVersion(s string) (string, error) {
34-
Logf("Getting real version for %q", s)
35-
v, _, err := RunCmd(path.Join(TestContext.RepoRoot, "hack/get-build.sh"), "-v", s)
36+
e2elog.Logf("Getting real version for %q", s)
37+
v, _, err := framework.RunCmd(path.Join(framework.TestContext.RepoRoot, "hack/get-build.sh"), "-v", s)
3638
if err != nil {
3739
return v, fmt.Errorf("error getting real version for %q: %v", s, err)
3840
}
39-
Logf("Version for %q is %q", s, v)
41+
e2elog.Logf("Version for %q is %q", s, v)
4042
return strings.TrimPrefix(strings.TrimSpace(v), "v"), nil
4143
}
4244

4345
func traceRouteToMaster() {
4446
path, err := exec.LookPath("traceroute")
4547
if err != nil {
46-
Logf("Could not find traceroute program")
48+
e2elog.Logf("Could not find traceroute program")
4749
return
4850
}
49-
cmd := exec.Command(path, "-I", GetMasterHost())
51+
cmd := exec.Command(path, "-I", framework.GetMasterHost())
5052
out, err := cmd.Output()
5153
if len(out) != 0 {
52-
Logf(string(out))
54+
e2elog.Logf(string(out))
5355
}
5456
if exiterr, ok := err.(*exec.ExitError); err != nil && ok {
55-
Logf("Error while running traceroute: %s", exiterr.Stderr)
57+
e2elog.Logf("Error while running traceroute: %s", exiterr.Stderr)
5658
}
5759
}
5860

5961
// CheckMasterVersion validates the master version
6062
func CheckMasterVersion(c clientset.Interface, want string) error {
61-
Logf("Checking master version")
63+
e2elog.Logf("Checking master version")
6264
var err error
6365
var v *version.Info
6466
waitErr := wait.PollImmediate(5*time.Second, 2*time.Minute, func() (bool, error) {
@@ -79,13 +81,13 @@ func CheckMasterVersion(c clientset.Interface, want string) error {
7981
if !strings.HasPrefix(got, want) {
8082
return fmt.Errorf("master had kube-apiserver version %s which does not start with %s", got, want)
8183
}
82-
Logf("Master is at version %s", want)
84+
e2elog.Logf("Master is at version %s", want)
8385
return nil
8486
}
8587

8688
// CheckNodesVersions validates the nodes versions
8789
func CheckNodesVersions(cs clientset.Interface, want string) error {
88-
l := GetReadySchedulableNodesOrDie(cs)
90+
l := framework.GetReadySchedulableNodesOrDie(cs)
8991
for _, n := range l.Items {
9092
// We do prefix trimming and then matching because:
9193
// want looks like: 0.19.3-815-g50e67d4

‎test/e2e/lifecycle/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ go_library(
3434
"//test/e2e/common:go_default_library",
3535
"//test/e2e/framework:go_default_library",
3636
"//test/e2e/framework/ginkgowrapper:go_default_library",
37+
"//test/e2e/framework/lifecycle:go_default_library",
3738
"//test/e2e/upgrades:go_default_library",
3839
"//test/e2e/upgrades/apps:go_default_library",
3940
"//test/e2e/upgrades/storage:go_default_library",

‎test/e2e/lifecycle/cluster_upgrade.go‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"k8s.io/kubernetes/test/e2e/chaosmonkey"
3333
"k8s.io/kubernetes/test/e2e/framework"
3434
"k8s.io/kubernetes/test/e2e/framework/ginkgowrapper"
35+
e2elifecycle "k8s.io/kubernetes/test/e2e/framework/lifecycle"
3536
"k8s.io/kubernetes/test/e2e/upgrades"
3637
apps "k8s.io/kubernetes/test/e2e/upgrades/apps"
3738
"k8s.io/kubernetes/test/e2e/upgrades/storage"
@@ -103,7 +104,7 @@ var _ = SIGDescribe("Upgrade [Feature:Upgrade]", func() {
103104
defer finalizeUpgradeTest(start, masterUpgradeTest)
104105
target := upgCtx.Versions[1].Version.String()
105106
framework.ExpectNoError(framework.MasterUpgrade(target))
106-
framework.ExpectNoError(framework.CheckMasterVersion(f.ClientSet, target))
107+
framework.ExpectNoError(e2elifecycle.CheckMasterVersion(f.ClientSet, target))
107108
}
108109
runUpgradeSuite(f, upgradeTests, testFrameworks, testSuite, upgCtx, upgrades.MasterUpgrade, upgradeFunc)
109110
})
@@ -125,7 +126,7 @@ var _ = SIGDescribe("Upgrade [Feature:Upgrade]", func() {
125126
defer finalizeUpgradeTest(start, nodeUpgradeTest)
126127
target := upgCtx.Versions[1].Version.String()
127128
framework.ExpectNoError(framework.NodeUpgrade(f, target, *upgradeImage))
128-
framework.ExpectNoError(framework.CheckNodesVersions(f.ClientSet, target))
129+
framework.ExpectNoError(e2elifecycle.CheckNodesVersions(f.ClientSet, target))
129130
}
130131
runUpgradeSuite(f, upgradeTests, testFrameworks, testSuite, upgCtx, upgrades.NodeUpgrade, upgradeFunc)
131132
})
@@ -144,9 +145,9 @@ var _ = SIGDescribe("Upgrade [Feature:Upgrade]", func() {
144145
defer finalizeUpgradeTest(start, clusterUpgradeTest)
145146
target := upgCtx.Versions[1].Version.String()
146147
framework.ExpectNoError(framework.MasterUpgrade(target))
147-
framework.ExpectNoError(framework.CheckMasterVersion(f.ClientSet, target))
148+
framework.ExpectNoError(e2elifecycle.CheckMasterVersion(f.ClientSet, target))
148149
framework.ExpectNoError(framework.NodeUpgrade(f, target, *upgradeImage))
149-
framework.ExpectNoError(framework.CheckNodesVersions(f.ClientSet, target))
150+
framework.ExpectNoError(e2elifecycle.CheckNodesVersions(f.ClientSet, target))
150151
}
151152
runUpgradeSuite(f, upgradeTests, testFrameworks, testSuite, upgCtx, upgrades.ClusterUpgrade, upgradeFunc)
152153
})
@@ -175,9 +176,9 @@ var _ = SIGDescribe("Downgrade [Feature:Downgrade]", func() {
175176
// Yes this really is a downgrade. And nodes must downgrade first.
176177
target := upgCtx.Versions[1].Version.String()
177178
framework.ExpectNoError(framework.NodeUpgrade(f, target, *upgradeImage))
178-
framework.ExpectNoError(framework.CheckNodesVersions(f.ClientSet, target))
179+
framework.ExpectNoError(e2elifecycle.CheckNodesVersions(f.ClientSet, target))
179180
framework.ExpectNoError(framework.MasterUpgrade(target))
180-
framework.ExpectNoError(framework.CheckMasterVersion(f.ClientSet, target))
181+
framework.ExpectNoError(e2elifecycle.CheckMasterVersion(f.ClientSet, target))
181182
}
182183
runUpgradeSuite(f, upgradeTests, testFrameworks, testSuite, upgCtx, upgrades.ClusterUpgrade, upgradeFunc)
183184
})
@@ -228,7 +229,7 @@ var _ = SIGDescribe("gpu Upgrade [Feature:GPUUpgrade]", func() {
228229
defer finalizeUpgradeTest(start, gpuUpgradeTest)
229230
target := upgCtx.Versions[1].Version.String()
230231
framework.ExpectNoError(framework.MasterUpgrade(target))
231-
framework.ExpectNoError(framework.CheckMasterVersion(f.ClientSet, target))
232+
framework.ExpectNoError(e2elifecycle.CheckMasterVersion(f.ClientSet, target))
232233
}
233234
runUpgradeSuite(f, gpuUpgradeTests, testFrameworks, testSuite, upgCtx, upgrades.MasterUpgrade, upgradeFunc)
234235
})
@@ -246,9 +247,9 @@ var _ = SIGDescribe("gpu Upgrade [Feature:GPUUpgrade]", func() {
246247
defer finalizeUpgradeTest(start, gpuUpgradeTest)
247248
target := upgCtx.Versions[1].Version.String()
248249
framework.ExpectNoError(framework.MasterUpgrade(target))
249-
framework.ExpectNoError(framework.CheckMasterVersion(f.ClientSet, target))
250+
framework.ExpectNoError(e2elifecycle.CheckMasterVersion(f.ClientSet, target))
250251
framework.ExpectNoError(framework.NodeUpgrade(f, target, *upgradeImage))
251-
framework.ExpectNoError(framework.CheckNodesVersions(f.ClientSet, target))
252+
framework.ExpectNoError(e2elifecycle.CheckNodesVersions(f.ClientSet, target))
252253
}
253254
runUpgradeSuite(f, gpuUpgradeTests, testFrameworks, testSuite, upgCtx, upgrades.ClusterUpgrade, upgradeFunc)
254255
})
@@ -266,9 +267,9 @@ var _ = SIGDescribe("gpu Upgrade [Feature:GPUUpgrade]", func() {
266267
defer finalizeUpgradeTest(start, gpuDowngradeTest)
267268
target := upgCtx.Versions[1].Version.String()
268269
framework.ExpectNoError(framework.NodeUpgrade(f, target, *upgradeImage))
269-
framework.ExpectNoError(framework.CheckNodesVersions(f.ClientSet, target))
270+
framework.ExpectNoError(e2elifecycle.CheckNodesVersions(f.ClientSet, target))
270271
framework.ExpectNoError(framework.MasterUpgrade(target))
271-
framework.ExpectNoError(framework.CheckMasterVersion(f.ClientSet, target))
272+
framework.ExpectNoError(e2elifecycle.CheckMasterVersion(f.ClientSet, target))
272273
}
273274
runUpgradeSuite(f, gpuUpgradeTests, testFrameworks, testSuite, upgCtx, upgrades.ClusterUpgrade, upgradeFunc)
274275
})
@@ -294,9 +295,9 @@ var _ = ginkgo.Describe("[sig-apps] stateful Upgrade [Feature:StatefulUpgrade]",
294295
defer finalizeUpgradeTest(start, statefulUpgradeTest)
295296
target := upgCtx.Versions[1].Version.String()
296297
framework.ExpectNoError(framework.MasterUpgrade(target))
297-
framework.ExpectNoError(framework.CheckMasterVersion(f.ClientSet, target))
298+
framework.ExpectNoError(e2elifecycle.CheckMasterVersion(f.ClientSet, target))
298299
framework.ExpectNoError(framework.NodeUpgrade(f, target, *upgradeImage))
299-
framework.ExpectNoError(framework.CheckNodesVersions(f.ClientSet, target))
300+
framework.ExpectNoError(e2elifecycle.CheckNodesVersions(f.ClientSet, target))
300301
}
301302
runUpgradeSuite(f, statefulsetUpgradeTests, testFrameworks, testSuite, upgCtx, upgrades.ClusterUpgrade, upgradeFunc)
302303
})
@@ -329,9 +330,9 @@ var _ = SIGDescribe("kube-proxy migration [Feature:KubeProxyDaemonSetMigration]"
329330
defer finalizeUpgradeTest(start, kubeProxyUpgradeTest)
330331
target := upgCtx.Versions[1].Version.String()
331332
framework.ExpectNoError(framework.MasterUpgradeGCEWithKubeProxyDaemonSet(target, true))
332-
framework.ExpectNoError(framework.CheckMasterVersion(f.ClientSet, target))
333+
framework.ExpectNoError(e2elifecycle.CheckMasterVersion(f.ClientSet, target))
333334
framework.ExpectNoError(framework.NodeUpgradeGCEWithKubeProxyDaemonSet(f, target, *upgradeImage, true))
334-
framework.ExpectNoError(framework.CheckNodesVersions(f.ClientSet, target))
335+
framework.ExpectNoError(e2elifecycle.CheckNodesVersions(f.ClientSet, target))
335336
}
336337
runUpgradeSuite(f, kubeProxyUpgradeTests, testFrameworks, testSuite, upgCtx, upgrades.ClusterUpgrade, upgradeFunc)
337338
})
@@ -357,9 +358,9 @@ var _ = SIGDescribe("kube-proxy migration [Feature:KubeProxyDaemonSetMigration]"
357358
// Yes this really is a downgrade. And nodes must downgrade first.
358359
target := upgCtx.Versions[1].Version.String()
359360
framework.ExpectNoError(framework.NodeUpgradeGCEWithKubeProxyDaemonSet(f, target, *upgradeImage, false))
360-
framework.ExpectNoError(framework.CheckNodesVersions(f.ClientSet, target))
361+
framework.ExpectNoError(e2elifecycle.CheckNodesVersions(f.ClientSet, target))
361362
framework.ExpectNoError(framework.MasterUpgradeGCEWithKubeProxyDaemonSet(target, false))
362-
framework.ExpectNoError(framework.CheckMasterVersion(f.ClientSet, target))
363+
framework.ExpectNoError(e2elifecycle.CheckMasterVersion(f.ClientSet, target))
363364
}
364365
runUpgradeSuite(f, kubeProxyDowngradeTests, testFrameworks, testSuite, upgCtx, upgrades.ClusterUpgrade, upgradeFunc)
365366
})
@@ -506,7 +507,7 @@ func getUpgradeContext(c discovery.DiscoveryInterface, upgradeTarget string) (*u
506507
return upgCtx, nil
507508
}
508509

509-
next, err := framework.RealVersion(upgradeTarget)
510+
next, err := e2elifecycle.RealVersion(upgradeTarget)
510511
if err != nil {
511512
return nil, err
512513
}

0 commit comments

Comments
 (0)