Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

Update k8s version to v1.24 #2644

Merged
merged 2 commits into from
Jun 15, 2022
Merged

Update k8s version to v1.24 #2644

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9927f80
Update k8s version to v1.24
ChrsMark Jun 14, 2022
e5d1027
Add back removed deps
ChrsMark Jun 15, 2022
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 .ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ pipeline {
string(name: 'STACK_VERSION', defaultValue: '8.4.0-42ce0eef-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.')
string(name: 'HELM_CHART_VERSION', defaultValue: '7.17.3', description: 'SemVer version of Helm chart to be used.')
string(name: 'HELM_VERSION', defaultValue: '3.9.0', description: 'SemVer version of Helm to be used.')
string(name: 'KIND_VERSION', defaultValue: '0.12.0', description: 'SemVer version of Kind to be used.')
string(name: 'KUBERNETES_VERSION', defaultValue: '1.23.4', description: 'SemVer version of Kubernetes to be used.')
string(name: 'KIND_VERSION', defaultValue: '0.14.0', description: 'SemVer version of Kind to be used.')
string(name: 'KUBERNETES_VERSION', defaultValue: '1.24.0', description: 'SemVer version of Kubernetes to be used.')
string(name: 'GITHUB_CHECK_NAME', defaultValue: '', description: 'Name of the GitHub check to be updated. Only if this build is triggered from another parent stream.')
string(name: 'GITHUB_CHECK_REPO', defaultValue: 'elastic-agent', description: 'Name of the GitHub repo to be updated. Only if this build is triggered from another parent stream.')
string(name: 'GITHUB_CHECK_SHA1', defaultValue: '', description: 'Git SHA for the Beats upstream project (branch or PR)')
Expand Down
4 changes: 2 additions & 2 deletions .ci/scripts/install-helm-test-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ HOME=${HOME:?$MSG}

HELM_VERSION="${HELM_VERSION:-"3.9.0"}"
HELM_TAR_GZ_FILE="helm-v${HELM_VERSION}-linux-${GOARCH}.tar.gz"
KIND_VERSION="v${KIND_VERSION:-"0.12.0"}"
KUBERNETES_VERSION="${KUBERNETES_VERSION:-"1.23.4"}"
KIND_VERSION="v${KIND_VERSION:-"0.14.0"}"
KUBERNETES_VERSION="${KUBERNETES_VERSION:-"1.24.0"}"

HELM_CMD="${HOME}/bin/helm"
KBC_CMD="${HOME}/bin/kubectl"
Expand Down
4 changes: 2 additions & 2 deletions .ci/scripts/install-kubernetes-autodiscover-test-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ set -euxo pipefail
MSG="parameter missing."
HOME=${HOME:?$MSG}

KIND_VERSION="v${KIND_VERSION:-"0.12.0"}"
KUBERNETES_VERSION="${KUBERNETES_VERSION:-"1.23.4"}"
KIND_VERSION="v${KIND_VERSION:-"0.14.0"}"
KUBERNETES_VERSION="${KUBERNETES_VERSION:-"1.24.0"}"

KUBECTL_CMD="${HOME}/bin/kubectl"

Expand Down
4 changes: 2 additions & 2 deletions cli/config/kubernetes/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
## Requirements

- docker
- kind (>= 0.12.0)
- kubectl (>= 1.23.4)
- kind (>= 0.14.0)
- kubectl (>= 1.24.0)

## Deployment

Expand Down
4 changes: 2 additions & 2 deletions e2e/_suites/helm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ This is an example of the optional configuration:
# Depending on the versions used,
export HELM_VERSION="3.9.0" # Helm version: for Helm v2.x.x we have to initialise Tiller right after the k8s cluster
export HELM_CHART_VERSION="7.17.3" # version of the Elastic's Observability Helm charts
export KUBERNETES_VERSION="1.23.4" # version of the cluster to be passed to kind
export KUBERNETES_VERSION="1.24.0" # version of the cluster to be passed to kind
```

3. Install dependencies.

- Install Helm 3.9.0
- Install Kind 0.12.0
- Install Kind 0.14.0
- Install Go, using the language version defined in the `.go-version` file at the root directory. We recommend using [GVM](https://github.com/andrewkroh/gvm), same as done in the CI, which will allow you to install multiple versions of Go, setting the Go environment in consequence: `eval "$(gvm 1.15.9)"`
- Godog and other test-related binaries will be installed in their supported versions when the project is first built, thanks to Go modules and Go build system.

Expand Down
4 changes: 1 addition & 3 deletions e2e/_suites/helm/helm_charts_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import (
"testing"
"time"

"github.com/Jeffail/gabs/v2"
Copy link
Contributor

Choose a reason for hiding this comment

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

I think those imports were removed by mistake

Copy link
Member Author

Choose a reason for hiding this comment

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

My bad 😞 it's my editor that removes those for some reason.

"github.com/cenkalti/backoff/v4"
"github.com/elastic/e2e-testing/cli/config"
"github.com/elastic/e2e-testing/internal/common"
"github.com/elastic/e2e-testing/internal/helm"
Expand Down Expand Up @@ -41,7 +39,7 @@ var helmVersion = "3.x"
var helmChartVersion = "7.17.3"

// kubernetesVersion represents the default version used for Kubernetes
var kubernetesVersion = "1.23.4"
var kubernetesVersion = "1.24.0"

var testSuite HelmChartTestSuite

Expand Down
6 changes: 3 additions & 3 deletions e2e/_suites/kubernetes-autodiscover/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,13 @@ This is an example of the optional configuration:
export BEAT_VERSION=7.12.0 # version of beats to use
export ELASTIC_AGENT_VERSION=7.12.0 # version of Elastic Agent to use
export GITHUB_CHECK_SHA1=0123456789 # to select snapshots built by beats-ci
export KUBERNETES_VERSION="1.23.4" # version of the cluster to be passed to kind
export KUBERNETES_VERSION="1.24.0" # version of the cluster to be passed to kind
```

3. Install dependencies.

- Install Kubectl 1.18 or newer
- Install Kind 0.12.0 or newer
- Install Kind 0.14.0 or newer
- Install Go, using the language version defined in the `.go-version` file at the root directory. We recommend using [GVM](https://github.com/andrewkroh/gvm), same as done in the CI, which will allow you to install multiple versions of Go, setting the Go environment in consequence: `eval "$(gvm 1.15.9)"`
- Godog and other test-related binaries will be installed in their supported versions when the project is first built, thanks to Go modules and Go build system.

Expand Down Expand Up @@ -163,7 +163,7 @@ The temporary configuration file is logged by the suite at the info level. If a
cluster is created by the suite, you will see something like this:
```shell
INFO[0000] Kubernetes cluster not available, will start one using kind
INFO[0000] Using kind v0.12.0 go1.15.7 linux/amd64
INFO[0000] Using kind v0.14.0 go1.15.7 linux/amd64
INFO[0046] Kubeconfig in /tmp/test-252418601/kubeconfig
```

Expand Down