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

Jump to bottom

Add latest k8s versions in testing #26729

Merged
merged 9 commits into from
Jul 7, 2021
Merged

Add latest k8s versions in testing #26729

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7531423
Add latest k8s versions in testing
ChrsMark Jul 6, 2021
3e993a8
try: norrow down versions
ChrsMark Jul 6, 2021
9c87056
fix proxy port
ChrsMark Jul 6, 2021
f3bcc01
Patch kind config
ChrsMark Jul 7, 2021
ac3aa4c
More fixes
ChrsMark Jul 7, 2021
c8a7144
Add 1.21
ChrsMark Jul 7, 2021
c846bc2
Upgrade kind version
ChrsMark Jul 7, 2021
827ca24
Add latest versions
ChrsMark Jul 7, 2021
5547284
Fix 1.18 version
ChrsMark Jul 7, 2021
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
2 changes: 1 addition & 1 deletion deploy/kubernetes/Jenkinsfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ stages:
make check-no-changes;
stage: lint
k8sTest:
k8sTest: "v1.18.2,v1.17.2,v1.16.4,v1.15.7,v1.14.10"
k8sTest: "v1.20.7,v1.19.11,v1.18.2,v1.17.2,v1.16.4,v1.15.7,v1.14.10"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'd be nice to support 1.21 too 🙂

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kind version required an update to work with 1.21

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can start dropping some of the old versions from the matrix? I would leave the older one we support, but we can consider removing some of the others.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed 1.15 and 1.16

stage: mandatory
6 changes: 5 additions & 1 deletion metricbeat/module/kubernetes/test/integration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func GetKubeProxyConfig(t *testing.T, metricSetName string) map[string]interface
"module": "kubernetes",
"metricsets": []string{metricSetName},
"host": "${NODE_NAME}",
"hosts": []string{"localhost:10252"},
"hosts": []string{"localhost:10249"},
}
}

Expand All @@ -84,4 +84,8 @@ func GetSchedulerConfig(t *testing.T, metricSetName string) map[string]interface
"host": "${NODE_NAME}",
"hosts": []string{"localhost:10251"},
}
//hosts:
// - https://0.0.0.0:10257
//bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
// ssl.verification_mode: "none"
}