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

Granulate gMaestro Addon #727

Conversation

marina-vrublevsky
Copy link
Contributor

Issue #, if available:

Description of changes:
This PR continues #576

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

@shapirov103
Copy link
Collaborator

@marina-vrublevsky a couple of questions:

  1. Please confirm that I can close add granulate gmaestro addon #576 in favor of this one.
  2. Please fix the branch conflicts, e.g. merge upstream main back into your fork.

@elamaran11
Copy link
Collaborator

@marina-vrublevsky Also please fix the Pattern aws-samples/cdk-eks-blueprints-patterns#57 for Granulate.

@marina-vrublevsky
Copy link
Contributor Author

Hi @elamaran11

  1. Please confirm that I can close add granulate gmaestro addon #576 in favor of this one.

Yes

  1. Please fix the branch conflicts, e.g. merge upstream main back into your fork.

Done

Also please fix the Pattern aws-samples/cdk-eks-blueprints-patterns#57 for Granulate.

On it

@marina-vrublevsky
Copy link
Contributor Author

marina-vrublevsky commented Jun 18, 2023

@marina-vrublevsky Also please fix the Pattern aws-samples/cdk-eks-blueprints-patterns#57 for Granulate.

@elamaran11 please review aws-samples/cdk-eks-blueprints-patterns#101

@elamaran11
Copy link
Collaborator

@marina-vrublevsky Also please fix the Pattern aws-samples/cdk-eks-blueprints-patterns#57 for Granulate.

@elamaran11 please review aws-samples/cdk-eks-blueprints-patterns#101

@marina-vrublevsky Have few comments on the Patterns PR, please address it. Once we have patterns PR merged, we can review this doc PR.

@elamaran11
Copy link
Collaborator

@marina-vrublevsky Please provide an update on this PR and Patterns Repo PR.

1 similar comment
@elamaran11
Copy link
Collaborator

@marina-vrublevsky Please provide an update on this PR and Patterns Repo PR.

@freschri
Copy link
Collaborator

@marina-vrublevsky I am picking this review up from Ela. I don't see a lib/addons/gmaestro/index.ts file, is there a reason for that? I see this PR is open for a while. Happy to support to get to completion. Please respond thanks.

--description "Encrypted client ID for Granulate gMaestro" \
--secret-string "${MAESTRO_CLIENT_ID}"
```

Copy link
Collaborator

Choose a reason for hiding this comment

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

I would replace the above with:
3. Create a secret (as a plaintext) in AWS Secrets Manager:
bash export MAESTRO_CLIENT_ID=<MAESTRO_CLIENT_ID value from the Deployment section in the downloaded config file> export MAESTRO_SECRET_NAME=<your preferred secret name> aws secretsmanager create-secret --name ${MAESTRO_SECRET_NAME} \ --description "Encrypted client ID for Granulate gMaestro" \ --secret-string "${MAESTRO_CLIENT_ID}"

const app = new cdk.App();

const addOn = new GmaestroAddOn({
clientIdSecretName: "<secret name>", // MAESTRO_SECRET_NAME
Copy link
Collaborator

Choose a reason for hiding this comment

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

is clientIdSecretName a good parameter name? should it be more appropriate secretName? It is a bit confusing seems a merge between MAESTRO_SECRET_NAME and MAESTRO_CLIENT_ID

@freschri freschri self-assigned this Sep 4, 2023
freschri
freschri previously approved these changes Sep 4, 2023
Copy link
Collaborator

@freschri freschri left a comment

Choose a reason for hiding this comment

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

approving following discussions and amendments on other channel

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.

@marina-vrublevsky Nice work, couple of minor changes from documentation perspective. Also fix the GH action errors, i see missing Doc links.

## Prerequisites
Before using gMaestro, you need to:
1. [Sign up](https://app.granulate.io/gMaestroSignup) to the gMaestro platform
2. Download a sample YAML file - After signing up to gMaestro, navigate to the [Deploy](https://app.granulate.io/deploy) on the left-hand menu, fill in the required fields and click on "Generate Config File"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do we have a place to download the sample YAML. If not i would add the sample YAML to this doc page.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The only way to download it is using the instruction, I would rather not add it to the doc since it's being maintained by us and might change frequently

Copy link
Collaborator

Choose a reason for hiding this comment

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

I would atleast hyperlink from where to download the sample, when you say Download a sample YAML file

Copy link
Collaborator

Choose a reason for hiding this comment

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

@elamaran11 I went through the signup process, I think the doc here is clear: there is an image right below line 9 here that shows where to tap to download the file

Copy link
Collaborator

Choose a reason for hiding this comment

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

Oh it wasn't clear initially, it makes sense. So you mean download as shown in below image. I would rather say Download a sample YAML file from step 3 - Download Config File as shown below. But up to you. Im good.

Copy link
Contributor Author

@marina-vrublevsky marina-vrublevsky Sep 5, 2023

Choose a reason for hiding this comment

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

i can't provide a direct hyper link since it's auto generated after you follow the instructions in: https://app.granulate.io/deploy

Copy link
Collaborator

Choose a reason for hiding this comment

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

I think im good on this comment. All i was recommending at last is rephrasing your sentence to say Download a sample YAML file from step 3 - Download Config File as shown below and hyperlink is not needed.

@@ -0,0 +1,67 @@
# gMaestro add-on for Amazon EKS Blueprints

The gMaestro Blueprints AddOn deploys the gMaestro Agent on Amazon EKS using the [eks-blueprints](https://github.com/aws-quickstart/cdk-eks-blueprints) [CDK](https://aws.amazon.com/cdk/) construct.
Copy link
Collaborator

Choose a reason for hiding this comment

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

I would rather remove this - using the eks-blueprints CDK construct.
and rephrase the sentence better to say what the addon actually does apart from deploying the agent on Amazon EKS. You need one or two sentence to explain what the addon does?

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.

@marina-vrublevsky Couple of minor feedback almost there. Nice work~

mkdocs.yml Outdated
@@ -79,6 +79,7 @@ nav:
- Vpc Cni: 'addons/vpc-cni.md'
- AWS XRay: 'addons/xray.md'
- AWS XRay ADOT: 'addons/xray-adot-addon.md'
- Gmaestro: 'addons/gmaestro.md'
Copy link
Collaborator

Choose a reason for hiding this comment

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

Move this to after line 48.

docs/addons/gmaestro.md Show resolved Hide resolved
@marina-vrublevsky
Copy link
Contributor Author

@elamaran11 I believe I addressed all your comments, can you please re-review both PRs?

elamaran11
elamaran11 previously approved these changes Sep 5, 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

@elamaran11
Copy link
Collaborator

elamaran11 commented Sep 5, 2023

@marina-vrublevsky Please see the above GH failures and fix those. Did you pull the latest code, some changes in main should be missed.

@marina-vrublevsky
Copy link
Contributor Author

@elamaran11 I'm merged, looks like the error is unrelated to me ERROR: 1 dead links found! from another pattern's readme

@elamaran11
Copy link
Collaborator

@marina-vrublevsky Totally agree its not your issue, rather than we fixing it your pulling it again from main. Can you replace this file https://karpenter.sh/v0.26/concepts/node-templates/#specsubnetselector to https://karpenter.sh/v0.28/concepts/node-templates/#specsubnetselector in the file docs/addons/karpenter.md. Once thats done, this error should go away.

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

@elamaran11
Copy link
Collaborator

Waiting on Patterns Repo PR to merge this.

@elamaran11 elamaran11 merged commit b488dea into aws-quickstart:main Sep 5, 2023
11 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.

4 participants