Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

update cni version to 1.0.1 #903

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

update cni version to 1.0.1 #903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
186d484
update cni version to 1.0.1
abn Mar 7, 2022
b7d90a4
make autogen tidy
abn Mar 7, 2022
cad3f47
update test data for ps tables
abn Mar 7, 2022
b496fdc
use create instead of run in e2e config tests
abn Mar 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .semaphore/semaphore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ blocks:
sudo which containerd || sudo apt-get install -y --no-install-recommends containerd
- kvm-ok
- |
export CNI_VERSION=v0.9.1
export CNI_VERSION=v1.0.1
export ARCH=$([ $(uname -m) = "x86_64" ] && echo amd64 || echo arm64)
sudo mkdir -p /opt/cni/bin
curl -sSL https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-linux-${ARCH}-${CNI_VERSION}.tgz | sudo tar -xz -C /opt/cni/bin
Expand Down
2 changes: 1 addition & 1 deletion cmd/ignite/run/testdata/output/ps-filtered-table.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
VM ID IMAGE KERNEL SIZE CPUS MEMORY CREATED STATUS IPS PORTS NAME
bfc80c948b1e2419 foo/bar:latest foo/bar:latest 0 B 0 0 B 21y ago Stopped vm2
bfc80c948b1e2419 foo/bar:latest foo/bar:latest 0 B 0 0 B 22y ago Stopped vm2
6 changes: 3 additions & 3 deletions cmd/ignite/run/testdata/output/ps-table.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VM ID IMAGE KERNEL SIZE CPUS MEMORY CREATED STATUS IPS PORTS NAME
20e1d566ce318ada foo/bar:latest foo/bar:latest 0 B 0 0 B 21y ago Stopped vm1
bfc80c948b1e2419 foo/bar:latest foo/bar:latest 0 B 0 0 B 21y ago Stopped vm2
cddc37ba657766e3 foo/bar:latest foo/bar:latest 0 B 0 0 B 21y ago Stopped vm3
20e1d566ce318ada foo/bar:latest foo/bar:latest 0 B 0 0 B 22y ago Stopped vm1
bfc80c948b1e2419 foo/bar:latest foo/bar:latest 0 B 0 0 B 22y ago Stopped vm2
cddc37ba657766e3 foo/bar:latest foo/bar:latest 0 B 0 0 B 22y ago Stopped vm3
2 changes: 1 addition & 1 deletion docs/dependencies.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ With time, we aim to eliminate as many of these as possible.
### CNI plugins

```shell
export CNI_VERSION=v0.9.1
export CNI_VERSION=v1.0.1
export ARCH=$([ $(uname -m) = "x86_64" ] && echo amd64 || echo arm64)
curl -sSL https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-linux-${ARCH}-${CNI_VERSION}.tgz | tar -xz -C /opt/cni/bin
```
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ which containerd || amazon-linux-extras enable docker && yum install -y containe
Install the CNI binaries like this:

```shell
export CNI_VERSION=v0.9.1
export CNI_VERSION=v1.0.1
export ARCH=$([ $(uname -m) = "x86_64" ] && echo amd64 || echo arm64)
sudo mkdir -p /opt/cni/bin
curl -sSL https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-linux-${ARCH}-${CNI_VERSION}.tgz | sudo tar -xz -C /opt/cni/bin
Expand Down
3 changes: 2 additions & 1 deletion e2e/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ spec:
// Create a VM with the ignite config file.
// NOTE: Set a sandbox-image to have deterministic results.
vmRun := igniteCmd.New().
With("run", "--name="+vmName).
With("create", "--name="+vmName).
With("--sandbox-image=weaveworks/ignite:dev").
With("--ignite-config=" + file.Name()).
With(util.DefaultVMImage)
Expand Down Expand Up @@ -205,6 +205,7 @@ spec:
if !rt.err {
// Query VM properties.
psArgs := []string{
"--all",
"--filter={{.ObjectMeta.Name}}=" + vmName,
"--template='{{.Spec.Memory}} {{.Spec.CPUs}} {{.Spec.DiskSize}} {{.Spec.Image.OCI}} {{.Spec.Sandbox.OCI}} {{.Spec.Kernel.OCI}} {{.Spec.SSH}}'",
}
Expand Down
33 changes: 12 additions & 21 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,23 @@ go 1.16

replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20190711223531-1fb7fffdb266

// TODO: Remove this when https://github.com/vishvananda/netlink/pull/554 is merged
replace github.com/vishvananda/netlink => github.com/twelho/netlink v1.1.1-ageing

require (
github.com/Microsoft/go-winio v0.4.17 // indirect
github.com/alessio/shellescape v1.2.2
github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee
github.com/containerd/cgroups v0.0.0-20210414185036-21be17332467 // indirect
github.com/containerd/console v1.0.1
github.com/containerd/containerd v1.5.0-beta.4
github.com/containerd/continuity v0.0.0-20210417042358-bce1c3f9669b // indirect
github.com/containerd/fifo v0.0.0-20210331061852-650e8a8a179d // indirect
github.com/containerd/go-cni v1.0.1
github.com/containerd/typeurl v1.0.2 // indirect
github.com/containernetworking/plugins v0.8.7
github.com/containerd/console v1.0.2
github.com/containerd/containerd v1.5.1
github.com/containerd/go-cni v1.1.3
github.com/containernetworking/plugins v1.0.1
github.com/containers/image v3.0.2+incompatible
github.com/coreos/go-iptables v0.4.5
github.com/coreos/go-iptables v0.6.0
github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492
github.com/docker/docker v20.10.6+incompatible
github.com/docker/go-connections v0.4.0
github.com/firecracker-microvm/firecracker-go-sdk v0.22.0
github.com/firecracker-microvm/firecracker-go-sdk v0.22.1-0.20220302172044-565c88a871e2
github.com/freddierice/go-losetup v0.0.0-20170407175016-fc9adea44124
github.com/go-openapi/spec v0.19.8
github.com/go-openapi/spec v0.20.4
github.com/gogo/googleapis v1.4.1 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/uuid v1.2.0 // indirect
github.com/goombaio/namegenerator v0.0.0-20181006234301-989e774b106e
github.com/gorilla/mux v1.7.4 // indirect
github.com/krolaw/dhcp4 v0.0.0-20190909130307-a50d88189771
Expand All @@ -47,13 +38,13 @@ require (
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.6.1
github.com/vishvananda/netlink v1.1.0
github.com/stretchr/testify v1.7.0
github.com/vishvananda/netlink v1.1.1-0.20220224135417-f7fd7af4377d
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be v1.2.0-beta now.

github.com/weaveworks/libgitops v0.0.0-20200611103311-2c871bbbbf0c
go.opencensus.io v0.23.0 // indirect
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e
golang.org/x/tools v0.1.7 // indirect
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a
golang.org/x/tools v0.1.9 // indirect
google.golang.org/genproto v0.0.0-20210416161957-9910b6c460de // indirect
google.golang.org/grpc v1.37.0 // indirect
gotest.tools v2.2.0+incompatible
Expand Down
Loading