-
Notifications
You must be signed in to change notification settings - Fork 151
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
Make clusterName optional on EKS and GKE #1067
Conversation
Note, this is a second attempt of #1056 to enable testing to work properly. I have not yet implemented changes requested in that review, other than README wording. |
6973434
to
ec31423
Compare
I believe I've addressed all comments on the original PR now, so I'm marking as ready for review. |
examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One nit. Mostly LGTM. Approving. Please address other review comments before merging.
df9d005
to
3a59662
Compare
@crobert-1 I think it is worth updating the eks functional_tests to test with the resourcedetector added cluster-name. The test currently sets the cluster name in values which if removed, should default to the resourcedetector provided attr. This would need a change to the testdata, since the name of the eks cluster being tested on is |
0009ed2
to
a597ef7
Compare
I've updated functional tests to account for the EKS optional cluster name. These tests are currently being skipped as the functionality is not complete, but the logic is in place for when they're running. I've moved the |
- Move duplicated check to single place - Simplify regex - Disable all unrelated resource attributes in new resource detection processor - Remove env detector when unecessary.
Co-authored-by: jvoravong <47871238+jvoravong@users.noreply.github.com>
Co-authored-by: Dmitrii Anoshin <anoshindx@gmail.com>
- Only include cluster name detection when required (no clusterName specified) - Update tests to auto detect cluster name
1a5e9cd
to
3942b8a
Compare
|
Regarding the failing upgrade test: It's failing because the cluster name is no longer passed in to the install command. Since the test is running a previous version of the chart without this PR's changes, the |
Please go ahead and merge. |
Description:
Now that the resource detection processor supports detecting the k8s.cluster.name in GKE and EKS environments, the clusterName value can be optional in these environments.
A simplified resource detection processor has been added to more pipelines in this change as well, in every place the clusterName was manually being added.
Testing:
Tested in GKE and kOps. GKE sets cluster name properly without it specified, and overrides the detected k8s.cluster.name when clusterName is set. kOps fails without clusterName with the following message:
The - (root) lines are a bit confusing, but that's simply saying that the check failed, AFAICT.
Also, removed
clusterName
option from functional tests and changed expectedk8s.cluster.name
value in telemetry to berotel-eks
instead of the manually set value.Documentation:
Updated README and relevant comments in code.