Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: kube-vip was not rendering when enabled #1169

Merged
merged 2 commits into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ k3s_registration_address: "{{ kube_api_addr }}"
k3s_server_manifests_templates:
- custom-cilium-helmchart.yaml.j2
- custom-coredns-helmchart.yaml.j2
#% if bootstrap_nodes.master | length > 1 and not bootstrap_kube_api_addr %#
#% if bootstrap_nodes.master | length > 1 or bootstrap_kube_api_addr %#
# /var/lib/rancher/k3s/server/manifests
k3s_server_manifests_urls:
- url: https://raw.githubusercontent.com/kube-vip/website/main/content/manifests/rbac.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
timezone: "#{ bootstrap_timezone }#"
github_username: "#{ bootstrap_github_username }#"
coredns_addr: "#{ bootstrap_service_cidr.split(',')[0] | nthhost(10) }#"
#% if bootstrap_nodes.master | length == 1 and not bootstrap_kube_api_addr %#
kube_api_addr: "#{ bootstrap_nodes.master[0].address }#"
#% else %#
#% if bootstrap_nodes.master | length > 1 or bootstrap_kube_api_addr %#
kube_api_addr: "#{ bootstrap_kube_api_addr }#"
#% else %#
kube_api_addr: "#{ bootstrap_nodes.master[0].address }#"
#% endif %#
cluster_cidr: "#{ bootstrap_cluster_cidr.split(',')[0] }#"
service_cidr: "#{ bootstrap_service_cidr.split(',')[0] }#"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#% if bootstrap_distribution == 'k3s' and bootstrap_nodes.master | length > 1 and not bootstrap_kube_api_addr %#
#% if bootstrap_distribution == 'k3s' and (bootstrap_nodes.master | length > 1 or bootstrap_kube_api_addr) %#
---
apiVersion: v1
kind: Pod
Expand Down
6 changes: 3 additions & 3 deletions bootstrap/templates/k0s-config.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ spec:
api:
sans:
- "#{ bootstrap_kube_api_addr }#"
#% if bootstrap_kubeapi_hostname is defined %#
- "#{ bootstrap_kubeapi_hostname }#"
#% if bootstrap_kube_api_hostname is defined %#
- "#{ bootstrap_kube_api_hostname }#"
#% endif %#
#% for item in bootstrap_nodes.master %#
#% if item.address != bootstrap_kube_api_addr %#
- "#{ item.address }#"
#% endif %#
#% if (bootstrap_kubeapi_hostname is not defined) or (item.name != bootstrap_kubeapi_hostname) %#
#% if (bootstrap_kube_api_hostname is not defined) or (item.name != bootstrap_kube_api_hostname) %#
- "#{ item.name }#"
#% endif %#
#% endfor %#
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/vars/config.sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ bootstrap_node_cidr:
bootstrap_kube_api_addr:
# The hostname of the Kube API, set this if you intend to call the Kube API by hostname rather than IP
# (Optional) This is currently only utilized in k0s and is added to the Kube API cert sans
# bootstrap_kubeapi_hostname:
# bootstrap_kube_api_hostname:
# The Load balancer IP for k8s_gateway, choose an available IP in your nodes network that is not being used
bootstrap_k8s_gateway_addr:
# The Load balancer IP for external ingress, choose an available IP in your nodes network that is not being used
Expand Down
Loading