Skip to content

Commit ddcf952

Browse files
committed
Address review feedback
1 parent 566ce2a commit ddcf952

3 files changed

Lines changed: 16 additions & 14 deletions

File tree

ansible/roles/controller-ccv/templates/chainlet/chainlet-deploy.yml.tmpl.j2

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,17 @@ spec:
126126
value: "{{ .ChainPeers }}"
127127
- name: NODE_KEY
128128
value: "{{ .NodeKey }}"
129-
{{- if .ValidatorKey }}
130-
- name: VALIDATOR_KEY
131-
value: "{{ .ValidatorKey }}"
132-
{{- else }}
129+
{% if controller_remote_signer_enabled %}
133130
- name: REMOTE_SIGNER_ENABLED
134131
value: "true"
135132
- name: PRIV_VALIDATOR_LADDR
136133
value: "tcp://0.0.0.0:26658"
134+
{% else %}
135+
{{- if .ValidatorKey }}
136+
- name: VALIDATOR_KEY
137+
value: "{{ .ValidatorKey }}"
137138
{{- end }}
139+
{% endif %}
138140
- name: OPTS
139141
value: "--pruning %%% pruning_strategy %%% --json-rpc.gas-cap 50000004 --api.enable=false --grpc.enable=true"
140142
- name: CHAINID
@@ -207,10 +209,10 @@ spec:
207209
- containerPort: 8545
208210
- containerPort: 8546
209211
- containerPort: 26660
210-
{{- if not .ValidatorKey }}
212+
{% if controller_remote_signer_enabled %}
211213
- containerPort: 26658
212214
name: privval
213-
{{- end }}
215+
{% endif %}
214216
resources:
215217
%%% controller_chainlet_resources | to_nice_yaml(indent=2) | indent(12, true) | trim %%%
216218
volumeMounts:

ansible/roles/controller/defaults/main.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@ controller_relayer_version: "0.4.2"
2626
controller_relayer_wait_time: "0"
2727
# Load Balancer Configuration
2828
controller_chainlet_external_traffic_policy: Cluster
29-
controller_chainlet_allocate_loadbalancer_node_ports: false
29+
controller_chainlet_allocate_loadbalancer_node_ports: false
30+
31+
# Signer
32+
controller_remote_signer_enabled: false

ansible/roles/controller/templates/chainlet/chainlet-deploy.yml.tmpl.j2

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,12 @@ spec:
8686
value: "%%% stake_owner_address %%%"
8787
- name: KEYPASSWD
8888
value: "%%% keychain_password %%%"
89-
{{- if .ValidatorKey }}
90-
- name: VALIDATOR_KEY
91-
value: "{{ .ValidatorKey }}"
92-
{{- else }}
89+
{% if controller_remote_signer_enabled %}
9390
- name: REMOTE_SIGNER_ENABLED
9491
value: "true"
9592
- name: PRIV_VALIDATOR_LADDR
9693
value: "tcp://0.0.0.0:26658"
97-
{{- end }}
94+
{% endif %}
9895
- name: AWS_ACCESS_KEY_ID
9996
value: "%%% aws_access_key_id %%%"
10097
- name: AWS_SECRET_ACCESS_KEY
@@ -141,10 +138,10 @@ spec:
141138
- containerPort: 8545
142139
- containerPort: 8546
143140
- containerPort: 26660
144-
{{- if not .ValidatorKey }}
141+
{% if controller_remote_signer_enabled %}
145142
- containerPort: 26658
146143
name: privval
147-
{{- end }}
144+
{% endif %}
148145
resources:
149146
%%% controller_chainlet_resources | to_nice_yaml(indent=2) | indent(12, true) | trim %%%
150147
volumeMounts:

0 commit comments

Comments
 (0)