Skip to content

Commit 9d988a5

Browse files
tahsinrahmank8s-ci-robot
authored andcommitted
Fix containerd checksum (#186)
* Fix containerd checksum * Run ./hack/update-bazel.sh * Add boilerplate
1 parent 93549f2 commit 9d988a5

File tree

35 files changed

+207
-609
lines changed

35 files changed

+207
-609
lines changed

pkg/cloud/azure/services/config/BUILD.bazel

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@io_bazel_rules_go//go:def.bzl", "go_library")
1+
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
22

33
go_library(
44
name = "go_default_library",
@@ -19,3 +19,13 @@ go_library(
1919
"//vendor/k8s.io/klog:go_default_library",
2020
],
2121
)
22+
23+
go_test(
24+
name = "go_default_test",
25+
srcs = ["containerdChecksum_test.go"],
26+
embed = [":go_default_library"],
27+
deps = [
28+
"//vendor/k8s.io/klog:go_default_library",
29+
"//vendor/sigs.k8s.io/cluster-api/pkg/util:go_default_library",
30+
],
31+
)
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/*
2+
Copyright 2019 The Kubernetes Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package config
18+
19+
import (
20+
"bytes"
21+
"fmt"
22+
"os"
23+
"os/exec"
24+
"testing"
25+
26+
"k8s.io/klog"
27+
28+
"sigs.k8s.io/cluster-api/pkg/util"
29+
)
30+
31+
func TestHash(t *testing.T) {
32+
fileName := fmt.Sprintf("/tmp/test-%s", util.RandomString(6))
33+
defer os.Remove(fileName)
34+
35+
url := fmt.Sprintf("https://storage.googleapis.com/cri-containerd-release/cri-containerd-%s.linux-amd64.tar.gz", ContainerdVersion)
36+
37+
klog.Infof("saving to %s", fileName)
38+
39+
cmd := exec.Command("wget",
40+
url,
41+
"-O",
42+
fileName)
43+
44+
var buf bytes.Buffer
45+
cmd.Stderr = &buf
46+
cmd.Stdout = &buf
47+
48+
cmd.Start()
49+
err := cmd.Wait()
50+
51+
if err != nil {
52+
t.Errorf("Error dowinloading containerd: %v", buf.String())
53+
}
54+
cmd = exec.Command("sha256sum", "--check", "-")
55+
56+
buf.Reset()
57+
cmd.Stdout = &buf
58+
cmd.Stderr = &buf
59+
60+
var in bytes.Buffer
61+
cmd.Stdin = &in
62+
63+
fmt.Fprintf(&in, "%s %s", ContainerdSHA256, fileName)
64+
65+
cmd.Start()
66+
err = cmd.Wait()
67+
68+
fmt.Println(buf.String())
69+
70+
if err != nil {
71+
t.Error(err)
72+
}
73+
}

pkg/cloud/azure/services/config/startupscript.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030

3131
const (
3232
ContainerdVersion = "1.2.6"
33-
ContainerdSHA256 = "3c23bc34c7c0cb2e45fe469f5fcfdb3829aab8e51a425b1efb702f00f215c4c6"
33+
ContainerdSHA256 = "841bdd6965d43b118a4fe3b8b757cc2453b67356af3684fc3ef25f60688a199d"
3434
)
3535

3636
// GetVMStartupScript returns startup script based on role

vendor/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/BUILD renamed to vendor/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/BUILD.bazel

Lines changed: 2 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme/BUILD renamed to vendor/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme/BUILD.bazel

Lines changed: 0 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha3/BUILD renamed to vendor/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha3/BUILD.bazel

Lines changed: 0 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1/BUILD renamed to vendor/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1/BUILD.bazel

Lines changed: 0 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kubernetes/cmd/kubeadm/app/constants/BUILD renamed to vendor/k8s.io/kubernetes/cmd/kubeadm/app/constants/BUILD.bazel

Lines changed: 2 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kubernetes/cmd/kubeadm/app/features/BUILD renamed to vendor/k8s.io/kubernetes/cmd/kubeadm/app/features/BUILD.bazel

Lines changed: 2 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kubernetes/cmd/kubeadm/app/images/BUILD renamed to vendor/k8s.io/kubernetes/cmd/kubeadm/app/images/BUILD.bazel

Lines changed: 2 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)