-
Notifications
You must be signed in to change notification settings - Fork 719
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge master branch into statefulset-refactoring (#1232)
* Support for APM server configuration (#1181) * Add a config section to the APM server configuration * APM: Add support for keystore * Factorize ElasticsearchAuthSettings * Update dev setup doc + fix GKE bootstrap script (#1203) * Update dev setup doc + fix GKE bootstrap script * Update wording of container registry authentication * Ensure disks removal after removing cluster in GKE (#1163) * Update gke-cluster.sh * Implement cleanup for unused disks in GCP * Update Makefile * Update CI jobs to do proper cleanup * Normalize the raw config when creating canonical configs (#1208) This aims at counteracting the difference between JSON centric serialization and the use of YAML as the serialization format in canonical config. If not normalizing numeric values like 1 will differ when comparing configs as JSON deserializes integer numbers to float64 and YAML to uint64. * Homogenize logs (#1168) * Don't run tests if only docs are changed (#1216) * Update Jenkinsfile * Simplify notOnlyDocs() * Update Jenkinsfile * Push snapshot ECK release on successful PR build (#1184) * Update makefile's to support snapshots * Add snapshot releases to Jenkins pipelines * Cleanup * Rename RELEASE to USE_ELASTIC_DOCKER_REGISTRY * Update Jenkinsfile * Add a note on EKS inbound traffic & validating webhook (#1211) EKS users must explicitly enable communication from the k8s control plane and nodes port 443 in order for the control plane to reach the validating webhook. Should help with #896. * Update PodSpec with Hostname from PVC when re-using (#1204) * Bind the Debug HTTP server to localhost by default (#1220) * Run e2e tests against custom Docker image (#1135) * Add implementation * Update makefile's * Update Makefile * Rename Jenkisnfile * Fix review comments * Update e2e-custom.yml * Update e2e-custom.yml * Return deploy-all-in-one to normal * Delete GKE cluster only if changes not in docs (#1223) * Add operator version to resources (#1224) * Warn if unsupported distribution (#1228) The operator only works with the official ES distributions to enable the security available with the basic (free), gold and platinum licenses in order to ensure that all clusters launched are secured by default. A check is done in the prepare-fs script by looking at the existence of the Elastic License. If not present, the script exit with a custom exit code. Then the ES reconcilation loop sends an event of type warning if it detects that a prepare-fs init container terminated with this exit code. * Document Elasticsearch update strategy change budget & groups (#1210) Add documentation for the `updateStrategy` section of the Elasticsearch spec. It documents how (and why) `changeBudget` and `groups` are used by ECK, and how both settings can be specified by the user.
- Loading branch information
Showing
106 changed files
with
1,949 additions
and
905 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| --- | ||
| - job: | ||
| description: Job that runs e2e tests against custom ECK image running in a dedicated k8s cluster in GKE. This Job is managed by JJB. | ||
| logrotate: | ||
| daysToKeep: 7 | ||
| numToKeep: 100 | ||
| artifactDaysToKeep: 5 | ||
| artifactNumToKeep: 10 | ||
| name: cloud-on-k8s-e2e-tests-custom | ||
| project-type: pipeline | ||
| parameters: | ||
| - string: | ||
| name: IMAGE | ||
| description: "Docker image with ECK" | ||
| - string: | ||
| name: VERSION | ||
| default: 1.12 | ||
| description: "Kubernetes version, default is 1.12" | ||
| concurrent: true | ||
| pipeline-scm: | ||
| scm: | ||
| - git: | ||
| url: https://github.com/elastic/cloud-on-k8s | ||
| branches: | ||
| - master | ||
| credentials-id: 'f6c7695a-671e-4f4f-a331-acdce44ff9ba' | ||
| script-path: build/ci/e2e/custom_operator_image.jenkinsfile | ||
| lightweight-checkout: true | ||
| wrappers: | ||
| - ansicolor |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| #!/usr/bin/env python | ||
|
|
||
| import os | ||
| import json | ||
|
|
||
| project = os.environ['GCLOUD_PROJECT'] | ||
|
|
||
| os.system('gcloud compute disks list --filter="-users:*" --format="json" --project {} > unused_disks.json' | ||
| .format(project)) | ||
|
|
||
| with open('unused_disks.json', 'r') as f: | ||
| content = f.read() | ||
| try: | ||
| parsed_json_dict = json.loads(content) | ||
| if len(parsed_json_dict) == 0: | ||
| print("There is no unused disks. Congratulations!") | ||
| else: | ||
| for entry in parsed_json_dict: | ||
| name = entry['name'] | ||
| head, tail = os.path.split(entry['zone']) | ||
| os.system('gcloud compute disks delete {} --project {} --zone {} --quiet' | ||
| .format(name, project, tail)) | ||
| except: | ||
| print("Can't parse JSON:") | ||
| print(content) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| pipeline { | ||
|
|
||
| agent { | ||
| label 'linux' | ||
| } | ||
|
|
||
| options { | ||
| timeout(time: 150, unit: 'MINUTES') | ||
| } | ||
|
|
||
| environment { | ||
| VAULT_ADDR = credentials('vault-addr') | ||
| VAULT_ROLE_ID = credentials('vault-role-id') | ||
| VAULT_SECRET_ID = credentials('vault-secret-id') | ||
| REGISTRY = "eu.gcr.io" | ||
| GCLOUD_PROJECT = credentials('k8s-operators-gcloud-project') | ||
| GKE_CLUSTER_VERSION = "${VERSION}" | ||
| GKE_CLUSTER_NAME = "${BUILD_TAG}" | ||
| OPERATOR_IMAGE = "${IMAGE}" | ||
| LATEST_RELEASED_IMG = "${IMAGE}" | ||
| } | ||
|
|
||
| stages { | ||
| stage('Checkout from GitHub') { | ||
| steps { | ||
| checkout scm | ||
| } | ||
| } | ||
| stage("Run E2E tests") { | ||
| steps { | ||
| sh 'make -C build/ci ci-e2e-rc' | ||
| } | ||
| } | ||
| } | ||
|
|
||
| post { | ||
| unsuccessful { | ||
| script { | ||
| def msg = "E2E tests failed!\r\n" + env.BUILD_URL | ||
| slackSend botUser: true, | ||
| channel: '#cloud-k8s', | ||
| color: 'danger', | ||
| message: msg, | ||
| tokenCredentialId: 'cloud-ci-slack-integration-token' | ||
| } | ||
| } | ||
| cleanup { | ||
| sh 'make -C build/ci ci-e2e-delete-cluster' | ||
| cleanWs() | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.