kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix not prepending unix to CRI socket

pull/16453/head
Steven Powell 2023-05-09 13:47:36 -07:00
parent c2f6fc0b82
commit 3c3f81cc5c
47 changed files with 50 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml
View File

@ -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

2
hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml
View File

@ -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

2
hack/update/kubernetes_version/templates/v1beta3/containerd.yaml
View File

@ -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

2
hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml
View File

@ -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

2
hack/update/kubernetes_version/templates/v1beta3/crio.yaml
View File

@ -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

2
hack/update/kubernetes_version/templates/v1beta3/default.yaml
View File

@ -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

2
hack/update/kubernetes_version/templates/v1beta3/dns.yaml
View File

@ -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

2
hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml
View File

@ -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

2
hack/update/kubernetes_version/templates/v1beta3/options.yaml
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta3.go
View File

@ -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}}

4
pkg/minikube/bootstrapper/bsutil/kubeadm.go
View File

@ -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 {

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-api-port.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd-pod-network-cidr.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.25/containerd.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio-options-gates.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.25/crio.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.25/default.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.25/dns.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.25/image-repository.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.25/options.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-api-port.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd-pod-network-cidr.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.26/containerd.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio-options-gates.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.26/crio.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.26/default.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.26/dns.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.26/image-repository.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.26/options.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-api-port.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd-pod-network-cidr.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.27/containerd.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio-options-gates.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.27/crio.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.27/default.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.27/dns.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.27/image-repository.yaml vendored
View File

@ -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

2
pkg/minikube/bootstrapper/bsutil/testdata/v1.27/options.yaml vendored
View File

@ -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