From 3c3f81cc5c192a312cfb17539ff9618622c107d6 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 9 May 2023 13:47:36 -0700 Subject: [PATCH] fix not prepending unix to CRI socket --- .../templates/v1beta3/containerd-api-port.yaml | 2 +- .../templates/v1beta3/containerd-pod-network-cidr.yaml | 2 +- .../kubernetes_version/templates/v1beta3/containerd.yaml | 2 +- .../templates/v1beta3/crio-options-gates.yaml | 2 +- hack/update/kubernetes_version/templates/v1beta3/crio.yaml | 2 +- hack/update/kubernetes_version/templates/v1beta3/default.yaml | 2 +- hack/update/kubernetes_version/templates/v1beta3/dns.yaml | 2 +- .../templates/v1beta3/image-repository.yaml | 2 +- hack/update/kubernetes_version/templates/v1beta3/options.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta3.go | 2 +- pkg/minikube/bootstrapper/bsutil/kubeadm.go | 4 ++++ .../bsutil/testdata/v1.24/containerd-api-port.yaml | 2 +- .../bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.24/containerd.yaml | 2 +- .../bsutil/testdata/v1.24/crio-options-gates.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.24/image-repository.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml | 2 +- .../bsutil/testdata/v1.25/containerd-api-port.yaml | 2 +- .../bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.25/containerd.yaml | 2 +- .../bsutil/testdata/v1.25/crio-options-gates.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.25/image-repository.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml | 2 +- .../bsutil/testdata/v1.26/containerd-api-port.yaml | 2 +- .../bsutil/testdata/v1.26/containerd-pod-network-cidr.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.26/containerd.yaml | 2 +- .../bsutil/testdata/v1.26/crio-options-gates.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.26/default.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.26/dns.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.26/image-repository.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.26/options.yaml | 2 +- .../bsutil/testdata/v1.27/containerd-api-port.yaml | 2 +- .../bsutil/testdata/v1.27/containerd-pod-network-cidr.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.27/containerd.yaml | 2 +- .../bsutil/testdata/v1.27/crio-options-gates.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.27/default.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.27/dns.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.27/image-repository.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.27/options.yaml | 2 +- 47 files changed, 50 insertions(+), 46 deletions(-) diff --git a/hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml b/hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml index 7b46b2fcd5..770b9d7b8d 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml +++ b/hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /run/containerd/containerd.sock + criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml b/hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml index 0b14634f79..fe73efd4df 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml +++ b/hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /run/containerd/containerd.sock + criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/hack/update/kubernetes_version/templates/v1beta3/containerd.yaml b/hack/update/kubernetes_version/templates/v1beta3/containerd.yaml index 0700426ea5..1e83c282c0 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/containerd.yaml +++ b/hack/update/kubernetes_version/templates/v1beta3/containerd.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /run/containerd/containerd.sock + criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml b/hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml index 8f06d0c9bf..8a879c3916 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml +++ b/hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/crio/crio.sock + criSocket: unix:///var/run/crio/crio.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/hack/update/kubernetes_version/templates/v1beta3/crio.yaml b/hack/update/kubernetes_version/templates/v1beta3/crio.yaml index 8e95541b6c..a89c17f244 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/crio.yaml +++ b/hack/update/kubernetes_version/templates/v1beta3/crio.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/crio/crio.sock + criSocket: unix:///var/run/crio/crio.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/hack/update/kubernetes_version/templates/v1beta3/default.yaml b/hack/update/kubernetes_version/templates/v1beta3/default.yaml index 5c4ee61fbd..a4868e094f 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/default.yaml +++ b/hack/update/kubernetes_version/templates/v1beta3/default.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/hack/update/kubernetes_version/templates/v1beta3/dns.yaml b/hack/update/kubernetes_version/templates/v1beta3/dns.yaml index 3387cb9a3d..775c22b6de 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/dns.yaml +++ b/hack/update/kubernetes_version/templates/v1beta3/dns.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml b/hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml index df980fb545..1a5ee6a997 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml +++ b/hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/hack/update/kubernetes_version/templates/v1beta3/options.yaml b/hack/update/kubernetes_version/templates/v1beta3/options.yaml index b608822891..08aae8c19c 100644 --- a/hack/update/kubernetes_version/templates/v1beta3/options.yaml +++ b/hack/update/kubernetes_version/templates/v1beta3/options.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta3.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta3.go index c2b73c6350..26de90f42e 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta3.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta3.go @@ -34,7 +34,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: {{if .CRISocket}}{{.CRISocket}}{{else}}/var/run/dockershim.sock{{end}} + criSocket: {{if .CRISocket}}{{if .PrependCriSocketUnix}}unix://{{end}}{{.CRISocket}}{{else}}{{if .PrependCriSocketUnix}}unix://{{end}}/var/run/dockershim.sock{{end}} name: "{{.NodeName}}" kubeletExtraArgs: node-ip: {{.NodeIP}} diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go index decd753fac..d6b960aca6 100644 --- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go +++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go @@ -124,6 +124,7 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana KubeProxyOptions map[string]string ResolvConfSearchRegression bool KubeletConfigOpts map[string]string + PrependCriSocketUnix bool }{ CertDir: vmpath.GuestKubernetesCertsDir, ServiceCIDR: constants.DefaultServiceCIDR, @@ -169,6 +170,9 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana if version.GTE(semver.MustParse("1.23.0")) { configTmpl = ktmpl.V1Beta3 } + if version.GTE(semver.MustParse("1.24.0-alpha.2")) { + opts.PrependCriSocketUnix = true + } klog.Infof("kubeadm options: %+v", opts) b := bytes.Buffer{} if err := configTmpl.Execute(&b, opts); err != nil { diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml index 9c1f32e2e4..4f6947f3a9 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /run/containerd/containerd.sock + criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml index b91a260532..0e84a43cdc 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /run/containerd/containerd.sock + criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml index 9df6aaa449..8b3a2e10e1 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /run/containerd/containerd.sock + criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml index d11d3e77a8..2c22716e3b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/crio/crio.sock + criSocket: unix:///var/run/crio/crio.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml index bb4fe9c470..4cdca1f1aa 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/crio/crio.sock + criSocket: unix:///var/run/crio/crio.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml index 357b86a2e1..43f1bf3e7f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml index b589145b10..d56410344b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml index 660efe8242..96ba9bc215 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml index 1e824985e0..86c765506e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml index cd57de3e0f..2fd8410899 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /run/containerd/containerd.sock + criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml index 744eb4a75a..32a46aa3c2 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /run/containerd/containerd.sock + criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml index 9ef1d535b7..2597d612c4 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /run/containerd/containerd.sock + criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml index a7c48c4492..a6acea9445 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/crio/crio.sock + criSocket: unix:///var/run/crio/crio.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml index 7915ee5350..1a8dfb67f4 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/crio/crio.sock + criSocket: unix:///var/run/crio/crio.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml index b3463c08f7..dd117b8f3c 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml index 84ca57799c..421ffa2024 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml index b6fe947d09..7bea32789f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml index e75fc3e18b..56da4d0674 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-api-port.yaml index 84efceb9d5..f012b8f744 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-api-port.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /run/containerd/containerd.sock + criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-pod-network-cidr.yaml index d5ef4eb624..398ebc50fc 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-pod-network-cidr.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /run/containerd/containerd.sock + criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd.yaml index e72a72f872..7a76d3c251 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /run/containerd/containerd.sock + criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio-options-gates.yaml index 8e99759756..643e3f65f6 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio-options-gates.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/crio/crio.sock + criSocket: unix:///var/run/crio/crio.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio.yaml index 5ce85a9edc..9b0e9bc68f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/crio/crio.sock + criSocket: unix:///var/run/crio/crio.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/default.yaml index 0a8c6e1754..b0c7d964dd 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/default.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/dns.yaml index 134490b4e4..86ad2570a6 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/dns.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/image-repository.yaml index 7a2d52fb0f..73ddfb53af 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/image-repository.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/options.yaml index 9e49d17d06..9f9ec309f1 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.26/options.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-api-port.yaml index 9c66e8115e..042cefc677 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-api-port.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /run/containerd/containerd.sock + criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-pod-network-cidr.yaml index fa6f78d2f2..1c9e6895bc 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-pod-network-cidr.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /run/containerd/containerd.sock + criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd.yaml index f7b988d9c1..85a483cf62 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /run/containerd/containerd.sock + criSocket: unix:///run/containerd/containerd.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio-options-gates.yaml index 3c314f68ce..887c8e0011 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio-options-gates.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/crio/crio.sock + criSocket: unix:///var/run/crio/crio.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio.yaml index 92cc612d98..40719ae985 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/crio/crio.sock + criSocket: unix:///var/run/crio/crio.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/default.yaml index f4cd34ba35..cd67c01b54 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/default.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/dns.yaml index a527103e44..03d274dec6 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/dns.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/image-repository.yaml index 3ffc93e85c..27b1151379 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/image-repository.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/options.yaml index 57bf6a75df..7c7c5fe292 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.27/options.yaml @@ -11,7 +11,7 @@ bootstrapTokens: - signing - authentication nodeRegistration: - criSocket: /var/run/dockershim.sock + criSocket: unix:///var/run/dockershim.sock name: "mk" kubeletExtraArgs: node-ip: 1.1.1.1