Skip to content

Commit

Permalink
Fix reference to dnsNameservers and move to internalNetwork
Browse files Browse the repository at this point in the history
Move dnsNameservers from .Values.clusterNetworking to
.Values.clusterNetworking.internalNetwork to better reflect where
it is used within OpenStackCluster now.

Backwards compatibility with the former values location is kept and
a bug fixed to correctly reference this. This use is now deprecated
and may be removed in a future chart release.

Closes: #476
  • Loading branch information
dalees committed Feb 10, 2025
1 parent 7c6e822 commit 0d45740
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion charts/openstack-cluster/templates/cluster-openstack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
{{- else }}
managedSubnets:
- cidr: {{ .nodeCidr }}
{{- with .dnsNameservers }}
{{- with (default $.Values.clusterNetworking.dnsNameservers .dnsNameservers) }}
dnsNameservers: {{ toYaml . | nindent 8 }}
{{- end }}
{{- end }}
Expand Down
6 changes: 5 additions & 1 deletion charts/openstack-cluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ kubeNetwork:
# Settings for the OpenStack networking for the cluster
clusterNetworking:
# Custom nameservers to use for the hosts
dnsNameservers:
# Deprecated; use `clusterNetworking.internalNetwork.dnsNameservers` instead.
# dnsNameservers: []
# Indicates if security groups should be managed by the cluster
manageSecurityGroups: true
# Indicates if the managed security groups should allow all in-cluster traffic
Expand All @@ -97,6 +98,9 @@ clusterNetworking:
# The CIDR to use if creating a cluster network
# This is only used if neither of networkFilter and subnetFilter are given
nodeCidr: 192.168.3.0/24
# List of nameserver IPs to use when creating a cluster network.
# This is only used if neither of networkFilter and subnetFilter are given
dnsNameservers:

# Settings for registry mirrors
# When a mirror is set, it will be tried for images but will fall back to the
Expand Down

0 comments on commit 0d45740

Please sign in to comment.