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

Updating helm docs with additionalVault and ACLs refactor functionality. #12669

Merged
merged 5 commits into from
Apr 4, 2022

Conversation

jmurret
Copy link
Member

@jmurret jmurret commented Mar 31, 2022

No description provided.

@jmurret jmurret added type/docs Documentation needs to be created/updated/clarified type/docs-cherrypick pr/no-changelog PR does not need a corresponding .changelog entry labels Mar 31, 2022
@jmurret jmurret requested a review from a team March 31, 2022 16:06
@jmurret jmurret requested a review from a team as a code owner March 31, 2022 16:06
Copy link
Contributor

@karl-cardenas-coding karl-cardenas-coding left a comment

Choose a reason for hiding this comment

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

@jmurret I left some feedback and comments in the pr. Some of the definitions are confusing and tough to follow. Take a look at ones I called out and let's try to simplify the information.

@@ -169,16 +169,35 @@ Use these links to navigate to a particular top-level stanza.
- gossip encryption key defined by `global.gossipEncryption.secretName`.
To discover the service account name of the Consul client, run
```shell-session
$ helm template --show-only templates/client-serviceaccount.yaml <release-name> charts/consul
$ helm template --show-only templates/client-serviceaccount.yaml <release-name> hashicorp/consul
Copy link
Contributor

Choose a reason for hiding this comment

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

This is not rendering correctly. You might have to play with the indentation.

image

Copy link
Member Author

Choose a reason for hiding this comment

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

How are you able to preview this? I would love to also be able to do this myself.

Copy link
Contributor

Choose a reason for hiding this comment

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

I added a comment in the PR that explains this. But yeah, it's still breaking 😢

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe it needs a newline before and after? or maybe it's wrong indentation?

Copy link
Member Author

Choose a reason for hiding this comment

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

@karl-cardenas-coding can you elaborate exactly what should happen here in terms of the visual we should see? When I look at this preview, all code blocks match the indentation of the lines above them and this one seems to as well. Am I trying to widen this code block?

Copy link
Member Author

Choose a reason for hiding this comment

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

oh sorry. I thought the indentation was wrong. I see it now. :face-palm.
the markdown is showing up in the rendered code block.

website/content/docs/k8s/helm.mdx Outdated Show resolved Hide resolved
website/content/docs/k8s/helm.mdx Outdated Show resolved Hide resolved
website/content/docs/k8s/helm.mdx Outdated Show resolved Hide resolved
website/content/docs/k8s/helm.mdx Outdated Show resolved Hide resolved
website/content/docs/k8s/helm.mdx Outdated Show resolved Hide resolved
website/content/docs/k8s/helm.mdx Outdated Show resolved Hide resolved
website/content/docs/k8s/helm.mdx Outdated Show resolved Hide resolved
website/content/docs/k8s/helm.mdx Outdated Show resolved Hide resolved
@jmurret
Copy link
Member Author

jmurret commented Mar 31, 2022

Thanks @karl-cardenas-coding! I'll take a look and revise.

@jmurret
Copy link
Member Author

jmurret commented Mar 31, 2022

Hi @karl-cardenas-coding, thank you for the thoughtful review. I have tried to address all of your commits if you want to look at the latest commit.

@karl-cardenas-coding
Copy link
Contributor

karl-cardenas-coding commented Mar 31, 2022

@jmurret Click here to view the preview 😄

image

We also have this video guide to help you preview changes locally.

Copy link
Contributor

@karl-cardenas-coding karl-cardenas-coding left a comment

Choose a reason for hiding this comment

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

@jmurret Much better and thank you for making the changes. I left you two minor suggestions that need your input. Besides that, the only remaining item are the shell-sessions blocks that are not rendering correctly.

@@ -169,16 +169,35 @@ Use these links to navigate to a particular top-level stanza.
- gossip encryption key defined by `global.gossipEncryption.secretName`.
To discover the service account name of the Consul client, run
```shell-session
$ helm template --show-only templates/client-serviceaccount.yaml <release-name> charts/consul
$ helm template --show-only templates/client-serviceaccount.yaml <release-name> hashicorp/consul
Copy link
Contributor

Choose a reason for hiding this comment

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

I added a comment in the PR that explains this. But yeah, it's still breaking 😢

website/content/docs/k8s/helm.mdx Outdated Show resolved Hide resolved
website/content/docs/k8s/helm.mdx Outdated Show resolved Hide resolved
Comment on lines 196 to 197
- `adminPartitionsRole` ((#v-global-secretsbackend-vault-adminpartitionsrole)) (`string: ""`) - <EnterpriseAlert inline /> A Vault role to allow Kubernetes job that creates a Consul partition for this Helm chart (`partition-init`)
to read Vault secret for the partition ACL token.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
- `adminPartitionsRole` ((#v-global-secretsbackend-vault-adminpartitionsrole)) (`string: ""`) - <EnterpriseAlert inline /> A Vault role to allow Kubernetes job that creates a Consul partition for this Helm chart (`partition-init`)
to read Vault secret for the partition ACL token.
- `adminPartitionsRole` ((#v-global-secretsbackend-vault-adminpartitionsrole)) (`string: ""`) - <EnterpriseAlert inline /> A Vault role to allow a Kubernetes job create a Consul partition for this Helm chart deployment (`partition-init`). This role allows Consul to read Vault secret for the respective partition ACL token.

Is this correct? I'm still a bit lost here 😅

@@ -169,16 +169,35 @@ Use these links to navigate to a particular top-level stanza.
- gossip encryption key defined by `global.gossipEncryption.secretName`.
To discover the service account name of the Consul client, run
```shell-session
$ helm template --show-only templates/client-serviceaccount.yaml <release-name> charts/consul
$ helm template --show-only templates/client-serviceaccount.yaml <release-name> hashicorp/consul
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe it needs a newline before and after? or maybe it's wrong indentation?

@jmurret jmurret changed the title Updating helm docs with additionalVault and ACLs refactor funtionality. Updating helm docs with additionalVault and ACLs refactor functionality. Apr 1, 2022
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging April 1, 2022 01:41 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging April 1, 2022 01:56 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging April 1, 2022 02:09 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging April 1, 2022 02:24 Inactive
@jmurret
Copy link
Member Author

jmurret commented Apr 1, 2022

@karl-cardenas-coding The shell-sessions are fixed. It apparently expects there to only be one space between the # comment marker and shell-session block. 🤷

Copy link
Contributor

@karl-cardenas-coding karl-cardenas-coding left a comment

Choose a reason for hiding this comment

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

👍🏼

- Fix indentation.
- Fix description of secretName and secretKey to be consistent
- Change description of manageACLsRole to be more clear.
- Make the added vault role field descriptions consistent
@hc-github-team-consul-core
Copy link
Contributor

🍒 If backport labels were added before merging, cherry-picking will start automatically.

To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/623323.

@hc-github-team-consul-core
Copy link
Contributor

🍒✅ Cherry pick of commit 2bc11a5 onto stable-website succeeded!

hc-github-team-consul-core pushed a commit that referenced this pull request Apr 4, 2022
…ty. (#12669)

* Updating helm docs with additionalVault and ACLs refactor funtionality.

* PR Feedback corrections.

- Fix indentation.
- Fix description of secretName and secretKey to be consistent
- Change description of manageACLsRole to be more clear.
- Make the added vault role field descriptions consistent

* PR Feedback - correcting description for adminPartitionsRole

* Fixing broken shell sessions

* Fixing broken shell sessions by changing shell-session tobecloser tocomment marker
@hc-github-team-consul-core
Copy link
Contributor

🍒✅ Cherry pick of commit 2bc11a5 onto release/1.12.x succeeded!

hc-github-team-consul-core pushed a commit that referenced this pull request Apr 4, 2022
…ty. (#12669)

* Updating helm docs with additionalVault and ACLs refactor funtionality.

* PR Feedback corrections.

- Fix indentation.
- Fix description of secretName and secretKey to be consistent
- Change description of manageACLsRole to be more clear.
- Make the added vault role field descriptions consistent

* PR Feedback - correcting description for adminPartitionsRole

* Fixing broken shell sessions

* Fixing broken shell sessions by changing shell-session tobecloser tocomment marker
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/no-changelog PR does not need a corresponding .changelog entry type/docs Documentation needs to be created/updated/clarified
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants