Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade cri-dockerd to fix the socket path #13563

Merged
merged 3 commits into from
Feb 7, 2022

Conversation

afbjorklund
Copy link
Collaborator

The v0.2.0 had the socket as cri-docker.sock,
while the installer are using cri-dockerd.sock

Also fix the output of cri-dockerd --version,
to use the git commit instead of just "HEAD".

Closes #13545

The v0.2.0 had the socket as cri-docker.sock,
while the installer are using cri-dockerd.sock

Also fix the output of cri-dockerd --version,
to use the git commit instead of just "HEAD".
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 4, 2022
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 4, 2022
@afbjorklund
Copy link
Collaborator Author

ok-to-build-iso

@afbjorklund
Copy link
Collaborator Author

ok-to-build-image

@afbjorklund
Copy link
Collaborator Author

/ok-to-test

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Feb 4, 2022
@afbjorklund
Copy link
Collaborator Author

afbjorklund commented Feb 4, 2022

@sharifelgamal : I verified this locally, using v1.24.0-alpha.2 and local builds of KIC and ISO.

❗ Specified Kubernetes version 1.24.0-alpha.2 is newer than the newest supported version: v1.23.4-rc.0

🐳 Preparing Kubernetes v1.24.0-alpha.2 on Docker 20.10.12 ...

🏄 Done! kubectl is now configured to use "minikube" cluster and "default" namespace by default

$ minikube ssh -- sudo crictl version
Version:  0.1.0
RuntimeName:  docker
RuntimeVersion:  20.10.12
RuntimeApiVersion:  1.41.0
$ minikube ssh -- sudo crictl --version
crictl version v1.21.0
$ minikube ssh -- sudo cri-dockerd --version
cri-dockerd 0.2.0 (a4d1895)

You can still start e.g. v1.23.3, there will be no differences to the crictl version or output.

The only difference is in the contents of the /etc/crictl.yaml file, regarding the unix socket path.

runtime-endpoint: unix:///var/run/dockershim.sock
image-endpoint: unix:///var/run/dockershim.sock
runtime-endpoint: unix:///var/run/cri-dockerd.sock
image-endpoint: unix:///var/run/cri-dockerd.sock

This is because it is still using the "docker" container runtime.

Only thing that happened was that the CRI proxy moved a bit.

dockershim-to-cri-dockerd

@afbjorklund
Copy link
Collaborator Author

afbjorklund commented Feb 5, 2022

Currently there is some confusion in the upstream documentation:

https://kubernetes.io/docs/tasks/administer-cluster/migrating-from-dockershim/

But it is being fixed:


KIC output:

NAME       STATUS     ROLES                  AGE   VERSION           INTERNAL-IP    EXTERNAL-IP   OS-IMAGE             KERNEL-VERSION     CONTAINER-RUNTIME
minikube   NotReady   control-plane,master   6s    v1.24.0-alpha.2   192.168.49.2   <none>        Ubuntu 20.04.2 LTS   5.4.0-97-generic   docker://20.10.12

ISO output:

NAME       STATUS   ROLES                  AGE   VERSION           INTERNAL-IP      EXTERNAL-IP   OS-IMAGE              KERNEL-VERSION   CONTAINER-RUNTIME
minikube   Ready    control-plane,master   6s    v1.24.0-alpha.2   192.168.50.130   <none>        Buildroot 2021.02.4   4.19.202         docker://20.10.12

The container runtime is the same, independent on the Kubernetes version:

docker://20.10.12

@minikube-pr-bot

This comment was marked as off-topic.

@minikube-bot
Copy link
Collaborator

Hi @afbjorklund, we have updated your PR with the reference to newly built ISO. Pull the changes locally if you want to test with them or update your PR further.

@minikube-bot
Copy link
Collaborator

Hi @afbjorklund, we have updated your PR with the reference to newly built kicbase image. Pull the changes locally if you want to test with them or update your PR further.

@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 13563) |
+----------------+----------+---------------------+
| minikube start | 55.9s    | 54.7s               |
| enable ingress | 29.8s    | 30.4s               |
+----------------+----------+---------------------+

Times for minikube ingress: 29.7s 29.2s 29.7s 31.2s 29.2s
Times for minikube (PR 13563) ingress: 30.2s 29.7s 31.2s 30.2s 30.7s

Times for minikube (PR 13563) start: 55.1s 54.5s 54.3s 55.2s 54.4s
Times for minikube start: 56.9s 55.3s 56.3s 55.2s 55.7s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 13563) |
+----------------+----------+---------------------+
| minikube start | 29.4s    | 28.1s               |
| enable ingress | 23.3s    | 22.8s               |
+----------------+----------+---------------------+

Times for minikube ingress: 24.0s 23.0s 23.0s 23.5s 23.1s
Times for minikube (PR 13563) ingress: 22.5s 22.0s 23.0s 23.5s 23.0s

Times for minikube start: 33.0s 28.0s 28.1s 28.7s 29.4s
Times for minikube (PR 13563) start: 27.3s 28.2s 28.3s 28.9s 27.7s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 13563) |
+----------------+----------+---------------------+
| minikube start | 43.2s    | 45.4s               |
| enable ingress | 28.5s    | 21.2s               |
+----------------+----------+---------------------+

Times for minikube start: 39.0s 44.0s 43.9s 44.0s 45.2s
Times for minikube (PR 13563) start: 43.3s 43.2s 47.6s 46.8s 45.9s

Times for minikube ingress: 20.5s 24.0s 24.0s 23.0s 51.0s
Times for minikube (PR 13563) ingress: 24.0s 23.1s 19.0s 20.0s 20.0s

@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 13563) |
+----------------+----------+---------------------+
| minikube start | 52.8s    | 53.2s               |
| enable ingress | 28.7s    | 27.5s               |
+----------------+----------+---------------------+

Times for minikube start: 53.9s 52.0s 53.3s 52.3s 52.6s
Times for minikube (PR 13563) start: 54.7s 52.6s 52.2s 53.7s 52.8s

Times for minikube ingress: 29.6s 29.6s 25.6s 29.6s 29.1s
Times for minikube (PR 13563) ingress: 28.1s 29.1s 28.6s 26.1s 25.6s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 13563) |
+----------------+----------+---------------------+
| minikube start | 30.0s    | 32.9s               |
| enable ingress | 22.4s    | 22.0s               |
+----------------+----------+---------------------+

Times for minikube start: 43.8s 27.1s 26.0s 26.8s 26.2s
Times for minikube (PR 13563) start: 57.1s 27.3s 26.7s 26.4s 27.2s

Times for minikube ingress: 22.0s 23.0s 21.9s 22.4s 22.4s
Times for minikube (PR 13563) ingress: 21.9s 21.9s 21.9s 21.9s 22.0s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 13563) |
+----------------+----------+---------------------+
| minikube start | 44.8s    | 43.1s               |
| enable ingress | 21.1s    | 23.9s               |
+----------------+----------+---------------------+

Times for minikube start: 44.2s 46.5s 45.5s 45.8s 42.0s
Times for minikube (PR 13563) start: 42.4s 44.3s 41.9s 46.0s 41.2s

Times for minikube ingress: 23.4s 19.0s 21.0s 19.0s 23.0s
Times for minikube (PR 13563) ingress: 23.5s 19.9s 23.4s 19.9s 32.9s

@minikube-pr-bot
Copy link

These are the flake rates of all failed tests.

Environment Failed Tests Flake Rate (%)
Docker_Linux_containerd TestNoKubernetes/serial/Start (gopogh) 5.26 (chart)
Docker_macOS TestFunctional/serial/ComponentHealth (gopogh) 9.91 (chart)
Docker_macOS TestFunctional/serial/ExtraConfig (gopogh) 9.91 (chart)
KVM_Linux_containerd TestStoppedBinaryUpgrade/MinikubeLogs (gopogh) 10.62 (chart)
KVM_Linux_containerd TestStoppedBinaryUpgrade/Upgrade (gopogh) 12.39 (chart)
KVM_Linux_containerd TestNetworkPlugins/group/kindnet/Start (gopogh) 15.93 (chart)
KVM_Linux_containerd TestNetworkPlugins/group/enable-default-cni/Start (gopogh) 16.81 (chart)
Docker_Windows TestNetworkPlugins/group/auto/DNS (gopogh) 18.84 (chart)
KVM_Linux_containerd TestNetworkPlugins/group/bridge/Start (gopogh) 19.47 (chart)
Docker_macOS TestNoKubernetes/serial/Start (gopogh) 19.81 (chart)
Docker_Linux_containerd TestNetworkPlugins/group/custom-weave/Start (gopogh) 27.69 (chart)
Docker_Linux_containerd TestPause/serial/Start (gopogh) 31.40 (chart)
Docker_Linux_containerd TestStartStop/group/no-preload/serial/DeployApp (gopogh) 38.89 (chart)
Docker_Linux_containerd TestStartStop/group/no-preload/serial/FirstStart (gopogh) 38.89 (chart)
Docker_Linux_containerd TestStartStop/group/no-preload/serial/UserAppExistsAfterStop (gopogh) 38.89 (chart)
Docker_Linux_containerd TestStartStop/group/no-preload/serial/SecondStart (gopogh) 40.00 (chart)
Docker_Windows TestStartStop/group/old-k8s-version/serial/Pause (gopogh) 43.42 (chart)
Docker_Linux_containerd TestStartStop/group/old-k8s-version/serial/FirstStart (gopogh) 50.00 (chart)
Docker_Linux_containerd TestStartStop/group/old-k8s-version/serial/DeployApp (gopogh) 51.79 (chart)
Docker_Linux_containerd TestStartStop/group/old-k8s-version/serial/SecondStart (gopogh) 51.85 (chart)
Docker_Linux_containerd TestStartStop/group/old-k8s-version/serial/UserAppExistsAfterStop (gopogh) 51.85 (chart)
Docker_Windows TestNetworkPlugins/group/kindnet/Start (gopogh) 52.50 (chart)
Docker_macOS TestNetworkPlugins/group/calico/Start (gopogh) 53.47 (chart)
Docker_Linux TestNetworkPlugins/group/kindnet/DNS (gopogh) 60.32 (chart)
Docker_Linux TestNetworkPlugins/group/custom-weave/Start (gopogh) 62.04 (chart)
Docker_Windows TestNetworkPlugins/group/bridge/Start (gopogh) 62.50 (chart)
Docker_Windows TestNetworkPlugins/group/custom-weave/Start (gopogh) 62.50 (chart)
Docker_Linux_containerd TestNetworkPlugins/group/kindnet/DNS (gopogh) 63.64 (chart)
Docker_Linux_containerd TestStartStop/group/default-k8s-different-port/serial/FirstStart (gopogh) 65.45 (chart)
Docker_Linux_containerd TestStartStop/group/default-k8s-different-port/serial/SecondStart (gopogh) 65.45 (chart)
More tests... Continued...

Too many tests failed - See test logs for more details.

To see the flake rates of all tests by environment, click here.

@minikube-pr-bot
Copy link

These are the flake rates of all failed tests.

Environment Failed Tests Flake Rate (%)
KVM_Linux TestFunctional/parallel/MountCmd/specific-port (gopogh) 0.86 (chart)
KVM_Linux TestFunctional/parallel/DashboardCmd (gopogh) 1.72 (chart)
Hyper-V_Windows TestErrorSpam/setup (gopogh) 8.75 (chart)
KVM_Linux_containerd TestStoppedBinaryUpgrade/MinikubeLogs (gopogh) 10.62 (chart)
KVM_Linux_containerd TestNetworkPlugins/group/calico/Start (gopogh) 11.50 (chart)
KVM_Linux_containerd TestStoppedBinaryUpgrade/Upgrade (gopogh) 12.39 (chart)
Hyperkit_macOS TestFunctional/parallel/DashboardCmd (gopogh) 15.70 (chart)
KVM_Linux_containerd TestNetworkPlugins/group/cilium/Start (gopogh) 15.93 (chart)
KVM_Linux_containerd TestNetworkPlugins/group/custom-weave/Start (gopogh) 15.93 (chart)
Docker_macOS TestFunctional/parallel/DashboardCmd (gopogh) 16.22 (chart)
KVM_Linux_containerd TestNetworkPlugins/group/enable-default-cni/Start (gopogh) 16.81 (chart)
KVM_Linux_containerd TestNetworkPlugins/group/flannel/Start (gopogh) 18.58 (chart)
KVM_Linux_containerd TestNetworkPlugins/group/bridge/Start (gopogh) 19.47 (chart)
Docker_macOS TestAddons/parallel/MetricsServer (gopogh) 28.18 (chart)
Docker_Linux_containerd TestAddons/parallel/Registry (gopogh) 29.03 (chart)
Docker_Linux_containerd TestOffline (gopogh) 31.40 (chart)
Docker_Linux_containerd TestPause/serial/Start (gopogh) 31.40 (chart)
Docker_macOS TestNetworkPlugins/group/bridge/Start (gopogh) 34.31 (chart)
Docker_Linux TestNetworkPlugins/group/kindnet/Start (gopogh) 41.67 (chart)
Docker_Linux_containerd TestFunctional/parallel/DashboardCmd (gopogh) 48.84 (chart)
Docker_Linux_containerd TestFunctional/parallel/MountCmd/any-port (gopogh) 48.84 (chart)
Docker_Linux_containerd TestFunctional/parallel/MySQL (gopogh) 48.84 (chart)
Docker_Linux_containerd TestFunctional/parallel/PersistentVolumeClaim (gopogh) 48.84 (chart)
Docker_Linux_containerd TestFunctional/parallel/ServiceCmd (gopogh) 48.84 (chart)
Docker_Linux_containerd TestFunctional/parallel/TunnelCmd/serial/AccessDirect (gopogh) 48.84 (chart)
Docker_Linux_containerd TestFunctional/parallel/TunnelCmd/serial/WaitService/Setup (gopogh) 48.84 (chart)
Docker_Linux_containerd TestFunctional/serial/ExtraConfig (gopogh) 48.84 (chart)
Docker_Linux_containerd TestFunctional/serial/SoftStart (gopogh) 48.84 (chart)
Docker_Linux_containerd TestFunctional/serial/StartWithProxy (gopogh) 48.84 (chart)
Docker_Linux_containerd TestMultiNode/serial/DeployApp2Nodes (gopogh) 48.84 (chart)
More tests... Continued...

Too many tests failed - See test logs for more details.

To see the flake rates of all tests by environment, click here.

@minikube-pr-bot
Copy link

These are the flake rates of all failed tests.

Environment Failed Tests Flake Rate (%)
Hyper-V_Windows TestNetworkPlugins/group/false/KubeletFlags (gopogh) 0.00 (chart)
Hyperkit_macOS TestFunctional/serial/ComponentHealth (gopogh) 1.65 (chart)
Docker_Linux_containerd TestKubernetesUpgrade (gopogh) 2.33 (chart)
Docker_Linux_containerd TestPause/serial/Pause (gopogh) 3.39 (chart)
Docker_Linux TestFunctional/serial/ComponentHealth (gopogh) 3.70 (chart)
Hyper-V_Windows TestNetworkPlugins/group/enable-default-cni/Start (gopogh) 5.00 (chart)
KVM_Linux_containerd TestStartStop/group/default-k8s-different-port/serial/DeployApp (gopogh) 8.85 (chart)
KVM_Linux_containerd TestStartStop/group/default-k8s-different-port/serial/EnableAddonWhileActive (gopogh) 8.85 (chart)
KVM_Linux_containerd TestStartStop/group/default-k8s-different-port/serial/FirstStart (gopogh) 8.85 (chart)
Hyper-V_Windows TestNetworkPlugins/group/bridge/Start (gopogh) 11.25 (chart)
Hyper-V_Windows TestNetworkPlugins/group/flannel/Start (gopogh) 11.25 (chart)
Docker_Windows TestNetworkPlugins/group/auto/Start (gopogh) 13.75 (chart)
Docker_macOS TestFunctional/parallel/DashboardCmd (gopogh) 16.22 (chart)
Docker_Windows TestNetworkPlugins/group/false/Start (gopogh) 17.50 (chart)
Hyper-V_Windows TestNetworkPlugins/group/kubenet/Start (gopogh) 20.00 (chart)
Docker_macOS TestStartStop/group/newest-cni/serial/Stop (gopogh) 24.14 (chart)
Docker_Windows TestPause/serial/Pause (gopogh) 26.09 (chart)
Docker_Linux_containerd TestAddons/Setup (gopogh) 27.91 (chart)
Docker_Linux_containerd TestIngressAddonLegacy/serial/ValidateIngressAddonActivation (gopogh) 27.91 (chart)
Docker_Linux_containerd TestIngressAddonLegacy/StartLegacyK8sCluster (gopogh) 27.91 (chart)
Docker_Linux_containerd TestJSONOutput/start/Audit (gopogh) 27.91 (chart)
Docker_Linux_containerd TestJSONOutput/start/Command (gopogh) 27.91 (chart)
Docker_Linux_containerd TestMultiNode/serial/AddNode (gopogh) 27.91 (chart)
Docker_Linux_containerd TestMultiNode/serial/DeleteNode (gopogh) 27.91 (chart)
Docker_Linux_containerd TestMultiNode/serial/FreshStart2Nodes (gopogh) 27.91 (chart)
Docker_Linux_containerd TestMultiNode/serial/ProfileList (gopogh) 27.91 (chart)
Docker_Linux_containerd TestMultiNode/serial/RestartKeepsNodes (gopogh) 27.91 (chart)
Docker_Linux_containerd TestMultiNode/serial/StartAfterStop (gopogh) 27.91 (chart)
Docker_Linux_containerd TestMultiNode/serial/StopNode (gopogh) 27.91 (chart)
Docker_Linux_containerd TestPreload (gopogh) 27.91 (chart)
More tests... Continued...

Too many tests failed - See test logs for more details.

To see the flake rates of all tests by environment, click here.

@sharifelgamal sharifelgamal merged commit 46ae15d into kubernetes:master Feb 7, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afbjorklund, sharifelgamal

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [afbjorklund,sharifelgamal]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support docker container runtime in Kubernetes 1.24
5 participants