From c52ad079379e6b1ba420866cdf96019f382f94ff Mon Sep 17 00:00:00 2001 From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com> Date: Thu, 4 Nov 2021 17:39:30 +0100 Subject: [PATCH] [apm-server] remove oss example (#1442) This commit remove the APM Server OSS example and CI tests for 8.0.0 future version. --- apm-server/README.md | 11 ----------- apm-server/examples/oss/Makefile | 13 ------------- apm-server/examples/oss/README.md | 27 -------------------------- apm-server/examples/oss/test/goss.yaml | 13 ------------- apm-server/examples/oss/values.yaml | 19 ------------------ helpers/matrix.yml | 1 - 6 files changed, 84 deletions(-) delete mode 100644 apm-server/examples/oss/Makefile delete mode 100644 apm-server/examples/oss/README.md delete mode 100644 apm-server/examples/oss/test/goss.yaml delete mode 100644 apm-server/examples/oss/values.yaml diff --git a/apm-server/README.md b/apm-server/README.md index 8c9522175..0472fedd8 100644 --- a/apm-server/README.md +++ b/apm-server/README.md @@ -25,7 +25,6 @@ SLA of official GA features (see [supported configurations][] for more details). - [Configuration](#configuration) - [FAQ](#faq) - [How to use APM Server with Elasticsearch with security (authentication and TLS) enabled?](#how-to-use-apm-server-with-elasticsearch-with-security-authentication-and-tls-enabled) - - [How to install OSS version of APM Server?](#how-to-install-oss-version-of-apm-server) - [Contributing](#contributing) @@ -132,14 +131,6 @@ outside of this chart and accessed using [environment variables][] and volumes. An example can be found in [examples/security][]. -### How to install OSS version of APM Server? - -Deploying OSS version of APM Server can be done by setting `image` value to -[APM Server OSS Docker image][] - -An example of APM Server deployment using OSS version can be found in -[examples/oss][]. - ## Contributing @@ -154,12 +145,10 @@ about our development and testing process. [affinity]: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity [annotations]: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ [apm server docker image]: https://www.elastic.co/guide/en/apm/server/current/running-on-docker.html -[apm server oss docker image]: https://www.docker.elastic.co/r/apm/apm-server-oss [default elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/main/elasticsearch/README.md#default [environment variables]: https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/#using-environment-variables-inside-of-your-config [environment from variables]: https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#configure-all-key-value-pairs-in-a-configmap-as-container-environment-variables [examples]: https://github.com/elastic/helm-charts/tree/main/apm-server/examples -[examples/oss]: https://github.com/elastic/helm-charts/tree/main/apm-server/examples/oss [examples/security]: https://github.com/elastic/helm-charts/tree/main/apm-server/examples/security [helm]: https://helm.sh [horizontal pod autoscaler]: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/ diff --git a/apm-server/examples/oss/Makefile b/apm-server/examples/oss/Makefile deleted file mode 100644 index 686864878..000000000 --- a/apm-server/examples/oss/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -default: test - -include ../../../helpers/examples.mk - -RELEASE := helm-apm-server-oss - -install: - helm upgrade --wait --timeout=$(TIMEOUT) --install --values values.yaml $(RELEASE) ../../ - -test: install goss - -purge: - helm del $(RELEASE) diff --git a/apm-server/examples/oss/README.md b/apm-server/examples/oss/README.md deleted file mode 100644 index 4aca03949..000000000 --- a/apm-server/examples/oss/README.md +++ /dev/null @@ -1,27 +0,0 @@ -# OSS - -This example deploy APM Server 8.0.0-SNAPSHOT using [APM Server OSS][] version. - - -## Usage - -* Deploy [Elasticsearch Helm chart][]. - -* Deploy APM Server chart with the default values: `make install` - -* You can now setup a port forward to query APM indices: - - ``` - kubectl port-forward svc/elasticsearch-master 9200 - curl localhost:9200/_cat/indices - ``` - - -## Testing - -You can also run [goss integration tests][] using `make test` - - -[apm server oss]: https://www.elastic.co/downloads/apm-oss -[elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/main/elasticsearch/examples/default/ -[goss integration tests]: https://github.com/elastic/helm-charts/tree/main/apm-server/examples/oss/test/goss.yaml diff --git a/apm-server/examples/oss/test/goss.yaml b/apm-server/examples/oss/test/goss.yaml deleted file mode 100644 index 3488904fd..000000000 --- a/apm-server/examples/oss/test/goss.yaml +++ /dev/null @@ -1,13 +0,0 @@ -http: - http://localhost:8200?pretty: - status: 200 - timeout: 2000 - body: - - "8.0.0" - http://elasticsearch-master:9200/_cat/indices: - status: 200 - timeout: 2000 - username: "{{ .Env.ELASTICSEARCH_USERNAME }}" - password: "{{ .Env.ELASTICSEARCH_PASSWORD }}" - body: - - "apm-oss-8.0.0" diff --git a/apm-server/examples/oss/values.yaml b/apm-server/examples/oss/values.yaml deleted file mode 100644 index 50faf1dc1..000000000 --- a/apm-server/examples/oss/values.yaml +++ /dev/null @@ -1,19 +0,0 @@ -image: docker.elastic.co/apm/apm-server-oss - -apmConfig: - apm-server.yml: | - apm-server: - host: "0.0.0.0:8200" - - queue: {} - output.file: - enabled: false - - output.elasticsearch: - hosts: ["http://elasticsearch-master:9200"] - username: "${ELASTICSEARCH_USERNAME}" - password: "${ELASTICSEARCH_PASSWORD}" - index: "apm-oss-%{[observer.version]}-%{+yyyy.MM.dd}" - - setup.template.name: "apm-server" - setup.template.pattern: "apm-oss-*" diff --git a/helpers/matrix.yml b/helpers/matrix.yml index 4398a736b..733422028 100644 --- a/helpers/matrix.yml +++ b/helpers/matrix.yml @@ -34,7 +34,6 @@ LOGSTASH_SUITE: - upgrade APM_SERVER_SUITE: - default - - oss - security - upgrade KUBERNETES_VERSION: