mirror of
https://github.com/edgelesssys/constellation.git
synced 2025-10-01 13:18:40 -04:00
join: make Azure instance names k8s compliant (#807)
join: make Azure instance names k8s compliant
This commit is contained in:
parent
edd51cb137
commit
d1195d1d5f
4 changed files with 133 additions and 23 deletions
|
@ -10,6 +10,8 @@ import (
|
|||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/edgelesssys/constellation/v2/internal/constants"
|
||||
|
@ -85,7 +87,14 @@ func (c *Client) CreateConfigMap(ctx context.Context, configMap corev1.ConfigMap
|
|||
func (c *Client) AddNodeToJoiningNodes(ctx context.Context, nodeName string, componentsHash string, isControlPlane bool) error {
|
||||
joiningNode := &unstructured.Unstructured{}
|
||||
|
||||
objectMetadataName := nodeName
|
||||
compliantNodeName, err := k8sCompliantHostname(nodeName)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get k8s compliant hostname: %w", err)
|
||||
}
|
||||
|
||||
// JoiningNodes referencing a worker node are named after the worker node.
|
||||
// JoiningNodes referencing the control-plane node are named "control-plane".
|
||||
objectMetadataName := compliantNodeName
|
||||
deadline := metav1.NewTime(time.Now().Add(48 * time.Hour))
|
||||
if isControlPlane {
|
||||
objectMetadataName = "control-plane"
|
||||
|
@ -99,7 +108,7 @@ func (c *Client) AddNodeToJoiningNodes(ctx context.Context, nodeName string, com
|
|||
"name": objectMetadataName,
|
||||
},
|
||||
"spec": map[string]any{
|
||||
"name": nodeName,
|
||||
"name": compliantNodeName,
|
||||
"componentshash": componentsHash,
|
||||
"iscontrolplane": isControlPlane,
|
||||
"deadline": deadline,
|
||||
|
@ -142,3 +151,16 @@ func (c *Client) AddReferenceToK8sVersionConfigMap(ctx context.Context, k8sVersi
|
|||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
var validHostnameRegex = regexp.MustCompile(`^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$`)
|
||||
|
||||
// k8sCompliantHostname transforms a hostname to an RFC 1123 compliant, lowercase subdomain as required by Kubernetes node names.
|
||||
// Only a simple heuristic is used for now (to lowercase, replace underscores).
|
||||
func k8sCompliantHostname(in string) (string, error) {
|
||||
hostname := strings.ToLower(in)
|
||||
hostname = strings.ReplaceAll(hostname, "_", "-")
|
||||
if !validHostnameRegex.MatchString(hostname) {
|
||||
return "", fmt.Errorf("failed to generate a Kubernetes compliant hostname for %s", in)
|
||||
}
|
||||
return hostname, nil
|
||||
}
|
||||
|
|
63
joinservice/internal/kubernetes/kubernetes_test.go
Normal file
63
joinservice/internal/kubernetes/kubernetes_test.go
Normal file
|
@ -0,0 +1,63 @@
|
|||
/*
|
||||
Copyright (c) Edgeless Systems GmbH
|
||||
|
||||
SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
||||
package kubernetes
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"go.uber.org/goleak"
|
||||
)
|
||||
|
||||
func TestMain(m *testing.M) {
|
||||
goleak.VerifyTestMain(m)
|
||||
}
|
||||
|
||||
func TestK8sCompliantHostname(t *testing.T) {
|
||||
testCases := map[string]struct {
|
||||
input string
|
||||
expected string
|
||||
wantErr bool
|
||||
}{
|
||||
"no change": {
|
||||
input: "test",
|
||||
expected: "test",
|
||||
},
|
||||
"uppercase": {
|
||||
input: "TEST",
|
||||
expected: "test",
|
||||
},
|
||||
"underscore": {
|
||||
input: "test_node",
|
||||
expected: "test-node",
|
||||
},
|
||||
"empty": {
|
||||
input: "",
|
||||
expected: "",
|
||||
wantErr: true,
|
||||
},
|
||||
"error": {
|
||||
input: "test_node_",
|
||||
expected: "",
|
||||
wantErr: true,
|
||||
},
|
||||
}
|
||||
|
||||
for name, tc := range testCases {
|
||||
t.Run(name, func(t *testing.T) {
|
||||
assert := assert.New(t)
|
||||
|
||||
actual, err := k8sCompliantHostname(tc.input)
|
||||
if tc.wantErr {
|
||||
assert.Error(err)
|
||||
return
|
||||
}
|
||||
assert.NoError(err)
|
||||
assert.Equal(tc.expected, actual)
|
||||
})
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue