Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

hlf-peer: multi channel support #15321

Merged
merged 2 commits into from
Jul 8, 2019
Merged

hlf-peer: multi channel support #15321

merged 2 commits into from
Jul 8, 2019

Conversation

inzamam-iqbal
Copy link
Collaborator

Signed-off-by: Inzamam [email protected]

@helm-bot helm-bot added the Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). label Jul 8, 2019
@helm-bot helm-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 8, 2019
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 8, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @inzamam-iqbal. Thanks for your PR.

I'm waiting for a helm member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@inzamam-iqbal inzamam-iqbal mentioned this pull request Jul 8, 2019
Merged
@alexvicegrab
Copy link
Collaborator

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 8, 2019
alexvicegrab
alexvicegrab suggested changes Jul 8, 2019
View reviewed changes
stable/hlf-peer/templates/deployment.yaml Outdated
- mountPath: /hl_config/channel
name: channel
{{- if .Values.secrets.channels }}
{{- range .Values.secrets.channels}}
Copy link
Collaborator

Choose a reason for hiding this comment

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

@inzamam-iqbal Please add extra space here, for readability, and indent the range block.

stable/hlf-peer/templates/deployment.yaml Outdated
{{- if .Values.secrets.channel }}
- name: channel
{{- if .Values.secrets.channels }}
{{- range .Values.secrets.channels}}
Copy link
Collaborator

Choose a reason for hiding this comment

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

@inzamam-iqbal Please add extra space here, for readability, and indent the range block.

Copy link
Collaborator

Choose a reason for hiding this comment

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

i.e. {- range .Values.secrets.channels }}

stable/hlf-peer/values.yaml
@@ -89,7 +89,9 @@ secrets:
# tlsClientRootCerts: hlf--ord-tlsrootcert
## This should contain "channel" transaction derived from a configtx.yaml
## configtxgen -profile ComposerChannel -channelID composerchannel -outputCreateChannelTx composerchannel.tx
# channel: hlf--channel
# channels:
Copy link
Collaborator

Choose a reason for hiding this comment

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

@inzamam-iqbal, this update should be reflected in the README.md

alexvicegrab
alexvicegrab suggested changes Jul 8, 2019
View reviewed changes
stable/hlf-peer/README.md Outdated
@@ -107,7 +107,7 @@ The following table lists the configurable parameters of the Hyperledger Fabric
| `secrets.peer.tlsRootCert` | TLS root CA certificate: as 'cert.pem' | `` |
| `secrets.peer.tlsClient` | TLS client secret: as 'tls.crt' and 'tls.key' | `` |
| `secrets.peer.tlsClientRootCerts` | TLS Client root CA certificate files (any name) | `` |
| `secrets.channel` | Secret containing Channel tx for peer to create/join | `` |
| `secrets.channel` | Array of secrets containing channel creation file | `` |
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should be channels

Copy link
Collaborator

Choose a reason for hiding this comment

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

i.e. secrets.channels

Array of secrets containing channel creation file was already correct.

alexvicegrab
alexvicegrab suggested changes Jul 8, 2019
View reviewed changes
stable/hlf-peer/templates/deployment.yaml Outdated
name: channel
{{- if .Values.secrets.channels }}
{{- range .Values.secrets.channels }}
- mountPath: /hl_config/channel/{{.}}
Copy link
Collaborator

Choose a reason for hiding this comment

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

And here, I'd also keep same format, with {{ . }} as above.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Also line below

@inzamam-iqbal inzamam-iqbal force-pushed the hlf-peer_multi_channel_support branch 2 times, most recently from 6ce5f7a to dff56d4 Compare July 8, 2019 18:52
alexvicegrab
alexvicegrab approved these changes Jul 8, 2019
View reviewed changes
Copy link
Collaborator

@alexvicegrab alexvicegrab left a comment

Choose a reason for hiding this comment

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

LGTM

@alexvicegrab
Copy link
Collaborator

/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 8, 2019
@inzamam-iqbal inzamam-iqbal force-pushed the hlf-peer_multi_channel_support branch from dff56d4 to 3d62481 Compare July 8, 2019 18:54
@alexvicegrab
Copy link
Collaborator

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 8, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alexvicegrab, inzamam-iqbal

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit d58c7d4 into helm:master Jul 8, 2019
ThoTischner pushed a commit to bitsbeats/charts that referenced this pull request Aug 13, 2019
@inzamam-iqbal
hlf-peer: multi channel support (helm#15321)
13fe360 
* hlf-peer: multi channel support

Signed-off-by: Inzamam <[email protected]>

* hlf-peer: updated Readme.md

Signed-off-by: Inzamam <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@alexvicegrab alexvicegrab alexvicegrab approved these changes

@nicolapaoli nicolapaoli Awaiting requested review from nicolapaoli

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). lgtm Indicates that a PR is ready to be merged. ok-to-test size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@inzamam-iqbal @k8s-ci-robot @alexvicegrab @helm-bot