update to new cri-tools make install #5462

mikebrow · 2021-05-06T23:31:54Z

Address #5460

build:

root@mike-VirtualBox:/home/mike/go/src/github.com/containerd/containerd# make clean
+ clean
root@mike-VirtualBox:/home/mike/go/src/github.com/containerd/containerd# make cri-cni-release
+ bin/ctr
+ bin/containerd
+ bin/containerd-stress
+ bin/containerd-shim
+ bin/containerd-shim-runc-v1
+ bin/containerd-shim-runc-v2
echo "CONTAINERD_VERSION: '1.5.0-1-ge60322b80'" | tee /home/mike/go/src/github.com/containerd/containerd/_output/cri/opt/containerd/cluster/version
CONTAINERD_VERSION: '1.5.0-1-ge60322b80'
DESTDIR=/home/mike/go/src/github.com/containerd/containerd/_output/cri script/setup/install-runc
Cloning into '/tmp/tmp.gtWLv0hENH/runc'...
remote: Enumerating objects: 29131, done.
remote: Counting objects: 100% (1292/1292), done.
remote: Compressing objects: 100% (690/690), done.
remote: Total 29131 (delta 688), reused 1065 (delta 580), pack-reused 27839
Receiving objects: 100% (29131/29131), 12.97 MiB | 2.32 MiB/s, done.
Resolving deltas: 100% (18948/18948), done.
/tmp/tmp.gtWLv0hENH/runc /home/mike/go/src/github.com/containerd/containerd
Note: checking out 'v1.0.0-rc93'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b <new-branch-name>

HEAD is now at 12644e61 VERSION: release 1.0.0~rc93
make[1]: Entering directory '/tmp/tmp.gtWLv0hENH/runc'
go build -trimpath "-mod=vendor" "-buildmode=pie"  -tags "seccomp" -ldflags "-X main.gitCommit="12644e614e25b05da6fd08a38ffa0cfe1903fdec" -X main.version=1.0.0-rc93 " -o runc .
make[1]: Leaving directory '/tmp/tmp.gtWLv0hENH/runc'
make[1]: Entering directory '/tmp/tmp.gtWLv0hENH/runc'
install -D -m0755 runc /home/mike/go/src/github.com/containerd/containerd/_output/cri/usr/local/sbin/runc
make[1]: Leaving directory '/tmp/tmp.gtWLv0hENH/runc'
/home/mike/go/src/github.com/containerd/containerd
DESTDIR=/home/mike/go/src/github.com/containerd/containerd/_output/cri script/setup/install-cni
Cloning into '/tmp/tmp.mYJiwTFkCu/plugins'...
remote: Enumerating objects: 12256, done.
remote: Counting objects: 100% (982/982), done.
remote: Compressing objects: 100% (648/648), done.
remote: Total 12256 (delta 348), reused 836 (delta 295), pack-reused 11274
Receiving objects: 100% (12256/12256), 10.39 MiB | 1.95 MiB/s, done.
Resolving deltas: 100% (6453/6453), done.
/tmp/tmp.mYJiwTFkCu/plugins /home/mike/go/src/github.com/containerd/containerd
Note: checking out 'v0.9.1'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b <new-branch-name>

HEAD is now at fa48f75 ipam/dhcp: Add broadcast flag
Building plugins 
  bandwidth
  firewall
  flannel
  portmap
  sbr
  tuning
  vrf
  bridge
  host-device
  ipvlan
  loopback
  macvlan
  ptp
  vlan
  dhcp
  host-local
  static
{
  "cniVersion": "0.4.0",
  "name": "containerd-net",
  "plugins": [
    {
      "type": "bridge",
      "bridge": "cni0",
      "isGateway": true,
      "ipMasq": true,
      "promiscMode": true,
      "ipam": {
        "type": "host-local",
        "ranges": [
          [{
            "subnet": "10.88.0.0/16"
          }],
          [{
            "subnet": "2001:4860:4860::/64"
          }]
        ],
        "routes": [
          { "dst": "0.0.0.0/0" },
          { "dst": "::/0" }
        ]
      }
    },
    {
      "type": "portmap",
      "capabilities": {"portMappings": true}
    }
  ]
}
/home/mike/go/src/github.com/containerd/containerd
DESTDIR=/home/mike/go/src/github.com/containerd/containerd/_output/cri script/setup/install-critools
Cloning into '/tmp/tmp.53N5CBuAm5/cri-tools'...
remote: Enumerating objects: 17815, done.
remote: Counting objects: 100% (2198/2198), done.
remote: Compressing objects: 100% (1205/1205), done.
remote: Total 17815 (delta 946), reused 2034 (delta 902), pack-reused 15617
Receiving objects: 100% (17815/17815), 19.44 MiB | 2.13 MiB/s, done.
Resolving deltas: 100% (9276/9276), done.
/tmp/tmp.53N5CBuAm5/cri-tools /home/mike/go
Note: checking out '53ad8bb7f97e1b1d1c0c0634e43a3c2b8b07b718'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b <new-branch-name>

HEAD is now at 53ad8bb7 Merge pull request #733 from saschagrunert/registry
make[1]: Entering directory '/tmp/tmp.53N5CBuAm5/cri-tools'
CGO_ENABLED=0 GO111MODULE=on go test -mod=vendor -c -o /tmp/tmp.53N5CBuAm5/cri-tools/build/bin/critest \
	-ldflags '-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=1.20.0-24-g53ad8bb7' \
	-tags 'selinux' \
     github.com/kubernetes-sigs/cri-tools/cmd/critest
CGO_ENABLED=0 GO111MODULE=on go build -mod=vendor -o /tmp/tmp.53N5CBuAm5/cri-tools/build/bin/crictl \
	-ldflags '-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=1.20.0-24-g53ad8bb7' \
	-tags 'selinux' \
	github.com/kubernetes-sigs/cri-tools/cmd/crictl
make[1]: Leaving directory '/tmp/tmp.53N5CBuAm5/cri-tools'
make[1]: Entering directory '/tmp/tmp.53N5CBuAm5/cri-tools'
install -d /home/mike/go/src/github.com/containerd/containerd/_output/cri/usr/local/bin
install -m 755 /tmp/tmp.53N5CBuAm5/cri-tools/build/bin/critest /tmp/tmp.53N5CBuAm5/cri-tools/build/bin/crictl /home/mike/go/src/github.com/containerd/containerd/_output/cri/usr/local/bin/
make[1]: Leaving directory '/tmp/tmp.53N5CBuAm5/cri-tools'
runtime-endpoint: unix:///run/containerd/containerd.sock
/home/mike/go
DESTDIR=/home/mike/go/src/github.com/containerd/containerd/_output/cri script/setup/install-imgcrypt
Cloning into '/tmp/tmp.Lj3pv1BkqL/imgcrypt'...
remote: Enumerating objects: 5610, done.
remote: Counting objects: 100% (673/673), done.
remote: Compressing objects: 100% (540/540), done.
remote: Total 5610 (delta 188), reused 325 (delta 109), pack-reused 4937
Receiving objects: 100% (5610/5610), 8.26 MiB | 1.49 MiB/s, done.
Resolving deltas: 100% (2135/2135), done.
/tmp/tmp.Lj3pv1BkqL/imgcrypt /home/mike/go/src/github.com/containerd/containerd
Note: checking out 'v1.1.0'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b <new-branch-name>

HEAD is now at 07b5812 Merge pull request #37 from estesp/rm-appveyor
make[1]: Entering directory '/tmp/tmp.Lj3pv1BkqL/imgcrypt'
go build -o bin/ctd-decoder -v ./cmd/ctd-decoder/
github.com/containerd/imgcrypt
github.com/containerd/imgcrypt/images/encryption
github.com/containerd/imgcrypt/cmd/ctd-decoder
go build -o bin/ctr-enc -v ./cmd/ctr/
github.com/containerd/imgcrypt/cmd/ctr/commands/flags
github.com/containerd/imgcrypt/cmd/ctr/commands
github.com/containerd/imgcrypt/cmd/ctr/commands/img
github.com/containerd/imgcrypt/cmd/ctr/commands/images
github.com/containerd/imgcrypt/cmd/ctr/commands/run
github.com/containerd/imgcrypt/cmd/ctr/commands/containers
github.com/containerd/imgcrypt/cmd/ctr/app
github.com/containerd/imgcrypt/cmd/ctr
make[1]: Leaving directory '/tmp/tmp.Lj3pv1BkqL/imgcrypt'
make[1]: Entering directory '/tmp/tmp.Lj3pv1BkqL/imgcrypt'
install
make[1]: Leaving directory '/tmp/tmp.Lj3pv1BkqL/imgcrypt'
/home/mike/go/src/github.com/containerd/containerd
+ releases/cri-containerd-cni-1.5.0-1-ge60322b80-linux-amd64.tar.gz
+ cri-cni-release

release:

root@mike-VirtualBox:/home/mike/go/src/github.com/containerd/containerd# tar -ztvf releases/cri-containerd-cni-1.5.0-1-ge60322b80-linux-amd64.tar.gz 
drwxr-xr-x root/root         0 2021-05-06 19:23 etc/
drwxr-xr-x root/root         0 2021-05-06 19:22 etc/systemd/
drwxr-xr-x root/root         0 2021-05-06 19:22 etc/systemd/system/
-rw-r--r-- root/root      1270 2021-05-06 19:22 etc/systemd/system/containerd.service
-rw-r--r-- root/root        57 2021-05-06 19:23 etc/crictl.yaml
drwxr-xr-x root/root         0 2021-05-06 19:22 etc/cni/
drwxr-xr-x root/root         0 2021-05-06 19:22 etc/cni/net.d/
-rw-r--r-- root/root       604 2021-05-06 19:22 etc/cni/net.d/10-containerd-net.conflist
drwxr-xr-x root/root         0 2021-05-06 19:22 usr/
drwxr-xr-x root/root         0 2021-05-06 19:22 usr/local/
drwxr-xr-x root/root         0 2021-05-06 19:22 usr/local/sbin/
-rwxr-xr-x root/root  14247832 2021-05-06 19:22 usr/local/sbin/runc
drwxr-xr-x root/root         0 2021-05-06 19:23 usr/local/bin/
-rwxr-xr-x root/root  24980880 2021-05-06 19:23 usr/local/bin/ctd-decoder
-rwxr-xr-x root/root   8654848 2021-05-06 19:22 usr/local/bin/containerd-shim-runc-v1
-rwxr-xr-x root/root  49000544 2021-05-06 19:22 usr/local/bin/containerd
-rwxr-xr-x root/root  16827392 2021-05-06 19:22 usr/local/bin/ctr.exe
-rwxr-xr-x root/root   8671232 2021-05-06 19:22 usr/local/bin/containerd-shim-runc-v2
-rwxr-xr-x root/root   6422528 2021-05-06 19:22 usr/local/bin/containerd-shim
-rwxr-xr-x root/root  16635904 2021-05-06 19:22 usr/local/bin/containerd-stress.exe
-rwxr-xr-x root/root  35438512 2021-05-06 19:23 usr/local/bin/ctr-enc
-rwxr-xr-x root/root  32151117 2021-05-06 19:23 usr/local/bin/critest
-rwxr-xr-x root/root  44109299 2021-05-06 19:23 usr/local/bin/crictl
-rwxr-xr-x root/root  27202304 2021-05-06 19:22 usr/local/bin/ctr
-rwxr-xr-x root/root  32082944 2021-05-06 19:22 usr/local/bin/containerd.exe
-rwxr-xr-x root/root  22639584 2021-05-06 19:22 usr/local/bin/containerd-stress
drwxr-xr-x root/root         0 2021-05-06 19:22 opt/
drwxr-xr-x root/root         0 2021-05-06 19:22 opt/containerd/
drwxr-xr-x root/root         0 2021-05-06 19:22 opt/containerd/cluster/
drwxr-xr-x root/root         0 2021-05-06 19:22 opt/containerd/cluster/gce/
drwxr-xr-x root/root         0 2021-05-06 19:22 opt/containerd/cluster/gce/cloud-init/
-rw-r--r-- root/root      6185 2021-05-06 19:22 opt/containerd/cluster/gce/cloud-init/master.yaml
-rw-r--r-- root/root      6079 2021-05-06 19:22 opt/containerd/cluster/gce/cloud-init/node.yaml
-rwxr-xr-x root/root      9240 2021-05-06 19:22 opt/containerd/cluster/gce/configure.sh
-rw-r--r-- root/root      1173 2021-05-06 19:22 opt/containerd/cluster/gce/env
-rw-r--r-- root/root       491 2021-05-06 19:22 opt/containerd/cluster/gce/cni.template
-rw-r--r-- root/root        41 2021-05-06 19:22 opt/containerd/cluster/version
drwxr-xr-x root/root         0 2021-05-06 19:22 opt/cni/
drwxr-xr-x root/root         0 2021-05-06 19:22 opt/cni/bin/
-rwxr-xr-x root/root   3819193 2021-05-06 19:22 opt/cni/bin/portmap
-rwxr-xr-x root/root   3902006 2021-05-06 19:22 opt/cni/bin/host-device
-rwxr-xr-x root/root   4122310 2021-05-06 19:22 opt/cni/bin/macvlan
-rwxr-xr-x root/root   4049290 2021-05-06 19:22 opt/cni/bin/vlan
-rwxr-xr-x root/root   4503995 2021-05-06 19:22 opt/cni/bin/firewall
-rwxr-xr-x root/root   4236699 2021-05-06 19:22 opt/cni/bin/ptp
-rwxr-xr-x root/root   3571189 2021-05-06 19:22 opt/cni/bin/sbr
-rwxr-xr-x root/root   9744759 2021-05-06 19:22 opt/cni/bin/dhcp
-rwxr-xr-x root/root   4298271 2021-05-06 19:22 opt/cni/bin/bridge
-rwxr-xr-x root/root   2937858 2021-05-06 19:22 opt/cni/bin/static
-rwxr-xr-x root/root   3542600 2021-05-06 19:22 opt/cni/bin/tuning
-rwxr-xr-x root/root   3235383 2021-05-06 19:22 opt/cni/bin/flannel
-rwxr-xr-x root/root   3402812 2021-05-06 19:22 opt/cni/bin/loopback
-rwxr-xr-x root/root   3346381 2021-05-06 19:22 opt/cni/bin/host-local
-rwxr-xr-x root/root   4053783 2021-05-06 19:22 opt/cni/bin/ipvlan
-rwxr-xr-x root/root   3635627 2021-05-06 19:22 opt/cni/bin/vrf
-rwxr-xr-x root/root   3903968 2021-05-06 19:22 opt/cni/bin/bandwidth

Signed-off-by: Mike Brown brownwm@us.ibm.com

theopenlab-ci · 2021-05-06T23:39:14Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 4m 40s (non-voting)
containerd-test-arm64 : SUCCESS in 5m 49s (non-voting)
containerd-integration-test-arm64 : FAILURE in 5m 07s (non-voting)

theopenlab-ci · 2021-05-07T00:10:33Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 4m 26s (non-voting)
containerd-test-arm64 : SUCCESS in 5m 27s (non-voting)
containerd-integration-test-arm64 : SUCCESS in 22m 57s (non-voting)

dims

LGTM

Zyqsempai

LGTM

script/setup/install-critools

Signed-off-by: Mike Brown <brownwm@us.ibm.com>

theopenlab-ci · 2021-05-07T18:10:24Z

Build succeeded.

containerd-build-arm64 : SUCCESS in 5m 09s (non-voting)
containerd-test-arm64 : SUCCESS in 5m 28s (non-voting)
containerd-integration-test-arm64 : SUCCESS in 22m 56s (non-voting)

dmcgowan · 2021-05-07T18:22:25Z

Going to do a test release in a fork to verify this, then LGTM :)

mikebrow · 2021-05-07T18:24:59Z

/test pull-containerd-node-e2e

dmcgowan

LGTM

Verified in https://github.com/dmcgowan/containerd/releases/tag/v1.6.0-alpha.0

mikebrow requested a review from dmcgowan May 6, 2021 23:33

mikebrow force-pushed the correct-critools-release branch from 6f10620 to e60322b Compare May 6, 2021 23:45

dims approved these changes May 7, 2021

View reviewed changes

Zyqsempai approved these changes May 7, 2021

View reviewed changes

dmcgowan reviewed May 7, 2021

View reviewed changes

script/setup/install-critools Outdated Show resolved Hide resolved

update to new cri-tools make install

c74a6c4

Signed-off-by: Mike Brown <brownwm@us.ibm.com>

mikebrow force-pushed the correct-critools-release branch from e60322b to c74a6c4 Compare May 7, 2021 17:45

dmcgowan added this to the 1.5.1 milestone May 7, 2021

dmcgowan added the cherry-pick/1.5.x Change to be cherry picked to release/1.5 branch label May 7, 2021

dmcgowan approved these changes May 7, 2021

View reviewed changes

dmcgowan merged commit 1ecc98f into containerd:master May 7, 2021

This was referenced May 7, 2021

need an updated release and containerd/imgcrypt#45

Closed

[release/1.5] update to new cri-tools make install #5471

Merged

dmcgowan mentioned this pull request May 10, 2021

[release/1.5] Backport build updates #5474

Merged

dmcgowan added cherry-picked/1.5.x PR commits are cherry-picked into release/1.5 branch and removed cherry-pick/1.5.x Change to be cherry picked to release/1.5 branch labels May 10, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update to new cri-tools make install #5462

update to new cri-tools make install #5462

mikebrow commented May 6, 2021 •

edited

theopenlab-ci bot commented May 6, 2021

theopenlab-ci bot commented May 7, 2021

dims left a comment

Zyqsempai left a comment

theopenlab-ci bot commented May 7, 2021

dmcgowan commented May 7, 2021

mikebrow commented May 7, 2021

dmcgowan left a comment

update to new cri-tools make install #5462

update to new cri-tools make install #5462

Conversation

mikebrow commented May 6, 2021 • edited

theopenlab-ci bot commented May 6, 2021

theopenlab-ci bot commented May 7, 2021

dims left a comment

Choose a reason for hiding this comment

Zyqsempai left a comment

Choose a reason for hiding this comment

theopenlab-ci bot commented May 7, 2021

dmcgowan commented May 7, 2021

mikebrow commented May 7, 2021

dmcgowan left a comment

Choose a reason for hiding this comment

mikebrow commented May 6, 2021 •

edited