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 testing for Kubernetes v1.31.0 #1483

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+152,939 −9
Open

Add testing for Kubernetes v1.31.0 #1483

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
f660649
Add support for Kubernetes v1.31.0
jvoravong Sep 9, 2024
03a2626
skip journald tests for 1.31
atoulme Oct 1, 2024
f8d6252
add 1.31 histogram expected files
atoulme Oct 2, 2024
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/functional_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
# To check latest Minikube versions, see: https://raw.githubusercontent.com/kubernetes/minikube/master/pkg/minikube/constants/constants_kubernetes_versions.go
# TODO: Automate updating this and expand/contract matrix coverage for other Kubernetes distributions
kubernetes_version:
- v1.31.0 # Support: 28 Aug 2025 - 28 Oct 2025
- v1.30.0 # Support: 28 Apr 2025 - 28 Jun 2025
- v1.29.4 # Support: 28 Dec 2024 - 28 Feb 2025
- v1.28.9 # Support: 28 Aug 2024 - 28 Oct 2024
- v1.27.13 # Support: 28 Apr 2024 - 28 Jun 2024
# Test current +1 out-of-date Kubernetes version to cover EKS's extended support version matrix
- v1.26.15 # Support: 28 Dec 2023 - 28 Feb 2024
- v1.27.13 # Support: 28 Apr 2024 - 28 Jun 2024
container_runtime:
- "docker"
- "containerd"
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/functional_test_v2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,12 @@ jobs:
# The kubernetes_version matrix entries are currently following native Kubernetes version support and +1, see: https://endoflife.date/kubernetes
# To check latest versions, see: https://hub.docker.com/r/kindest/node/tags
k8s-version:
- v1.31.0 # Support: 28 Aug 2025 - 28 Oct 2025
- v1.30.0 # Support: 28 Apr 2025 - 28 Jun 2025
- v1.29.0 # Support: 28 Dec 2024 - 28 Feb 2025
- v1.28.0 # Support: 28 Aug 2024 - 28 Oct 2024
- v1.27.3 # Support: 28 Apr 2024 - 28 Jun 2024
- v1.26.6 # Support: 28 Dec 2023 - 28 Feb 2024
# Test current +1 out-of-date Kubernetes version to cover EKS's extended support version matrix
- v1.25.11 # Support: 27 Aug 2023 - 27 Oct 2023
- v1.27.3 # Support: 28 Apr 2024 - 28 Jun 2024
test-job:
- functional
- histogram
Expand Down
4 changes: 2 additions & 2 deletions functional_tests/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ Run the following commands prior to running the test locally:
```
export KUBECONFIG=/tmp/kube-config-splunk-otel-collector-chart-functional-testing
export KUBE_TEST_ENV=kind
export K8S_VERSION=v1.28.0
export K8S_VERSION=v1.31.0
kind create cluster --kubeconfig=/tmp/kube-config-splunk-otel-collector-chart-functional-testing --config=.github/workflows/configs/kind-config.yaml --image=kindest/node:$K8S_VERSION
kubectl get csr -o=jsonpath='{range.items[?(@.spec.signerName=="kubernetes.io/kubelet-serving")]}{.metadata.name}{" "}{end}' | xargs kubectl certificate approve
make cert-manager
kind load docker-image quay.io/splunko11ytest/nodejs_test:latest --name kind
kind load docker-image quay.io/splunko11ytest/java_test:latest --name kind
kind load docker-image quay.io/splunko11ytest/dotnet_test:latest --name kind
# On Mac M1s, you can also push this image so kind doesn't get confused with the platform to use:
kind load docker-image ghcr.io/signalfx/splunk-otel-dotnet/splunk-otel-dotnet:v1.6.0 --name kind
kind load docker-image ghcr.io/signalfx/splunk-otel-dotnet/splunk-otel-dotnet:v1.7.0 --name kind
kind load docker-image ghcr.io/signalfx/splunk-otel-js/splunk-otel-js:v2.4.4 --name kind
kind load docker-image ghcr.io/signalfx/splunk-otel-java/splunk-otel-java:v1.30.0 --name kind
```
Expand Down
4 changes: 2 additions & 2 deletions functional_tests/functional_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,8 +928,8 @@ func testAgentLogs(t *testing.T) {
assert.Contains(tt, sourcetypes, "sourcetype-anno") // pod-wo-index-w-ns-index has a sourcetype annotation
}, 3*time.Minute, 5*time.Second)

if strings.HasPrefix(os.Getenv("K8S_VERSION"), "v1.30") {
t.Log("Skipping test for journald sourcetypes for cluster version 1.30")
if strings.HasPrefix(os.Getenv("K8S_VERSION"), "v1.30") || strings.HasPrefix(os.Getenv("K8S_VERSION"), "v1.31") {
t.Log("Skipping test for journald sourcetypes for cluster version 1.30 and 1.31")
} else {
t.Run("test journald sourcetypes are set", func(t *testing.T) {
assert.Contains(t, journalDsourceTypes, "kube:journald:containerd.service")
Expand Down
Loading
Loading