Skip to content

Commit 66ef5ba

Browse files
dholtclaude
andcommitted
fix: update config.example and scripts for kubespray v2.30 group names
Follow-up to PR NVIDIA#1336: rename remaining kube-master references to kube_control_plane and k8s-cluster to k8s_cluster in config.example group_vars, example playbook, and helper scripts (debug.sh, deploy_rook.sh). Also update ssh-hardening collection reference (dev-sec.ssh-hardening -> devsec.hardening) in config.example/group_vars/all.yml. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Douglas Holt <dholt@nvidia.com>
1 parent d462d56 commit 66ef5ba

5 files changed

Lines changed: 16 additions & 16 deletions

File tree

config.example/group_vars/all.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ users:
107107

108108
################################################################################
109109
# SSH HARDENING #
110-
# dev-sec.ssh-hardening role called from users playbook #
110+
# devsec.hardening role called from users playbook #
111111
################################################################################
112112

113113
ssh_client_hardening: false
@@ -146,7 +146,7 @@ nvidia_driver_force_install: false
146146
# CONTAINER RUNTIME #
147147
################################################################################
148148
# Docker configuration
149-
# Playbook: docker, nvidia-docker, k8s-cluster
149+
# Playbook: docker, nvidia-docker, k8s_cluster
150150
#
151151
# For supported Docker versions, see: submodules/kubespray/roles/container-engine/docker/vars/*
152152
docker_install: yes

config.example/group_vars/k8s_cluster.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ hosts_add_ansible_managed_hosts_groups: ["k8s_cluster"]
5151
k8s_nfs_client_provisioner: true
5252
k8s_deploy_nfs_server: true
5353
k8s_nfs_mkdir: true # Set to false if an export dir is already configured with proper permissions
54-
k8s_nfs_server: '{{ groups["kube-master"][0] }}'
54+
k8s_nfs_server: '{{ groups["kube_control_plane"][0] }}'
5555
k8s_nfs_export_path: '/export/deepops_nfs'
5656

5757
# NFS Server
@@ -65,9 +65,9 @@ nfs_exports:
6565
# Container registry #
6666
################################################################################
6767
kube_enable_container_registry: false
68-
docker_insecure_registries: "{{ groups['kube-master']|map('regex_replace', '^(.*)$', '\\1:5000')|list + ['registry.local:31500']}}"
69-
crio_insecure_registries: "{{ groups['kube-master']|map('regex_replace', '^(.*)$', '\\1:5000')|list + ['registry.local:31500']}}"
70-
docker_registry_mirrors: "{{ groups['kube-master'] | map('regex_replace', '^(.*)$', 'http://\\1:5000') | list }}"
68+
docker_insecure_registries: "{{ groups['kube_control_plane']|map('regex_replace', '^(.*)$', '\\1:5000')|list + ['registry.local:31500']}}"
69+
crio_insecure_registries: "{{ groups['kube_control_plane']|map('regex_replace', '^(.*)$', '\\1:5000')|list + ['registry.local:31500']}}"
70+
docker_registry_mirrors: "{{ groups['kube_control_plane'] | map('regex_replace', '^(.*)$', 'http://\\1:5000') | list }}"
7171

7272
# TODO: The presence of an insecure local containerd registry in K8s v1.24+ seems to be causing an issue, add support for this back when the issue is fixed
7373
# BUG: https://github.com/kubernetes-sigs/kubespray/issues/9956
@@ -89,6 +89,6 @@ image_command_tool: "crictl"
8989
################################################################################
9090
kube_enable_rsyslog_server: true
9191
kube_enable_rsyslog_client: true
92-
rsyslog_server_hostname: "{{ groups['kube-master'][0] }}"
92+
rsyslog_server_hostname: "{{ groups['kube_control_plane'][0] }}"
9393
rsyslog_client_tcp_host: "{{ rsyslog_server_hostname }}"
94-
rsyslog_client_group: "k8s-cluster"
94+
rsyslog_client_group: "k8s_cluster"

config.example/playbooks/example.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# documentation:
1111
# https://docs.ansible.com/ansible/latest/user_guide/playbooks.html
1212

13-
- hosts: kube-node
13+
- hosts: kube_node
1414
become: yes
1515
tasks:
1616
- name: install cowsay

scripts/k8s/debug.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Ideally this is run out of the DeepOps repo used to deploy the cluster
66
# However, this script will also work best-effort for any K8s cluster, DeepOps or otherwise
77
# Requirements for this script are a working "kubectl" and ideally a working "helm"
8-
# Optionally, a working "ansible" with a config/inventory file that has kubernetes node defined in a kube-node group
8+
# Optionally, a working "ansible" with a config/inventory file that has kubernetes node defined in a kube_node group
99

1010
# Source common libraries and env variables
1111
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
@@ -25,12 +25,12 @@ git log --pretty=oneline | head -n 20 > ${logdir}/git-log.log
2525
ansible --version
2626

2727
# GPU configuration
28-
ansible kube-node -ba "nvidia-smi" -vv > ${logdir}/nvidia-smi.log
29-
ansible kube-node -ba "cat /etc/nvidia/gridd.conf" -vv > ${logdir}/vgpu-gridd.conf.log
28+
ansible kube_node -ba "nvidia-smi" -vv > ${logdir}/nvidia-smi.log
29+
ansible kube_node -ba "cat /etc/nvidia/gridd.conf" -vv > ${logdir}/vgpu-gridd.conf.log
3030

3131
# Docker configuration
32-
ansible kube-node -ba "docker info" -vv > ${logdir}/docker-info.log
33-
ansible kube-node -ba "cat /etc/docker/daemon.json" -vv > ${logdir}/docker-daemon.log
32+
ansible kube_node -ba "docker info" -vv > ${logdir}/docker-info.log
33+
ansible kube_node -ba "cat /etc/docker/daemon.json" -vv > ${logdir}/docker-daemon.log
3434

3535
# Kubectl (Generic for any Kubernetes cluster)
3636
kubectl version
@@ -70,7 +70,7 @@ helm list -aA > ${logdir}/helm-list.log
7070

7171
# DCGM example output / metrics
7272
# Collect metrics from all nodes for debug
73-
ansible kube-node -vv -bm raw -a "curl http://127.0.0.1:9400/metrics" > ${logdir}/dcgm-metrics.log
73+
ansible kube_node -vv -bm raw -a "curl http://127.0.0.1:9400/metrics" > ${logdir}/dcgm-metrics.log
7474

7575
# Packaging
7676
name="config/k8s-debug-${timestamp}.tgz"

scripts/k8s/deploy_rook.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function delete_rook() {
7272
kubectl -n rook-ceph delete storageclass rook-ceph-block
7373
kubectl delete ns rook-ceph-system
7474
kubectl delete ns rook-ceph
75-
ansible k8s-cluster -b -m file -a "path=/var/lib/rook state=absent"
75+
ansible k8s_cluster -b -m file -a "path=/var/lib/rook state=absent"
7676
}
7777

7878

0 commit comments

Comments
 (0)