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.

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

Add kubernetes v1.26/v1.27 support and CI tests #781

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 5 additions & 6 deletions .github/workflows/functests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
kube-version: ['v1.18.20', 'v1.19.16', 'v1.20.15', 'v1.21.14', 'v1.22.16', 'v1.23.14', 'v1.24.8', 'v1.25.4']
kube-version: ['v1.18.20', 'v1.19.16', 'v1.20.15', 'v1.21.14', 'v1.22.17', 'v1.23.17', 'v1.24.14', 'v1.25.10', 'v1.26.5', 'v1.27.2']
os: [ubuntu-20.04, ubuntu-22.04]
exclude:
- os: ubuntu-22.04
Expand Down Expand Up @@ -58,11 +58,10 @@ jobs:
docker build --quiet -t example.org/test/sleep:v0.0.1 -f functests/Dockerfile.sleep functests

- name: Setup Minikube
uses: manusa/actions-setup-minikube@v2.7.2
uses: medyagh/setup-minikube@latest
with:
minikube version: 'v1.28.0'
kubernetes version: ${{ matrix.kube-version }}
github token: ${{ secrets.GITHUB_TOKEN }}
driver: none
kubernetes-version: ${{ matrix.kube-version }}

- name: Check Minikube
run: |
Expand All @@ -81,7 +80,7 @@ jobs:
functests/run-migration-tests.sh "v3.2.2"

- name: Run migration tests with DirectCSI v2.0.9
if: contains(fromJson('["v1.18.20", "v1.19.16", "v1.20.15", "v1.21.14", "v1.22.16"]'), matrix.kube-version)
if: contains(fromJson('["v1.18.20", "v1.19.16", "v1.20.15", "v1.21.14", "v1.22.17"]'), matrix.kube-version)
run: |
sudo rm -fr /var/lib/directpv /var/lib/direct-csi
functests/run-migration-tests.sh "v2.0.9"
2 changes: 1 addition & 1 deletion cmd/kubectl-directpv/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var (
imagePullSecrets = []string{}
nodeSelector map[string]string
tolerations []corev1.Toleration
k8sVersion = "1.25.0"
k8sVersion = "1.27.0"
kubeVersion *version.Version
legacyFlag bool
)
Expand Down
2 changes: 1 addition & 1 deletion docs/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ FLAGS:
--apparmor-profile string Set path to Apparmor profile
--seccomp-profile string Set path to Seccomp profile
-o, --output string Generate installation manifest. One of: yaml|json
--kube-version string Select the kubernetes version for manifest generation (default "1.25.0")
--kube-version string Select the kubernetes version for manifest generation (default "1.27.0")
--legacy Enable legacy mode (Used with '-o')
-h, --help help for install

Expand Down
4 changes: 2 additions & 2 deletions pkg/installer/installer.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func Install(ctx context.Context, args *Args) (err error) {
case args.dryRun():
if args.KubeVersion == nil {
// default higher version
if args.KubeVersion, err = version.ParseSemantic("1.25.0"); err != nil {
if args.KubeVersion, err = version.ParseSemantic("1.27.0"); err != nil {
klog.Fatalf("this should not happen; %v", err)
}
}
Expand All @@ -112,7 +112,7 @@ func Install(ctx context.Context, args *Args) (err error) {

if args.KubeVersion.Major() != 1 ||
args.KubeVersion.Minor() < 18 ||
args.KubeVersion.Minor() > 25 {
args.KubeVersion.Minor() > 27 {
if !args.dryRun() {
utils.Eprintf(
args.Quiet,
Expand Down