From 7ac920b076516ddbca4ef56e4dd806507793964f Mon Sep 17 00:00:00 2001 From: Phillip Schichtel Date: Tue, 16 Apr 2024 20:54:28 +0200 Subject: [PATCH] Add an integration test for spec.api.bindAddress Signed-off-by: Phillip Schichtel --- inttest/Makefile.variables | 1 + inttest/bind-address/bind_address_test.go | 179 ++++++++++++++++++++++ pkg/apis/k0s/v1beta1/api.go | 3 + 3 files changed, 183 insertions(+) create mode 100644 inttest/bind-address/bind_address_test.go diff --git a/inttest/Makefile.variables b/inttest/Makefile.variables index 257ad0e8718a..6e2d547c5ef2 100644 --- a/inttest/Makefile.variables +++ b/inttest/Makefile.variables @@ -15,6 +15,7 @@ smoketests := \ check-ap-updater-periodic \ check-backup \ check-basic \ + check-bind-address \ check-byocri \ check-calico \ check-capitalhostnames \ diff --git a/inttest/bind-address/bind_address_test.go b/inttest/bind-address/bind_address_test.go new file mode 100644 index 000000000000..dbf9bc781f00 --- /dev/null +++ b/inttest/bind-address/bind_address_test.go @@ -0,0 +1,179 @@ +/* +Copyright 2024 k0s authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package bind_address + +import ( + "context" + "encoding/json" + "fmt" + "testing" + "time" + + "github.com/k0sproject/k0s/inttest/common" + "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/kubernetes" + kubeletv1beta1 "k8s.io/kubelet/config/v1beta1" + + testifysuite "github.com/stretchr/testify/suite" + "golang.org/x/sync/errgroup" + "sigs.k8s.io/yaml" +) + +const kubeSystem = "kube-system" + +type suite struct { + common.BootlooseSuite +} + +func (s *suite) TestCustomizedBindAddress() { + const controllerArgs = "--kube-controller-manager-extra-args='--node-monitor-period=3s --node-monitor-grace-period=9s'" + + ctx := s.Context() + + { + for i := 0; i < s.ControllerCount; i++ { + config, err := yaml.Marshal(&v1beta1.ClusterConfig{ + Spec: &v1beta1.ClusterSpec{ + API: func() *v1beta1.APISpec { + apiSpec := v1beta1.DefaultAPISpec() + apiSpec.Address = s.GetIPAddress(s.ControllerNode(i)) + return apiSpec + }(), + WorkerProfiles: v1beta1.WorkerProfiles{ + v1beta1.WorkerProfile{ + Name: "default", + Config: func() *runtime.RawExtension { + kubeletConfig := kubeletv1beta1.KubeletConfiguration{ + NodeStatusUpdateFrequency: metav1.Duration{Duration: 3 * time.Second}, + } + bytes, err := json.Marshal(kubeletConfig) + s.Require().NoError(err) + return &runtime.RawExtension{Raw: bytes} + }(), + }, + }, + }, + }) + s.Require().NoError(err) + s.WriteFileContent(s.ControllerNode(i), "/tmp/k0s.yaml", config) + } + } + + s.Run("controller_and_workers_get_up", func() { + s.Require().NoError(s.InitController(0, "--config=/tmp/k0s.yaml", controllerArgs)) + + s.T().Logf("Starting workers and waiting for cluster to become ready") + + token, err := s.GetJoinToken("worker") + s.Require().NoError(err) + s.Require().NoError(s.RunWorkersWithToken(token)) + + clients, err := s.KubeClient(s.ControllerNode(0)) + s.Require().NoError(err) + + eg, _ := errgroup.WithContext(ctx) + for i := 0; i < s.WorkerCount; i++ { + nodeName := s.WorkerNode(i) + eg.Go(func() error { + if err := s.WaitForNodeReady(nodeName, clients); err != nil { + return fmt.Errorf("Node %s is not ready: %w", nodeName, err) + } + return nil + }) + } + s.Require().NoError(eg.Wait()) + + s.Require().NoError(s.checkClusterReadiness(ctx, clients, 1)) + }) + + s.Run("join_new_controllers", func() { + token, err := s.GetJoinToken("controller") + s.Require().NoError(err) + + eg, _ := errgroup.WithContext(ctx) + eg.Go(func() error { return s.InitController(1, "--config=/tmp/k0s.yaml", controllerArgs, token) }) + eg.Go(func() error { return s.InitController(2, "--config=/tmp/k0s.yaml", controllerArgs, token) }) + + s.Require().NoError(eg.Wait()) + + clients, err := s.KubeClient(s.ControllerNode(1)) + s.Require().NoError(err) + + s.T().Logf("Checking if HA cluster is ready") + s.Require().NoError(s.checkClusterReadiness(ctx, clients, s.ControllerCount)) + }) +} + +func (s *suite) checkClusterReadiness(ctx context.Context, clients *kubernetes.Clientset, numControllers int, degradedControllers ...string) error { + eg, ctx := errgroup.WithContext(ctx) + + eg.Go(func() error { + if err := common.WaitForKubeRouterReady(ctx, clients); err != nil { + return fmt.Errorf("kube-router did not start: %w", err) + } + s.T().Logf("kube-router is ready") + return nil + }) + + for _, lease := range []string{"kube-scheduler", "kube-controller-manager"} { + lease := lease + eg.Go(func() error { + id, err := common.WaitForLease(ctx, clients, lease, kubeSystem) + if err != nil { + return fmt.Errorf("%s has no leader: %w", lease, err) + } + s.T().Logf("%s has a leader: %q", lease, id) + return nil + }) + } + + for _, daemonSet := range []string{"kube-proxy", "konnectivity-agent"} { + daemonSet := daemonSet + eg.Go(func() error { + if err := common.WaitForDaemonSet(ctx, clients, daemonSet, "kube-system"); err != nil { + return fmt.Errorf("%s is not ready: %w", daemonSet, err) + } + s.T().Log(daemonSet, "is ready") + return nil + }) + } + + for _, deployment := range []string{"coredns", "metrics-server"} { + deployment := deployment + eg.Go(func() error { + if err := common.WaitForDeployment(ctx, clients, deployment, "kube-system"); err != nil { + return fmt.Errorf("%s did not become ready: %w", deployment, err) + } + s.T().Log(deployment, "is ready") + return nil + }) + } + + return eg.Wait() +} + +func TestCustomizedBindAddressSuite(t *testing.T) { + s := suite{ + common.BootlooseSuite{ + ControllerCount: 3, + WorkerCount: 2, + }, + } + testifysuite.Run(t, &s) +} diff --git a/pkg/apis/k0s/v1beta1/api.go b/pkg/apis/k0s/v1beta1/api.go index 55a7b409023c..32822d4fe3dd 100644 --- a/pkg/apis/k0s/v1beta1/api.go +++ b/pkg/apis/k0s/v1beta1/api.go @@ -97,6 +97,9 @@ func (a *APISpec) K0sControlPlaneAPIAddress() string { func (a *APISpec) getExternalURIForPort(port int) string { addr := a.Address + if a.BindAddress != "" { + addr = a.BindAddress + } if a.ExternalAddress != "" { addr = a.ExternalAddress }