From 9bdccb1bcbac5620120916720b88faf193df65a0 Mon Sep 17 00:00:00 2001 From: CharlieC3 <2747302+CharlieC3@users.noreply.github.com> Date: Mon, 15 Jul 2024 15:45:04 -0400 Subject: [PATCH] [stacks-blockchain-api]: fix bns template rendering and default values indentation --- hirosystems/stacks-blockchain-api/Chart.lock | 6 +- hirosystems/stacks-blockchain-api/Chart.yaml | 2 +- .../templates/api-writer/statefulset.yaml | 2 +- hirosystems/stacks-blockchain-api/values.yaml | 157 +++++++++--------- 4 files changed, 83 insertions(+), 84 deletions(-) diff --git a/hirosystems/stacks-blockchain-api/Chart.lock b/hirosystems/stacks-blockchain-api/Chart.lock index 94f7cea..e3bf9bc 100644 --- a/hirosystems/stacks-blockchain-api/Chart.lock +++ b/hirosystems/stacks-blockchain-api/Chart.lock @@ -1,12 +1,12 @@ dependencies: - name: stacks-blockchain repository: https://charts.hiro.so/hirosystems - version: 2.1.0 + version: 2.1.1 - name: postgresql repository: https://charts.bitnami.com/bitnami version: 12.12.10 - name: common repository: https://charts.bitnami.com/bitnami version: 2.20.4 -digest: sha256:236d1fd34c91bdd4fba7e683e141949341fb0867ca79d9e29de4859102990872 -generated: "2024-07-15T13:14:14.287048-04:00" +digest: sha256:4d52477f26e89a82aac9fd61cdcc8b5c267518799fce9479cc7e1fd8843f06d6 +generated: "2024-07-15T15:40:25.385609-04:00" diff --git a/hirosystems/stacks-blockchain-api/Chart.yaml b/hirosystems/stacks-blockchain-api/Chart.yaml index 035c5c5..5de179f 100644 --- a/hirosystems/stacks-blockchain-api/Chart.yaml +++ b/hirosystems/stacks-blockchain-api/Chart.yaml @@ -41,4 +41,4 @@ sources: - https://github.com/hirosystems/stacks-blockchain-api - https://docs.hiro.so/api - https://docs.hiro.so/get-started/stacks-blockchain-api -version: 5.0.8 +version: 5.0.9 diff --git a/hirosystems/stacks-blockchain-api/templates/api-writer/statefulset.yaml b/hirosystems/stacks-blockchain-api/templates/api-writer/statefulset.yaml index 41f006d..35c0fd2 100644 --- a/hirosystems/stacks-blockchain-api/templates/api-writer/statefulset.yaml +++ b/hirosystems/stacks-blockchain-api/templates/api-writer/statefulset.yaml @@ -71,7 +71,7 @@ spec: terminationGracePeriodSeconds: {{ .Values.apiWriter.terminationGracePeriodSeconds }} {{- end }} initContainers: - {{- if .Values.apiWriter.bns.enabled }} + {{- if .Values.apiWriter.config.bns.enabled }} - name: download-bns-data image: alpine imagePullPolicy: IfNotPresent diff --git a/hirosystems/stacks-blockchain-api/values.yaml b/hirosystems/stacks-blockchain-api/values.yaml index 8e0179c..01cc799 100644 --- a/hirosystems/stacks-blockchain-api/values.yaml +++ b/hirosystems/stacks-blockchain-api/values.yaml @@ -367,87 +367,86 @@ apiWriter: ## - e2e-az2 ## values: [] - - ## @param apiWriter.affinity Affinity for Stacks Blockchain API Writer pods assignment - ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity - ## NOTE: `apiWriter.podAffinityPreset`, `apiWriter.podAntiAffinityPreset`, and `apiWriter.nodeAffinityPreset` will be ignored when it's set - ## - affinity: {} - ## @param apiWriter.nodeSelector Node labels for Stacks Blockchain API Writer pods assignment - ## ref: https://kubernetes.io/docs/user-guide/node-selection/ - ## - nodeSelector: {} - ## @param apiWriter.tolerations Tolerations for Stacks Blockchain API Writer pods assignment - ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - ## - tolerations: [] - ## @param apiWriter.updateStrategy.type Stacks Blockchain API Writer statefulset strategy type - ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies + ## @param apiWriter.affinity Affinity for Stacks Blockchain API Writer pods assignment + ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity + ## NOTE: `apiWriter.podAffinityPreset`, `apiWriter.podAntiAffinityPreset`, and `apiWriter.nodeAffinityPreset` will be ignored when it's set + ## + affinity: {} + ## @param apiWriter.nodeSelector Node labels for Stacks Blockchain API Writer pods assignment + ## ref: https://kubernetes.io/docs/user-guide/node-selection/ + ## + nodeSelector: {} + ## @param apiWriter.tolerations Tolerations for Stacks Blockchain API Writer pods assignment + ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + ## + tolerations: [] + ## @param apiWriter.updateStrategy.type Stacks Blockchain API Writer statefulset strategy type + ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies + ## + updateStrategy: + ## StrategyType + ## Can be set to RollingUpdate or OnDelete ## - updateStrategy: - ## StrategyType - ## Can be set to RollingUpdate or OnDelete - ## - type: RollingUpdate + type: RollingUpdate - ## @param apiWriter.priorityClassName Stacks Blockchain API Writer pods' priorityClassName - ## - priorityClassName: "" - ## @param apiWriter.topologySpreadConstraints Topology Spread Constraints for pod assignment spread across your cluster among failure-domains. Evaluated as a template - ## Ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/#spread-constraints-for-pods - ## - topologySpreadConstraints: [] - ## @param apiWriter.schedulerName Name of the k8s scheduler (other than default) for Stacks Blockchain API Writer pods - ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ - ## - schedulerName: "" - ## @param apiWriter.terminationGracePeriodSeconds Seconds Redmine pod needs to terminate gracefully - ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods - ## - terminationGracePeriodSeconds: "" - ## @param apiWriter.lifecycleHooks for the Stacks Blockchain API Writer container(s) to automate configuration before or after startup - ## - lifecycleHooks: {} - ## @param apiWriter.extraEnvVars Array with extra environment variables to add to Stacks Blockchain API Writer nodes - ## e.g: - ## extraEnvVars: - ## - name: FOO - ## value: "bar" - ## - extraEnvVars: [] - ## @param apiWriter.extraEnvVarsCM Name of existing ConfigMap containing extra env vars for Stacks Blockchain API Writer nodes - ## - extraEnvVarsCM: "" - ## @param apiWriter.extraEnvVarsSecret Name of existing Secret containing extra env vars for Stacks Blockchain API Writer nodes - ## - extraEnvVarsSecret: "" - ## @param apiWriter.extraVolumes Optionally specify extra list of additional volumes for the Stacks Blockchain API Writer pod(s) - ## - extraVolumes: [] - ## @param apiWriter.extraVolumeMounts Optionally specify extra list of additional volumeMounts for the Stacks Blockchain API Writer container(s) - ## - extraVolumeMounts: [] - ## @param apiWriter.sidecars Add additional sidecar containers to the Stacks Blockchain API Writer pod(s) - ## e.g: - ## sidecars: - ## - name: your-image-name - ## image: your-image - ## imagePullPolicy: Always - ## ports: - ## - name: portname - ## containerPort: 1234 - ## - sidecars: [] - ## @param apiWriter.initContainers Add additional init containers to the Stacks Blockchain API Writer pod(s) - ## ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ - ## e.g: - ## initContainers: - ## - name: your-image-name - ## image: your-image - ## imagePullPolicy: Always - ## command: ['sh', '-c', 'echo "hello world"'] - ## - initContainers: [] + ## @param apiWriter.priorityClassName Stacks Blockchain API Writer pods' priorityClassName + ## + priorityClassName: "" + ## @param apiWriter.topologySpreadConstraints Topology Spread Constraints for pod assignment spread across your cluster among failure-domains. Evaluated as a template + ## Ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/#spread-constraints-for-pods + ## + topologySpreadConstraints: [] + ## @param apiWriter.schedulerName Name of the k8s scheduler (other than default) for Stacks Blockchain API Writer pods + ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ + ## + schedulerName: "" + ## @param apiWriter.terminationGracePeriodSeconds Seconds Redmine pod needs to terminate gracefully + ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods + ## + terminationGracePeriodSeconds: "" + ## @param apiWriter.lifecycleHooks for the Stacks Blockchain API Writer container(s) to automate configuration before or after startup + ## + lifecycleHooks: {} + ## @param apiWriter.extraEnvVars Array with extra environment variables to add to Stacks Blockchain API Writer nodes + ## e.g: + ## extraEnvVars: + ## - name: FOO + ## value: "bar" + ## + extraEnvVars: [] + ## @param apiWriter.extraEnvVarsCM Name of existing ConfigMap containing extra env vars for Stacks Blockchain API Writer nodes + ## + extraEnvVarsCM: "" + ## @param apiWriter.extraEnvVarsSecret Name of existing Secret containing extra env vars for Stacks Blockchain API Writer nodes + ## + extraEnvVarsSecret: "" + ## @param apiWriter.extraVolumes Optionally specify extra list of additional volumes for the Stacks Blockchain API Writer pod(s) + ## + extraVolumes: [] + ## @param apiWriter.extraVolumeMounts Optionally specify extra list of additional volumeMounts for the Stacks Blockchain API Writer container(s) + ## + extraVolumeMounts: [] + ## @param apiWriter.sidecars Add additional sidecar containers to the Stacks Blockchain API Writer pod(s) + ## e.g: + ## sidecars: + ## - name: your-image-name + ## image: your-image + ## imagePullPolicy: Always + ## ports: + ## - name: portname + ## containerPort: 1234 + ## + sidecars: [] + ## @param apiWriter.initContainers Add additional init containers to the Stacks Blockchain API Writer pod(s) + ## ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ + ## e.g: + ## initContainers: + ## - name: your-image-name + ## image: your-image + ## imagePullPolicy: Always + ## command: ['sh', '-c', 'echo "hello world"'] + ## + initContainers: [] ## @section Persistence Parameters