fix(daml-on-sawtooth): resolve differences between d-o-s and other sa…

…wtooth charts Signed-off-by: Kevin O'Donnell <kevin@blockchaintp.com>
blockchaintp · Feb 12, 2021 · 2425568 · 2425568
1 parent d8e9931
commit 2425568
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/charts/daml-on-sawtooth/templates/serviceaccount.yaml b/charts/daml-on-sawtooth/templates/serviceaccount.yaml
@@ -1,4 +1,3 @@
-# kubetpl:syntax:go-template
 ---
 apiVersion: v1
 kind: ServiceAccount

diff --git a/charts/daml-on-sawtooth/templates/validator-set.yaml b/charts/daml-on-sawtooth/templates/validator-set.yaml
@@ -192,7 +192,10 @@ spec:
         {{ end }}
         - name: settings-tp
           image: {{.Values.images.settings_tp}}
+<<<<<<< HEAD
           imagePullPolicy: {{.Values.sawtooth.containers.settings_tp.imagePullPolicy}}
+=======
+>>>>>>> 4a99d64... fix(daml-on-sawtooth): resolve differences between d-o-s and other sawtooth charts
           command: [ "bash", "-c"]
           args:
           - |
@@ -254,7 +257,10 @@ spec:
               name: sawtooth-signals
         - name: intkey-tp
           image: {{.Values.images.intkey_tp}}
+<<<<<<< HEAD
           imagePullPolicy: {{.Values.sawtooth.containers.intkey_tp.imagePullPolicy}}
+=======
+>>>>>>> 4a99d64... fix(daml-on-sawtooth): resolve differences between d-o-s and other sawtooth charts
           command: [ "bash", "-c"]
           args:
           - |
@@ -531,8 +537,9 @@ spec:
           args:
             - |
               sleep 30
-              source /usr/local/bin/validator_env.sh {{.Values.sawtooth.namespace}} {{.Values.sawtooth.networkName}} \
-                ${POD_NAME} ${POD_IP} ${NODE_NAME} {{.Values.sawtooth.ports.sawnet}}
+              source /usr/local/bin/validator_env.sh {{.Values.sawtooth.namespace}} \
+                {{.Values.sawtooth.networkName}} ${POD_NAME} ${POD_IP} ${NODE_NAME} \
+                {{.Values.sawtooth.ports.sawnet}}
               start_delay=$(( $DELAY * 5 ))
               sleep $start_delay
               if [ ! -r /etc/sawtooth/initialized ]; then
@@ -549,7 +556,8 @@ spec:
             {{ if .Values.sawtooth.permissioned }}
                   /usr/local/bin/identity_genesis_config.sh {{.Values.sawtooth.namespace}}
             {{ end }}
-                  sawset genesis -k /etc/sawtooth/keys/validator.priv -o /etc/sawtooth/genesis/000-genesis.batch
+                  sawset genesis -k /etc/sawtooth/keys/validator.priv \
+                    -o /etc/sawtooth/genesis/000-genesis.batch
                   cd /etc/sawtooth/genesis
                   sawadm genesis `ls |sort`
                   cd -
@@ -573,7 +581,7 @@ spec:
                 --maximum-peer-connectivity 255 \
                 {{- if .Values.sawtooth.opentsdb.enabled }}
                 --opentsdb-db {{.Values.sawtooth.opentsdb.db}} \
-                --opentsdb-url {{ .Values.sawtooth.opentsdb.url}} \
+                --opentsdb-url {{.Values.sawtooth.opentsdb.url}} \
                 {{- end }}
                 ;
               exit_code=$?

diff --git a/charts/daml-on-sawtooth/values.yaml b/charts/daml-on-sawtooth/values.yaml
@@ -13,16 +13,16 @@ affinity:
 # if true then there should exist a secret within the namespace
 #   of the given names, multiple values are acceptable
 imagePullSecrets:
-  enabled: true
+  enabled: false
   value:
     - name: regcred
 sawtooth:
   opentsdb:
     db: metrics
     url:
+    enabled: false
   minReadySeconds: 120
   maxUnavailable: 1
-# .Values.sawtooth.containers.validator.args
   containers:
     jsonapi:
       args: