15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-25 17:12:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: change default criSocket to docker (#2517) 

Signed-off-by: joyceliu <joyceliu@yunify.com>
Co-authored-by: joyceliu <joyceliu@yunify.com>
This commit is contained in:
liujian 2025-03-28 15:40:08 +08:00 committed by GitHub
parent e40c57fb9f
commit e5b4505485
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/capkk/release/cluster-template.yaml
View File

@ -45,10 +45,10 @@ spec:
kubeadmConfigSpec:
initConfiguration:
nodeRegistration:
criSocket: ${CRI_SOCKET=unix:///var/run/containerd/containerd.sock}
criSocket: ${CRI_SOCKET=unix:///run/containerd/containerd.sock}
joinConfiguration:
nodeRegistration:
criSocket: ${CRI_SOCKET=unix:///var/run/containerd/containerd.sock}
criSocket: ${CRI_SOCKET=unix:///run/containerd/containerd.sock}
---
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: KKMachineTemplate
@ -104,4 +104,4 @@ spec:
spec:
joinConfiguration:
nodeRegistration:
criSocket: ${CRI_SOCKET=unix:///var/run/containerd/containerd.sock}
criSocket: ${CRI_SOCKET=unix:///run/containerd/containerd.sock}

3
pkg/controllers/infrastructure/inventory_controller.go
View File

@ -262,7 +262,8 @@ func (r *InventoryReconciler) reconcileNormal(ctx context.Context, scope *cluste
func (r *InventoryReconciler) reconcileInventoryPlaybook(ctx context.Context, scope *clusterScope) error {
// get playbook from inventory
if scope.Inventory.Annotations[kkcorev1.HostCheckPlaybookAnnotation] == "" {
return nil
// cannot find playbook. should create it
return r.createHostCheckPlaybook(ctx, scope)
}
playbook := &kkcorev1.Playbook{}
if err := r.Client.Get(ctx, ctrlclient.ObjectKey{Name: scope.Inventory.Annotations[kkcorev1.HostCheckPlaybookAnnotation], Namespace: scope.Namespace}, playbook); err != nil {