Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
b4dd8b43
Unverified
Commit
b4dd8b43
authored
1 year ago
by
Max Gautier
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Hopefully final batches of ipaddr deprecation cleanup (#10822)
parent
4fc1fc72
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
+3
-3
3 additions, 3 deletions
inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
playbooks/ansible_version.yml
+1
-1
1 addition, 1 deletion
playbooks/ansible_version.yml
with
4 additions
and
4 deletions
inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
+
3
−
3
View file @
b4dd8b43
...
...
@@ -117,7 +117,7 @@ kube_pods_subnet_ipv6: fd85:ee78:d8a6:8607::1:0000/112
kube_network_node_prefix_ipv6
:
120
# The port the API Server will be listening on.
kube_apiserver_ip
:
"
{{
kube_service_addresses
|
ipaddr('net')
|
ipaddr(1)
|
ipaddr('address')
}}"
kube_apiserver_ip
:
"
{{
kube_service_addresses
|
ansible.utils.
ipaddr('net')
|
ansible.utils.ipaddr(1)
|
ansible.utils.
ipaddr('address')
}}"
kube_apiserver_port
:
6443
# (https)
# Kube-proxy proxyMode configuration.
...
...
@@ -219,8 +219,8 @@ resolvconf_mode: host_resolvconf
# Deploy netchecker app to verify DNS resolve as an HTTP service
deploy_netchecker
:
false
# Ip address of the kubernetes skydns service
skydns_server
:
"
{{
kube_service_addresses
|
ipaddr('net')
|
ipaddr(3)
|
ipaddr('address')
}}"
skydns_server_secondary
:
"
{{
kube_service_addresses
|
ipaddr('net')
|
ipaddr(4)
|
ipaddr('address')
}}"
skydns_server
:
"
{{
kube_service_addresses
|
ansible.utils.
ipaddr('net')
|
ansible.utils.ipaddr(3)
|
ansible.utils.
ipaddr('address')
}}"
skydns_server_secondary
:
"
{{
kube_service_addresses
|
ansible.utils.
ipaddr('net')
|
ansible.utils.ipaddr(4)
|
ansible.utils.
ipaddr('address')
}}"
dns_domain
:
"
{{
cluster_name
}}"
## Container runtime
...
...
This diff is collapsed.
Click to expand it.
playbooks/ansible_version.yml
+
1
−
1
View file @
b4dd8b43
...
...
@@ -21,7 +21,7 @@
-
name
:
"
Check
that
python
netaddr
is
installed"
assert
:
msg
:
"
Python
netaddr
is
not
present"
that
:
"
'127.0.0.1'
|
ipaddr"
that
:
"
'127.0.0.1'
|
ansible.utils.
ipaddr"
tags
:
-
check
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment