Skip to content

Commit

Permalink
feedback updates
Browse files Browse the repository at this point in the history
  • Loading branch information
dbw7 committed Oct 21, 2024
1 parent 7582178 commit 86843c2
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

## General

* Added support for IPV6 addresses in the Kubernetes 'apiVIP' field
* Added support for IPv6 addresses in the Kubernetes 'apiVIP' field

## API

Expand Down
2 changes: 1 addition & 1 deletion docs/building-images.md
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ kubernetes:
* `network` - Required for multi-node clusters, optional for single-node clusters; Defines the network configuration
for bootstrapping a cluster.
* `apiVIP` - Required for multi-node clusters, optional for single-node clusters; Specifies the IP address which
will serve as the cluster LoadBalancer, backed by MetalLB. Supports IPV4 and IPV6 addresses.
will serve as the cluster LoadBalancer, backed by MetalLB. Supports IPv4 and IPv6 addresses.
* `apiHost` - Optional; Specifies the domain address for accessing the cluster.
* `nodes` - Required for multi-node clusters; Defines a list of all nodes that form the cluster.
* `hostname` - Required; Indicates the fully qualified domain name (FQDN) to identify the particular node on which
Expand Down
2 changes: 1 addition & 1 deletion pkg/combustion/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ func (c *Combustion) downloadRKE2Artefacts(ctx *image.Context, cluster *kubernet
func kubernetesVIPManifest(k *image.Kubernetes) (string, error) {
ip, err := netip.ParseAddr(k.Network.APIVIP)
if err != nil {
return "", fmt.Errorf("parsing kubernetes APIVIP address: %w", err)
return "", fmt.Errorf("parsing kubernetes apiVIP address: %w", err)
}

manifest := struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/combustion/kubernetes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -862,5 +862,5 @@ func TestKubernetesVIPManifestInvalidIP(t *testing.T) {
}

_, err := kubernetesVIPManifest(k8s)
require.ErrorContains(t, err, "parsing kubernetes APIVIP address: ParseAddr(\"1111\"): unable to parse IP")
require.ErrorContains(t, err, "parsing kubernetes apiVIP address: ParseAddr(\"1111\"): unable to parse IP")
}
2 changes: 1 addition & 1 deletion pkg/kubernetes/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func NewCluster(kubernetes *image.Kubernetes, configPath string) (*Cluster, erro

ip, err := netip.ParseAddr(kubernetes.Network.APIVIP)
if err != nil {
return nil, fmt.Errorf("parsing kubernetes APIVIP address: %w", err)
return nil, fmt.Errorf("parsing kubernetes apiVIP address: %w", err)
}

setMultiNodeConfigDefaults(kubernetes, serverConfig, &ip)
Expand Down

0 comments on commit 86843c2

Please sign in to comment.