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.

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

APM: remove "output" element and add elasticsearchRef #1345

Merged
merged 5 commits into from
Jul 23, 2019

Conversation

barkbay
Copy link
Contributor

@barkbay barkbay commented Jul 23, 2019

This PR adds the elasticsearchRef to the APM server object and remove the "output" section:

apiVersion: apm.k8s.elastic.co/v1alpha1
kind: ApmServer
metadata:
  name: apm-server-sample
spec:
  version: "7.2.0"
  nodeCount: 1
  elasticsearchRef:
    name: "elasticsearch-sample"

Internally the association controller is still managing a section elasticsearch to inject the connection information, exactly as it is done for Kibana:

spec:
  elasticsearch:
    auth:
      secret:
        key: default-apm-server-sample-apm-user
        name: apm-server-sample-elastic-internal-apm
    hosts:
    - https://elasticsearch-sample-es-http.default.svc:9200
    ssl:
      certificateAuthorities:
        secretName: elasticsearch-sample-es-http-certs-public
  elasticsearchRef:
    name: elasticsearch-sample

If it can be backported in 0.9. it would allow us to avoid a user change later.

@barkbay barkbay self-assigned this Jul 23, 2019
@barkbay barkbay added the >enhancement Enhancement of existing functionality label Jul 23, 2019
Copy link
Contributor

@thbkrkr thbkrkr left a comment

Choose a reason for hiding this comment

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

LGTM. Just left one tiny nitpick.

return nil
}

esNamespace := apm.Spec.ElasticsearchRef.Namespace
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: we could reuse the ref variable: esNamespace := ref.Namespace. I may be a bit rigid but I would appreciate to have the same block of code with the same namings in the 2 controllers.

esRef := as.Spec.Output.Elasticsearch.ElasticsearchRef
if esRef == nil {
	return nil
}

if esRef.Namespace == "" {
	// no namespace provided: default to the APM Server namespace
	esRef.Namespace = as.Namespace
}

@barkbay barkbay requested a review from thbkrkr July 23, 2019 17:01
@barkbay
Copy link
Contributor Author

barkbay commented Jul 23, 2019

Jenkins test this please

2 similar comments
@anyasabo
Copy link
Contributor

Jenkins test this please

@barkbay
Copy link
Contributor Author

barkbay commented Jul 23, 2019

Jenkins test this please

@pebrc pebrc merged commit b00ac2e into elastic:master Jul 23, 2019
pebrc pushed a commit to pebrc/cloud-on-k8s that referenced this pull request Jul 23, 2019
sebgl added a commit that referenced this pull request Jul 24, 2019
* Use the setvmmaxmapcount initcontainer by default in E2E tests (#1300)

Let's keep our default defaults :)

The setting is disabled explicitly for E2E tests where we enable a
restricted security context.

* Add docs for plugins, custom configuration files and secure settings (#1298)

* Allow license secret webhook to fail (#1301)

Webhooks on core k8s objects are just too debilitating in case our
webhook service fails. This sets the failure policy for the secret
webhook to ignore to strike a balance between UX (immediate feedback)
and keeping the users k8s cluster in a working state. Also we have an
additional validation run on controller level so this does not allow
circumventing our validation logic.

* Revert "Use the setvmmaxmapcount initcontainer by default in E2E tests (#1300)" (#1302)

This reverts commit fff1526.
This commit is breaking our E2E tests chain, which deploy a
PodSecurityPolicy by default. Any privileged init container will not
work.

I'll open an issue for a longer-term fix to properly handle this.

* Update quickstart (#1307)

* Update the name of the secret for the elastic user
* Bump the Elastic Stack version from 7.1.0 to 7.2.0

* Change Kibana readiness endpoint to return a 200 OK (#1309)

The previous endpoint returned an http code 302. While this is fine for
Kubernetes, some derived systems like GCP LoadBalancers mimic the
container readiness check for their own readiness check. Except GCP
Loadbalancers only work with status 200.

It's not up to us to adapt GCP LoadBalancers to K8s, but this is a
fairly trivial fix.

* Fix pod_forwarder to support two part DNS names, adjust e2e http_client (#1297)

* Fix pod_forwarder to support two part DNS names, adjust e2e http_client url

* Revert removing .svc in e2e http_client

* [DOC] Resources management and volume claim template (#1252)

* Add resources and persistent volume templates documentation

* Ignore resources reconciled by older controllers (#1286)

* Document PodDisruptionBudget section of the ES spec (#1306)

* Document PodDisruptionBudget section of the ES spec

I suspect this might slightly change in the feature depending on how we
handle the readiness check, so I'm keeping this doc minimal for now:

* what is a PDB, briefly (with a link)
* default PDB we apply
* how to set a different PDB
* how to disable the default PDB

* Move version out from Makefile (#1312)

* Add release note generation tool (#1314)

* no external dependencies
* inspects PRs by version label
* generates structured release notes in asciidoc grouped by type label

* Add console output to standalone apm sample (#1321)

* Update Quickstart to 0.9.0 (#1317)

* Update doc (#1319)

* Update persistent storage section
* Update kibana localhost url to use https
* Update k8s resources names in accessing-services doc
* Mention SSL browser warning
* Fix bulleted list

* Add CI job for nightly builds (#1248)

* Move version to a file

* Add CI implementation

* Update VERSION

* Depend on another PR for moving out version from Makefile

* Update Jenkinsfile

* Don't build and push operator image in bootstrap-gke (#1332)

We don't need to do that anymore, since we don't use an init container
based on the operator image.

* Remove Docker image publishing from devops-ci (#1339)

* Suppress output of certain commands from Makefile (#1342)

* Document how to disable TLS (#1341)

* Use new credentials for Docker registry (#1346)

* Workaround controller-runtime webhook upsert bug (#1337)

* Fix docs build on PR job (#1351)

* Fix docs build on PR job

* Cleanup workspace before doing other steps

* APM: remove "output" element and add elasticsearchRef (#1345)

* Don't rely on buggy metaObject Kind (#1324)

* Don't rely on buggy metaObject Kind

A bug in our client implementation may clear the object's Kind on
certain scenarios. See
kubernetes-sigs/controller-runtime#406.

Let's avoid that by fixing a constant Kind returned by a method call on
the resource.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>enhancement Enhancement of existing functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants