oxheadalpha · nicolasochem · Mar 24, 2021 · Mar 25, 2021 · Mar 25, 2021 · Mar 25, 2021
diff --git a/README.md b/README.md
@@ -160,7 +160,7 @@ Running either of these commands results in:
 You can find your node in the tqtezos namespace with some status information using `kubectl`.
 
 ```shell
-kubectl -n tqtezos get pods -l appType=tezos
+kubectl -n tqtezos get pods -l appType=tezos-node
 ```
 
 You can monitor (and follow using the `-f` flag) the logs of the snapshot downloader/import container:
@@ -172,7 +172,7 @@ kubectl logs -n tqtezos statefulset/tezos-node -c snapshot-downloader -f
 You can view logs for your node using the following command:
 
 ```shell
-kubectl -n tqtezos logs -l appType=tezos -c tezos-node -f --prefix
+kubectl -n tqtezos logs -l appType=tezos-node -c tezos-node -f --prefix
 ```
 
 IMPORTANT:
@@ -281,13 +281,13 @@ perform the following tasks:
 You can find your node in the tqtezos namespace with some status information using kubectl.
 
 ```shell
-kubectl -n tqtezos get pods -l appType=tezos
+kubectl -n tqtezos get pods -l appType=tezos-node
 ```
 
 You can view (and follow using the `-f` flag) logs for your node using the following command:
 
 ```shell
-kubectl -n tqtezos logs -l appType=tezos -c tezos-node -f --prefix
+kubectl -n tqtezos logs -l appType=tezos-node -c tezos-node -f --prefix
 ```
 
 Congratulations! You now have an operational Tezos based permissioned
@@ -325,7 +325,7 @@ helm upgrade $CHAIN_NAME tqtezos/tezos-chain \
 
 The nodes will start up and establish peer-to-peer connections in a full mesh topology.
 
-List all of your running nodes: `kubectl -n tqtezos get pods -l appType=tezos`
+List all of your running nodes: `kubectl -n tqtezos get pods -l appType=tezos-node`
 
 ## Adding external nodes to the cluster
 
@@ -361,7 +361,7 @@ Congratulations! You now have a multi-node Tezos based permissioned chain.
 On each computer, run this command to check that the nodes have matching heads by comparing their hashes (it may take a minute for the nodes to sync up):
 
 ```shell
-kubectl get pod -n tqtezos -l appType=tezos -o name |
+kubectl get pod -n tqtezos -l appType=tezos-node -o name |
 while read line;
  do kubectl -n tqtezos exec $line -c tezos-node -- /usr/local/bin/tezos-client rpc get /chains/main/blocks/head/hash;
 done

diff --git a/baker-endorser/Dockerfile b/baker-endorser/Dockerfile
@@ -1,4 +1,4 @@
-FROM tezos/tezos:v8-release
+FROM tezos/tezos:v9.0-rc1
 RUN sudo apk add jq bash
 COPY entrypoint.sh /
 ENTRYPOINT ["/entrypoint.sh"]

diff --git a/chain-initiator/Dockerfile b/chain-initiator/Dockerfile
@@ -1,4 +1,4 @@
-FROM tezos/tezos:v8-release
+FROM tezos/tezos:v9.0-rc1
 RUN sudo apk add jq
 COPY entrypoint.sh /
 ENTRYPOINT ["/entrypoint.sh"]

diff --git a/charts/tezos/Chart.lock b/charts/tezos/Chart.lock
diff --git a/charts/tezos/Chart.yaml b/charts/tezos/Chart.yaml
@@ -7,7 +7,3 @@ keywords:
  - tezos
  - blockchain
 home: https://github.com/tqtezos/tezos-k8s
-dependencies:
- - name: authenticated-rpc-tezos-chain
- repository: file://../rpc-auth
- condition: rpc_auth
diff --git a/charts/tezos/templates/_helpers.tpl b/charts/tezos/templates/_helpers.tpl
@@ -26,6 +26,34 @@
 {{- end }}
 {{- end }}
 
+{{/*
+ Don't deploy the baker statefulset and its headless service if
+ there are no bakers specified.
+ Returns a string "true" or empty string which is falsey.
+*/}}
+{{- define "tezos.shouldDeployBakerStatefulset" -}}
+{{- $baking_nodes := .Values.nodes.baking | default dict }}
+{{- if and (not .Values.is_invitation) ($baking_nodes | len) }}
+{{- "true" }}
+{{- else }}
+{{- "" }}
+{{- end }}
+{{- end }}
+
+{{/*
+ Don't deploy the regular node statefulset and its headless service if
+ there are no regular nodes specified.
+ Returns a string "true" or empty string which is falsey.
+*/}}
+{{- define "tezos.shouldDeployRegularNodeStatefulset" -}}
+{{- $regular_nodes := .Values.nodes.regular | default dict }}
+{{- if ($regular_nodes | len) }}
+{{- "true" }}
+{{- else }}
+{{- "" }}
+{{- end }}
+{{- end }}
+
 {{/*
  Checks if a protocol should be activated. There needs to be a protocol_hash
  and protocol_parameters.
@@ -52,3 +80,34 @@
 {{- "" }}
 {{- end }}
 {{- end }}
+
+{{/*
+ BCD indexer
+ Checks if indexer config has an indexer and rpc_url set.
+ Then checks if indexer name is "bcd".
+ Returns the true type or empty string which is falsey.
+*/}}
+{{- define "tezos.shouldDeployBcdIndexer" -}}
+{{- $index_config := .Values.indexer | default dict }}
+{{- if and $index_config.name $index_config.rpc_url }}
+{{- if eq $index_config.name "bcd" }}
+{{- "true" }}
+{{- else }}
+{{- "" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+ Nomadic indexer
+*/}}
+{{- define "tezos.shouldDeployNomadicIndexer" -}}
+{{- $index_config := .Values.indexer | default dict }}
+{{- if and $index_config.name $index_config.rpc_url }}
+{{- if eq $index_config.name "nomadic" }}
+{{- "true" }}
+{{- else }}
+{{- "" }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/tezos/templates/baker.yaml b/charts/tezos/templates/baker.yaml
@@ -57,7 +57,7 @@ spec:
  name: var-volume
 {{ end }}
 ---
-{{- if not .Values.is_invitation }}
+{{- if (include "tezos.shouldDeployBakerStatefulset" .) }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -74,7 +74,7 @@ spec:
  metadata:
  labels:
  app: {{ .Values.baker_statefulset.name }}
- appType: tezos
+ appType: tezos-node
  spec:
  containers:
 {{- include "tezos.container.node" . | indent 8 }}

diff --git a/charts/tezos/templates/bcd_indexer.yaml b/charts/tezos/templates/bcd_indexer.yaml
@@ -0,0 +1,145 @@
+{{- if (include "tezos.shouldDeployBcdIndexer" .) }}
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+ name: {{ .Values.bcd_indexer_statefulset.name }}
+ namespace: {{ .Release.Namespace }}
+spec:
+ podManagementPolicy: Parallel
+ selector:
+ matchLabels:
+ app: {{ .Values.bcd_indexer_statefulset.name }}
+ serviceName: ""
+ template:
+ metadata:
+ labels:
+ app: {{ .Values.bcd_indexer_statefulset.name }}
+ spec:
+ securityContext:
+ fsGroup: 1000
+ containers:
+ - image: bakingbad/bcdhub-api:3.5
+ name: api
+ ports:
+ - containerPort: 14000
+ name: bcd
+ volumeMounts:
+ - mountPath: /etc/bcd
+ name: shared-volume
+ envFrom:
+ - configMapRef:
+ name: bcd-env
+ - configMapRef:
+ name: db-creds
+ - image: bakingbad/bcdhub-indexer:3.5
+ name: indexer
+ volumeMounts:
+ - mountPath: /etc/bcd
+ name: shared-volume
+ envFrom:
+ - configMapRef:
+ name: bcd-env
+ - image: bakingbad/bcdhub-metrics:3.5
+ name: metrics
+ volumeMounts:
+ - mountPath: /etc/bcd
+ name: shared-volume
+ envFrom:
+ - configMapRef:
+ name: bcd-env
+ - configMapRef:
+ name: db-creds
+ - image: postgres:alpine
+ name: db
+ imagePullPolicy: IfNotPresent
+ volumeMounts:
+ - mountPath: /var/lib/postgresql/
+ name: indexer-db
+ envFrom:
+ - configMapRef:
+ name: db-creds
+ - image: rabbitmq:latest
+ name: mq
+ imagePullPolicy: IfNotPresent
+ volumeMounts:
+ - mountPath: /var/lib/rabbitmq/mnesia
+ name: mq-data
+ env:
+ - name: RABBITMQ_DEFAULT_USER
+ value: guest
+ - name: RABBITMQ_DEFAULT_PASS
+ value: guest
+ - image: bakingbad/bcdhub-elastic:3.5
+ name: elastic
+ volumeMounts:
+ - mountPath: /usr/share/elasticsearch/data
+ name: esdata
+ env:
+ - name: "bootstrap.memory_lock"
+ value: "true"
+ - name: "discovery.type"
+ value: single-node
+ - name: ES_JAVA_OPTS
+ value: "-Xms256m -Xmx256m"
+ volumeClaimTemplates:
+ - metadata:
+ name: esdata
+ spec:
+ accessModes:
+ - ReadWriteOnce
+ storageClassName: {{ .Values.bcd_indexer_statefulset.storageClassName }}
+ resources:
+ requests:
+ storage: "300Gi"
+ - metadata:
+ name: mq-data
+ spec:
+ accessModes:
+ - ReadWriteOnce
+ storageClassName: {{ .Values.bcd_indexer_statefulset.storageClassName }}
+ resources:
+ requests:
+ storage: "5Gi"
+ - metadata:
+ name: indexer-db
+ spec:
+ accessModes:
+ - ReadWriteOnce
+ storageClassName: {{ .Values.bcd_indexer_statefulset.storageClassName }}
+ resources:
+ requests:
+ storage: "300Gi"
+ - metadata:
+ name: shared-volume
+ spec:
+ accessModes:
+ - ReadWriteOnce
+ storageClassName: {{ .Values.bcd_indexer_statefulset.storageClassName }}
+ resources:
+ requests:
+ storage: "100Gi"
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: bcd-env
+data:
+ BCD_ENV: sandbox
+ GIN_MODE: debug
+ ELASTIC_HOSTNAME: localhost
+ RABBITMQ_HOSTNAME: localhost
+ DB_HOSTNAME: 127.0.0.1
+ RABBITMQ_DEFAULT_USER: guest
+ RABBITMQ_DEFAULT_PASS: guest
+ SANDBOX_NODE_URI: {{ .Values.indexer.rpc_url }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: db-creds
+data:
+ POSTGRES_USER: root
+ POSTGRES_PASSWORD: root
+ POSTGRES_DB: bcd
+{{- end }}
diff --git a/charts/tezos/templates/node.yaml b/charts/tezos/templates/node.yaml
@@ -1,3 +1,4 @@
+{{- if (include "tezos.shouldDeployRegularNodeStatefulset" .) }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -15,7 +16,7 @@ spec:
  metadata:
  labels:
  app: {{ .Values.regular_node_statefulset.name }}
- appType: tezos
+ appType: tezos-node
  spec:
  containers:
 {{- include "tezos.container.node" . | indent 8 }}
@@ -43,3 +44,4 @@ spec:
  resources:
  requests:
  storage: {{ .Values.regular_node_statefulset.storage_size }}
+{{- end }}