Skip to content

Commit

Permalink
Merge pull request #3894 from k0sproject/backport-3853-to-release-1.28
Browse files Browse the repository at this point in the history
[Backport release-1.28] Bump kube-router image to v1.6.0-iptables1.8.9-1
  • Loading branch information
twz123 authored Jan 8, 2024
2 parents 07a8459 + 2b014aa commit 4ddb136
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
17 changes: 17 additions & 0 deletions inttest/basic/basic_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (

certificatesv1 "k8s.io/api/certificates/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"
Expand Down Expand Up @@ -75,6 +76,8 @@ func (s *BasicSuite) TestK0sGetsUp() {
if err != nil {
s.FailNow("failed to obtain Kubernetes client", err)
}
restConfig, err := s.GetKubeConfig(s.ControllerNode(0), "")
s.Require().NoError(err)

err = s.WaitForNodeReady(s.WorkerNode(0), kc)
s.NoError(err)
Expand Down Expand Up @@ -113,6 +116,20 @@ func (s *BasicSuite) TestK0sGetsUp() {
s.Require().NoError(common.VerifyKubeletMetrics(ctx, kc, node))
}

s.T().Log("checking kube-router gobgp functionality")
kubeRouterPods, err := kc.CoreV1().Pods("kube-system").List(ctx, metav1.ListOptions{LabelSelector: "k8s-app=kube-router"})
s.Require().NoError(err)
// Just take the first running pod for execing the gobgp command
for _, pod := range kubeRouterPods.Items {
if pod.Status.Phase == corev1.PodRunning {
out, err := common.PodExecCmdOutput(kc, restConfig, pod.Name, "kube-system", "gobgp global")
s.Require().NoError(err)
// Check that the output contains the default AS number, that's a sign that gobgp is working
s.Assert().Regexp(`AS:\s+64512`, out)
break
}
}

s.verifyContainerdDefaultConfig(ctx)

s.Require().NoError(s.probeCoreDNSAntiAffinity(ctx, kc))
Expand Down
2 changes: 1 addition & 1 deletion pkg/constant/constant_shared.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const (
CalicoNodeImage = "quay.io/k0sproject/calico-node"
KubeControllerImage = "quay.io/k0sproject/calico-kube-controllers"
KubeRouterCNIImage = "quay.io/k0sproject/kube-router"
KubeRouterCNIImageVersion = "v1.6.0-iptables1.8.9-0"
KubeRouterCNIImageVersion = "v1.6.0-iptables1.8.9-1"
KubeRouterCNIInstallerImage = "quay.io/k0sproject/cni-node"
KubeRouterCNIInstallerImageVersion = "1.1.1-k0s.1"
OpenEBSRepository = "https://openebs.github.io/charts"
Expand Down

0 comments on commit 4ddb136

Please sign in to comment.