Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure compatible versions are used between CP and workers #289

Merged
merged 3 commits into from
Oct 5, 2023
Merged

Ensure compatible versions are used between CP and workers #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea99f78
Ensure compatible versions are used between CP and workers
jnummelin Oct 4, 2023
0aac0c4
Try out a bit beefier runner
jnummelin Oct 4, 2023
3978ed7
Delete only the top-level cluster object, otherwise there's timing is…
jnummelin Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
smoketest:
name: Smoke test
needs: build
runs-on: ubuntu-latest
runs-on: ubuntu-22.04-8core
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
capi-smokes:
name: Cluster API smoke tests
needs: build
runs-on: ubuntu-latest
runs-on: ubuntu-22.04-8core
strategy:
fail-fast: false
matrix:
Expand Down
1 change: 1 addition & 0 deletions inttest/capi-controlplane-docker-downscaling/capi_controlplane_docker_downscaling_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ metadata:
spec:
replicas: 3
k0sConfigSpec:
version: v1.27.1+k0s.0
k0s:
apiVersion: k0s.k0sproject.io/v1beta1
kind: ClusterConfig
Expand Down
4 changes: 3 additions & 1 deletion ...capi-controlplane-docker-tunneling-proxy/capi_controlplane_docker_tunneling_proxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package capicontolplanedockertunneling
import (
"context"
"fmt"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"net/http"
"net/url"
"os"
Expand All @@ -29,6 +28,8 @@ import (
"testing"
"time"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

k0stestutil "github.com/k0sproject/k0s/inttest/common"
"github.com/k0sproject/k0smotron/inttest/util"

Expand Down Expand Up @@ -245,6 +246,7 @@ metadata:
spec:
replicas: 1
k0sConfigSpec:
version: v1.27.1+k0s.0
tunneling:
enabled: true
mode: proxy
Expand Down
1 change: 1 addition & 0 deletions inttest/capi-controlplane-docker-tunneling/capi_controlplane_docker_tunneling_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ metadata:
spec:
replicas: 1
k0sConfigSpec:
version: v1.27.1+k0s.0
tunneling:
enabled: true
k0s:
Expand Down
3 changes: 2 additions & 1 deletion inttest/capi-controlplane-docker-worker/capi_controlplane_docker_worker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func (s *CAPIControlPlaneDockerSuite) applyClusterObjects() {

func (s *CAPIControlPlaneDockerSuite) deleteCluster() {
// Exec via kubectl
out, err := exec.Command("kubectl", "delete", "-f", s.clusterYamlsPath).CombinedOutput()
out, err := exec.Command("kubectl", "delete", "cluster", "docker-test-cluster").CombinedOutput()
s.Require().NoError(err, "failed to delete cluster objects: %s", string(out))
}

Expand Down Expand Up @@ -195,6 +195,7 @@ metadata:
spec:
replicas: 1
k0sConfigSpec:
version: v1.28.2+k0s.0
k0s:
apiVersion: k0s.k0sproject.io/v1beta1
kind: ClusterConfig
Expand Down
1 change: 1 addition & 0 deletions inttest/capi-controlplane-docker/capi_controlplane_docker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ metadata:
spec:
replicas: 3
k0sConfigSpec:
version: v1.27.2+k0s.0
k0s:
apiVersion: k0s.k0sproject.io/v1beta1
kind: ClusterConfig
Expand Down