diff --git a/charts/chronicle-on-sawtooth/Chart.yaml b/charts/chronicle-on-sawtooth/Chart.yaml index 5580d28..10396da 100644 --- a/charts/chronicle-on-sawtooth/Chart.yaml +++ b/charts/chronicle-on-sawtooth/Chart.yaml @@ -21,7 +21,7 @@ version: 0.1.24 # This is the version number of Chronicle being deployed. This version # number should be incremented each time you make changes to Chronicle. -appVersion: 0.7.4 +appVersion: 0.7.6 dependencies: - name: standard-defs diff --git a/charts/chronicle-on-sawtooth/templates/chronicle-init.yaml b/charts/chronicle-on-sawtooth/templates/chronicle-init.yaml index 90fdd15..faefac2 100644 --- a/charts/chronicle-on-sawtooth/templates/chronicle-init.yaml +++ b/charts/chronicle-on-sawtooth/templates/chronicle-init.yaml @@ -163,7 +163,7 @@ spec: --sawtooth-address tcp://$HOST:$PORT \ get-policy \ --id {{ .Values.opa.policy.id }} \ - --output /shared-data/policy.bin + --output /shared-data/policy.bin || true if [ -f "/shared-data/policy.bin" ]; then echo "Policy already set." @@ -200,7 +200,7 @@ spec: set-policy \ --id {{ .Values.opa.policy.id }} \ -p {{ .Values.opa.policy.url }} \ - --root-key /shared-data/root.pem + --root-key /shared-data/root.pem || true fi env: {{ include "lib.safeToYaml" .Values.env | nindent 12 }} - name: HOST diff --git a/charts/chronicle-on-sawtooth/templates/statefulset.yaml b/charts/chronicle-on-sawtooth/templates/statefulset.yaml index d798987..ce3124c 100644 --- a/charts/chronicle-on-sawtooth/templates/statefulset.yaml +++ b/charts/chronicle-on-sawtooth/templates/statefulset.yaml @@ -160,7 +160,7 @@ spec: - bash - -c - | - PROBE_ID="startup_$(LC_ALL=C tr -dc A-Za-z0-9 /tmp/import.json && echo "Probe ID: $PROBE_ID" && - chronicle \ + RUST_LOG=error chronicle \ -c /etc/chronicle/config/config.toml \ --console-logging json \ --sawtooth tcp://{{ include "chronicle.sawtooth.service" . }}:{{ include "chronicle.sawtooth.sawcomp" . }} \ @@ -197,7 +197,7 @@ spec: {{- if not .Values.opa.enabled }} --embedded-opa-policy \ {{- end }} - import {{ .Values.livenessProbe.namespaceName }} {{ .Values.livenessProbe.namespaceUuid }} < /tmp/import.json + import {{ .Values.livenessProbe.namespaceName }} {{ .Values.livenessProbe.namespaceUuid }} /tmp/import.json initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.livenessProbe.periodSeconds }} timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} @@ -236,7 +236,7 @@ spec: } ]' > /tmp/import.json && echo "Probe ID: $PROBE_ID" && - chronicle \ + RUST_LOG=error chronicle \ -c /etc/chronicle/config/config.toml \ --console-logging json \ --sawtooth tcp://{{ include "chronicle.sawtooth.service" . }}:{{ include "chronicle.sawtooth.sawcomp" . }} \ @@ -247,7 +247,7 @@ spec: {{- if not .Values.opa.enabled }} --embedded-opa-policy \ {{- end }} - import {{ .Values.startUpProbe.namespaceName }} {{ .Values.startUpProbe.namespaceUuid }} < /tmp/import.json + import {{ .Values.startUpProbe.namespaceName }} {{ .Values.startUpProbe.namespaceUuid }} /tmp/import.json initialDelaySeconds: {{ .Values.startUpProbe.initialDelaySeconds }} periodSeconds: {{ .Values.startUpProbe.periodSeconds }} timeoutSeconds: {{ .Values.startUpProbe.timeoutSeconds }} diff --git a/charts/chronicle-on-sawtooth/values.yaml b/charts/chronicle-on-sawtooth/values.yaml index 8b170de..ad58b28 100644 --- a/charts/chronicle-on-sawtooth/values.yaml +++ b/charts/chronicle-on-sawtooth/values.yaml @@ -46,7 +46,7 @@ startUpProbe: ## @md | `startUpProbe.periodSeconds` | how often (in seconds) to perform the probe | 10 | periodSeconds: 10 ## @md | `startUpProbe.timeoutSeconds` | number of seconds after which the probe times out | 3 | - timeoutSeconds: 3 + timeoutSeconds: 30 ## @md | `startUpProbe.namespaceName` | the Chronicle namespace in which the probe operates | default | namespaceName: default ## @md | `startUpProbe.namespaceUuid` | the UUID of the Chronicle namespace in which the probe operates | fd717fd6-70f1-44c1-81de-287d5e101089 | @@ -64,7 +64,7 @@ devIdProvider: ## @md | `devIdProvider.image.repository` | the image repository | blockchaintp/id-provider | repository: blockchaintp/id-provider-amd64 ## @md | `devIdProvider.image.tag` | the image tag | latest | - tag: BTP2.1.0-0.7.3 + tag: BTP2.1.0-0.7.6 ## @md | `extraVolumes` | a list of additional volumes to add to chronicle | [] | extraVolumes: [] @@ -75,7 +75,7 @@ image: ## @md | `image.repository` | the repository of the image | blockchaintp/chronicle | repository: blockchaintp/chronicle-amd64 ## @md | `image.tag`| the tag of the image to use | latest | - tag: BTP2.1.0-0.7.3 + tag: BTP2.1.0-0.7.6 ## @md | `image.pullPolicy` | the image pull policy to use | IfNotPresent | pullPolicy: IfNotPresent @@ -128,7 +128,7 @@ opa: ## @md | `image.repository` | the repository of the image | blockchaintp/chronicle | repository: blockchaintp/opactl-amd64 ## @md | `image.tag`| the tag of the image to use | latest | - tag: BTP2.1.0-0.7.3 + tag: BTP2.1.0-0.7.6 policy: entrypoint: allow_transactions.allowed_users id: allow_transactions @@ -138,7 +138,7 @@ opa: ## @md | `image.repository` | the repository of the image | blockchaintp/chronicle | repository: blockchaintp/opa-tp-amd64 ## @md | `image.tag`| the tag of the image to use | latest | - tag: BTP2.1.0-0.7.3 + tag: BTP2.1.0-0.7.6 ## @md | `image.pullPolicy` | the image pull policy to use | IfNotPresent | pullPolicy: IfNotPresent ## @md | `opa.tp.resources` | resources | map | nil | @@ -172,7 +172,7 @@ test: ## @md | `test.api.image.repository` | the image repository | blockchaintp/chronicle-helm-api-test | repository: blockchaintp/chronicle-helm-api-test-amd64 ## @md | `test.api.image.tag` | the image tag | latest | - tag: BTP2.1.0-0.7.3 + tag: BTP2.1.0-0.7.6 ## @md | `test.auth` | test the chronicle auth server API | auth: ## @md | `test.auth.enabled` | true to enable auth-related testing | false | @@ -248,7 +248,7 @@ tp: ## @md | `tp.image.repository` | the image repository | blockchaintp/chronicle-tp | repository: blockchaintp/chronicle-tp-amd64 ## @md | `tp.image.tag` | the image tag | latest | - tag: BTP2.1.0-0.7.3 + tag: BTP2.1.0-0.7.6 ## @md | `tp.extraVolumes` | extra volumes declarations for the chronicle-tp deployment | list | nil extraVolumes: ## @md | `tp.extraVolumeMounts` | extra volume mounts for chronicle-tp deployment | list | nil diff --git a/charts/chronicle/Chart.yaml b/charts/chronicle/Chart.yaml index 5580d28..9ca4cf2 100644 --- a/charts/chronicle/Chart.yaml +++ b/charts/chronicle/Chart.yaml @@ -1,6 +1,6 @@ --- apiVersion: v2 -name: chronicle-on-sawtooth +name: chronicle description: | Chronicle is an open-source, blockchain-backed, domain-agnostic provenance product. Chronicle makes it easy for users to record and query immutable @@ -21,7 +21,7 @@ version: 0.1.24 # This is the version number of Chronicle being deployed. This version # number should be incremented each time you make changes to Chronicle. -appVersion: 0.7.4 +appVersion: 0.7.6 dependencies: - name: standard-defs diff --git a/charts/chronicle/templates/chronicle-init.yaml b/charts/chronicle/templates/chronicle-init.yaml index 90fdd15..faefac2 100644 --- a/charts/chronicle/templates/chronicle-init.yaml +++ b/charts/chronicle/templates/chronicle-init.yaml @@ -163,7 +163,7 @@ spec: --sawtooth-address tcp://$HOST:$PORT \ get-policy \ --id {{ .Values.opa.policy.id }} \ - --output /shared-data/policy.bin + --output /shared-data/policy.bin || true if [ -f "/shared-data/policy.bin" ]; then echo "Policy already set." @@ -200,7 +200,7 @@ spec: set-policy \ --id {{ .Values.opa.policy.id }} \ -p {{ .Values.opa.policy.url }} \ - --root-key /shared-data/root.pem + --root-key /shared-data/root.pem || true fi env: {{ include "lib.safeToYaml" .Values.env | nindent 12 }} - name: HOST diff --git a/charts/chronicle/templates/statefulset.yaml b/charts/chronicle/templates/statefulset.yaml index fa7d4cb..ce3124c 100644 --- a/charts/chronicle/templates/statefulset.yaml +++ b/charts/chronicle/templates/statefulset.yaml @@ -87,7 +87,7 @@ spec: name: {{ .Values.postgres.existingPasswordSecret }} key: {{ .Values.postgres.existingPasswordSecretKey }} {{- else }} - value: {{ .Values.postgres.password | quote }} + value: {{ .Values.postgres.password }} {{- end }} {{- include "lib.safeToYaml" .Values.postgres.env | nindent 12 }} volumeMounts: @@ -140,7 +140,7 @@ spec: name: {{ .Values.postgres.existingPasswordSecret }} key: {{ .Values.postgres.existingPasswordSecretKey }} {{- else }} - value: {{ .Values.postgres.password | quote }} + value: {{ .Values.postgres.password }} {{- end }} {{- include "lib.safeToYaml" .Values.postgres.env | nindent 12 }} resources: {{- include "lib.safeToYaml" .Values.resources | nindent 12 }} @@ -160,7 +160,7 @@ spec: - bash - -c - | - PROBE_ID="startup_$(LC_ALL=C tr -dc A-Za-z0-9 /tmp/import.json && echo "Probe ID: $PROBE_ID" && - chronicle \ + RUST_LOG=error chronicle \ -c /etc/chronicle/config/config.toml \ --console-logging json \ --sawtooth tcp://{{ include "chronicle.sawtooth.service" . }}:{{ include "chronicle.sawtooth.sawcomp" . }} \ @@ -197,7 +197,7 @@ spec: {{- if not .Values.opa.enabled }} --embedded-opa-policy \ {{- end }} - import {{ .Values.livenessProbe.namespaceName }} {{ .Values.livenessProbe.namespaceUuid }} < /tmp/import.json + import {{ .Values.livenessProbe.namespaceName }} {{ .Values.livenessProbe.namespaceUuid }} /tmp/import.json initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.livenessProbe.periodSeconds }} timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} @@ -236,7 +236,7 @@ spec: } ]' > /tmp/import.json && echo "Probe ID: $PROBE_ID" && - chronicle \ + RUST_LOG=error chronicle \ -c /etc/chronicle/config/config.toml \ --console-logging json \ --sawtooth tcp://{{ include "chronicle.sawtooth.service" . }}:{{ include "chronicle.sawtooth.sawcomp" . }} \ @@ -247,7 +247,7 @@ spec: {{- if not .Values.opa.enabled }} --embedded-opa-policy \ {{- end }} - import {{ .Values.startUpProbe.namespaceName }} {{ .Values.startUpProbe.namespaceUuid }} < /tmp/import.json + import {{ .Values.startUpProbe.namespaceName }} {{ .Values.startUpProbe.namespaceUuid }} /tmp/import.json initialDelaySeconds: {{ .Values.startUpProbe.initialDelaySeconds }} periodSeconds: {{ .Values.startUpProbe.periodSeconds }} timeoutSeconds: {{ .Values.startUpProbe.timeoutSeconds }} diff --git a/charts/chronicle/values.yaml b/charts/chronicle/values.yaml index 0159d7d..12d4c6d 100644 --- a/charts/chronicle/values.yaml +++ b/charts/chronicle/values.yaml @@ -64,7 +64,7 @@ devIdProvider: ## @md | `devIdProvider.image.repository` | the image repository | blockchaintp/id-provider | repository: blockchaintp/id-provider-amd64 ## @md | `devIdProvider.image.tag` | the image tag | latest | - tag: BTP2.1.0-0.7.4 + tag: BTP2.1.0-0.7.6 ## @md | `extraVolumes` | a list of additional volumes to add to chronicle | [] | extraVolumes: [] @@ -75,7 +75,7 @@ image: ## @md | `image.repository` | the repository of the image | blockchaintp/chronicle | repository: blockchaintp/chronicle-amd64 ## @md | `image.tag`| the tag of the image to use | latest | - tag: BTP2.1.0-0.7.4 + tag: BTP2.1.0-0.7.6 ## @md | `image.pullPolicy` | the image pull policy to use | IfNotPresent | pullPolicy: IfNotPresent @@ -128,7 +128,7 @@ opa: ## @md | `image.repository` | the repository of the image | blockchaintp/chronicle | repository: blockchaintp/opactl-amd64 ## @md | `image.tag`| the tag of the image to use | latest | - tag: BTP2.1.0-0.7.4 + tag: BTP2.1.0-0.7.6 policy: entrypoint: allow_transactions.allowed_users id: allow_transactions @@ -138,7 +138,7 @@ opa: ## @md | `image.repository` | the repository of the image | blockchaintp/chronicle | repository: blockchaintp/opa-tp-amd64 ## @md | `image.tag`| the tag of the image to use | latest | - tag: BTP2.1.0-0.7.4 + tag: BTP2.1.0-0.7.6 ## @md | `image.pullPolicy` | the image pull policy to use | IfNotPresent | pullPolicy: IfNotPresent ## @md | `opa.tp.resources` | resources | map | nil | @@ -172,7 +172,7 @@ test: ## @md | `test.api.image.repository` | the image repository | blockchaintp/chronicle-helm-api-test | repository: blockchaintp/chronicle-helm-api-test-amd64 ## @md | `test.api.image.tag` | the image tag | latest | - tag: BTP2.1.0-0.7.4 + tag: BTP2.1.0-0.7.6 ## @md | `test.auth` | test the chronicle auth server API | auth: ## @md | `test.auth.enabled` | true to enable auth-related testing | true | @@ -248,7 +248,7 @@ tp: ## @md | `tp.image.repository` | the image repository | blockchaintp/chronicle-tp | repository: blockchaintp/chronicle-tp-amd64 ## @md | `tp.image.tag` | the image tag | latest | - tag: BTP2.1.0-0.7.4 + tag: BTP2.1.0-0.7.6 ## @md | `tp.extraVolumes` | extra volumes declarations for the chronicle-tp deployment | list | nil extraVolumes: ## @md | `tp.extraVolumeMounts` | extra volume mounts for chronicle-tp deployment | list | nil