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

fix: 869, support for non default namespace for adot #873

Merged
merged 2 commits into from
Nov 10, 2023

Conversation

nrajb
Copy link
Contributor

@nrajb nrajb commented Nov 9, 2023

Issue #: #869

Description of changes:
Adds support for non-default namespace for ADOT deployment.

Tests:

make run-test

Test Suites: 14 passed, 14 total
Tests:       67 passed, 67 total
Snapshots:   0 total
Time:        21.321 s

#Post Deployment validations:

└> k get all -n adot                                                                                                                                                 [9/11/23| 5:54PM]
NAME                                                READY   STATUS    RESTARTS   AGE
pod/otel-collector-amp-collector-6b8996bf5d-lxv6w   1/1     Running   0          101m
pod/otel-collector-xray-collector-c76d86886-rhvjm   1/1     Running   0          101m

NAME                                               TYPE        CLUSTER-IP       EXTERNAL-IP   PORT(S)             AGE
service/otel-collector-amp-collector-monitoring    ClusterIP   172.20.93.158    <none>        8888/TCP            101m
service/otel-collector-xray-collector              ClusterIP   172.20.216.150   <none>        4317/TCP,4318/TCP   102m
service/otel-collector-xray-collector-headless     ClusterIP   None             <none>        4317/TCP,4318/TCP   102m
service/otel-collector-xray-collector-monitoring   ClusterIP   172.20.120.105   <none>        8888/TCP            102m

NAME                                            READY   UP-TO-DATE   AVAILABLE   AGE
deployment.apps/otel-collector-amp-collector    1/1     1            1           101m
deployment.apps/otel-collector-xray-collector   1/1     1            1           102m

NAME                                                      DESIRED   CURRENT   READY   AGE
replicaset.apps/otel-collector-amp-collector-6b8996bf5d   1         1         1       101m
replicaset.apps/otel-collector-xray-collector-c76d86886   1         1         1       102m

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

elamaran11
elamaran11 previously approved these changes Nov 9, 2023
Copy link
Collaborator

@elamaran11 elamaran11 left a comment

Choose a reason for hiding this comment

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

LGTM. @shapirov103 Can you review and run e2e. This is for a issue reported.

@elamaran11 elamaran11 linked an issue Nov 9, 2023 that may be closed by this pull request
Copy link
Collaborator

@shapirov103 shapirov103 left a comment

Choose a reason for hiding this comment

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

Looks great, one minor comment.

@@ -25,22 +27,37 @@ const defaultProps = {
@supportsALL
export class AdotCollectorAddOn extends CoreAddOn {

private namespace: string;
Copy link
Collaborator

Choose a reason for hiding this comment

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

we try to avoid member variable other than the props, since blueprints can be cloned an reused.
You can drop line 39 and just use in the deploy method this.coreAddOnProps.namespace

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated the code, was able to test successfully as well

 k get all -n adot                                                                                                                                                [10/11/23| 8:47AM]
NAME                                                READY   STATUS    RESTARTS   AGE
pod/otel-collector-amp-collector-748d886bdd-kp6bp   1/1     Running   0          11h
pod/otel-collector-xray-collector-c76d86886-gxmq4   1/1     Running   0          11h

NAME                                               TYPE        CLUSTER-IP      EXTERNAL-IP   PORT(S)             AGE
service/otel-collector-amp-collector-monitoring    ClusterIP   172.20.126.84   <none>        8888/TCP            11h
service/otel-collector-xray-collector              ClusterIP   172.20.205.87   <none>        4317/TCP,4318/TCP   11h
service/otel-collector-xray-collector-headless     ClusterIP   None            <none>        4317/TCP,4318/TCP   11h
service/otel-collector-xray-collector-monitoring   ClusterIP   172.20.96.232   <none>        8888/TCP            11h

NAME                                            READY   UP-TO-DATE   AVAILABLE   AGE
deployment.apps/otel-collector-amp-collector    1/1     1            1           11h
deployment.apps/otel-collector-xray-collector   1/1     1            1           11h

NAME                                                      DESIRED   CURRENT   READY   AGE
replicaset.apps/otel-collector-amp-collector-748d886bdd   1         1         1       11h
replicaset.apps/otel-collector-xray-collector-c76d86886   1         1         1       11h

Copy link
Collaborator

@elamaran11 elamaran11 left a comment

Choose a reason for hiding this comment

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

LGTM. @shapirov103 Please review and run e2e.

Copy link
Collaborator

@shapirov103 shapirov103 left a comment

Choose a reason for hiding this comment

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

Pending e2e

@shapirov103
Copy link
Collaborator

/do-e2e-tests

Copy link

@aws-ia-ci aws-ia-ci left a comment

Choose a reason for hiding this comment

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

end to end tests passed

@elamaran11 elamaran11 merged commit a63f272 into aws-quickstart:main Nov 10, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ADOT Addon: Not respecting the "ordered" metadata
4 participants