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

[1.2] Adjust init container script for Elastic License 2.0 (#4191) #4202

Merged
merged 3 commits into from
Feb 5, 2021
Merged

[1.2] Adjust init container script for Elastic License 2.0 (#4191) #4202

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
918007f
Adjust init container script for Elastic License 2.0 (#4191)
pebrc Feb 5, 2021
df088fe
Update NOTICE
pebrc Feb 5, 2021
bf3bfb8
Set 1.15 as the default version on GKE (#3660)
barkbay Aug 25, 2020
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
10 changes: 5 additions & 5 deletions .ci/pipelines/e2e-tests-gke-k8s-versions.Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,25 +35,25 @@ pipeline {
}
stage('Run tests for different k8s versions in GKE') {
parallel {
stage("1.14") {
stage("1.15") {
agent {
label 'linux'
}
steps {
unstash "source"
script {
runWith(lib, failedTests, '1.14', "eck-gke14-${BUILD_NUMBER}-e2e")
runWith(lib, failedTests, '1.15', "eck-gke15-${BUILD_NUMBER}-e2e")
}
}
}
stage("1.15") {
stage("1.16") {
agent {
label 'linux'
}
steps {
unstash "source"
script {
runWith(lib, failedTests, '1.15', "eck-gke15-${BUILD_NUMBER}-e2e")
runWith(lib, failedTests, '1.16', "eck-gke16-${BUILD_NUMBER}-e2e")
}
}
}
Expand Down Expand Up @@ -82,7 +82,7 @@ pipeline {
}
cleanup {
script {
clusters = ["eck-gke14-${BUILD_NUMBER}-e2e", "eck-gke15-${BUILD_NUMBER}-e2e"]
clusters = ["eck-gke15-${BUILD_NUMBER}-e2e", "eck-gke16-${BUILD_NUMBER}-e2e"]
for (int i = 0; i < clusters.size(); i++) {
build job: 'cloud-on-k8s-e2e-cleanup',
parameters: [string(name: 'JKS_PARAM_GKE_CLUSTER', value: clusters[i])],
Expand Down
2 changes: 1 addition & 1 deletion NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2018-2020 Elasticsearch BV
Copyright 2018-2021 Elasticsearch BV

This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).
Expand Down
4 changes: 2 additions & 2 deletions hack/deployer/config/plans.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plans:
operation: create
clusterName: ci
provider: gke
kubernetesVersion: 1.14
kubernetesVersion: 1.15
machineType: n1-standard-8
serviceAccount: true
psp: true
Expand All @@ -19,7 +19,7 @@ plans:
operation: create
clusterName: dev
provider: gke
kubernetesVersion: 1.14
kubernetesVersion: 1.15
machineType: n1-standard-8
serviceAccount: false
psp: false
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/elasticsearch/initcontainer/prepare_fs_script.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ var scriptTemplate = template.Must(template.New("").Parse(

# the operator only works with the default ES distribution
license=/usr/share/elasticsearch/LICENSE.txt
if [[ ! -f $license || $(grep -Fxc "ELASTIC LICENSE AGREEMENT" $license) -ne 1 ]]; then
if [[ ! -f $license || $(grep -Exc "ELASTIC LICENSE AGREEMENT|Elastic License 2.0" $license) -ne 1 ]]; then
>&2 echo "unsupported_distribution"
exit ` + fmt.Sprintf("%d", UnsupportedDistroExitCode) + `
fi
Expand Down