-
Notifications
You must be signed in to change notification settings - Fork 11
cluster, helm: Add new Helm-chart "splice-info" #332
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
giner
wants to merge
1
commit into
hyperledger-labs:main
Choose a base branch
from
giner:stas/cluster_helm_add_info
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| apiVersion: v2 | ||
| name: splice-info | ||
| version: VERSION_NUMBER | ||
| appVersion: VERSION_NUMBER | ||
|
|
||
| description: "A simple web server that serves JSON files with deployment and runtime information." |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: {{ .Release.Name }}-config | ||
| namespace: {{ .Release.Namespace }} | ||
| data: | ||
| staticfile.conf: | | ||
| add_header Cache-Control no-cache; | ||
|
|
||
| types { | ||
| {{ .Values.contentType }} html; | ||
| } |
40 changes: 40 additions & 0 deletions
40
cluster/helm/splice-info/templates/configmap-content-static.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| {{- define "configmap-content-static" }} | ||
| deploymentInfo: | ||
| network: {{ .Values.deploymentDetails.network | quote }} | ||
| sv: | ||
| version: {{ .Values.deploymentDetails.sv.version | quote }} | ||
| configDigest: | ||
| {{- with .Values.deploymentDetails.configDigest }} | ||
| allowed-ip-ranges: {{ printf "%s:%s" .allowedIpRanges.type .allowedIpRanges.value | quote }} | ||
| approved-sv-id-values: {{ printf "%s:%s" .approvedSvIdentities.type .approvedSvIdentities.value | quote }} | ||
| {{- end }} | ||
| synchronizer: | ||
| {{- with .Values.deploymentDetails.synchronizer }} | ||
| active: | ||
| version: {{ .active.version | quote }} | ||
| migrationId: {{ .active.migrationId }} | ||
| chainIdSuffix: {{ .active.chainIdSuffix | quote }} | ||
| staging: | ||
| {{- if .staging }} | ||
| version: {{ .staging.version | quote }} | ||
| migrationId: {{ .staging.migrationId }} | ||
| chainIdSuffix: {{ .staging.chainIdSuffix | quote }} | ||
| {{- end }} | ||
| legacy: | ||
| {{- if .legacy }} | ||
| version: {{ .legacy.version | quote }} | ||
| migrationId: {{ .legacy.migrationId }} | ||
| chainIdSuffix: {{ .legacy.chainIdSuffix | quote }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| {{- if .Values.deploymentDetails }} | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: {{ .Release.Name }}-content-static | ||
| namespace: {{ .Release.Namespace }} | ||
| data: | ||
| index.html: {{ include "configmap-content-static" . | fromYaml | toJson | quote }} | ||
| {{- end }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: {{ .Release.Name }} | ||
| namespace: {{ .Release.Namespace }} | ||
| spec: | ||
| replicas: 1 | ||
| selector: | ||
| matchLabels: | ||
| app: {{ .Release.Name }} | ||
| template: | ||
| metadata: | ||
| labels: | ||
| app: {{ .Release.Name }} | ||
| spec: | ||
| containers: | ||
| - name: nginx | ||
| image: {{ .Values.nginxImage }} | ||
| ports: | ||
| - containerPort: 80 | ||
| volumeMounts: | ||
| - name: config | ||
| mountPath: /etc/nginx/conf.d/staticfile.conf | ||
| subPath: staticfile.conf | ||
| {{- if .Values.deploymentDetails }} | ||
| - name: content-static | ||
| mountPath: /usr/share/nginx/html | ||
| {{- end }} | ||
| {{- if .Values.runtimeDetails }} | ||
| - name: content-runtime | ||
| mountPath: /usr/share/nginx/html/runtime | ||
| readOnly: true | ||
| {{- end }} | ||
| resources: | ||
| {{ toYaml .Values.resources | nindent 12 }} | ||
| {{- if .Values.runtimeDetails }} | ||
| - name: content-runtime-updater | ||
| image: {{ .Values.nginxImage }} | ||
| command: ["/bin/sh", "-c"] | ||
| args: | ||
| - | | ||
| set -eu; | ||
|
|
||
| period=60; | ||
|
|
||
| html_dir=/usr/share/nginx/html; | ||
| runtime_index_file="$html_dir/runtime/index.html"; | ||
|
|
||
| dso_json_path=runtime/dso.json; | ||
| dso_json_file="$html_dir/$dso_json_path"; | ||
|
|
||
| echo "{\"dso\": \"/$dso_json_path\"}" > "$runtime_index_file"; | ||
|
|
||
| while true; do | ||
| start_time=$(date +%s); | ||
| exit_code=0; | ||
|
|
||
| if curl -m 10 -fsS "$SCAN_URL/api/scan/v0/dso" > "$dso_json_file.new"; then | ||
| mv "$dso_json_file.new" "$dso_json_file"; | ||
| else | ||
| exit_code=$?; | ||
| echo "ERROR: Failed to fetch DSO from $SCAN_URL"; | ||
| fi; | ||
|
|
||
| end_time=$(date +%s); | ||
| sleep "$((period - (end_time - start_time)))"; | ||
|
|
||
| if [ "$exit_code" -ne 0 ]; then | ||
| exit $exit_code; | ||
| fi; | ||
| done; | ||
| env: | ||
| - name: SCAN_URL | ||
| value: {{ .Values.runtimeDetails.scanUrl | quote }} | ||
| volumeMounts: | ||
| - name: content-runtime | ||
| mountPath: /usr/share/nginx/html/runtime | ||
| {{- end }} | ||
| volumes: | ||
| - name: config | ||
| configMap: | ||
| name: {{ .Release.Name }}-config | ||
| {{- if .Values.deploymentDetails }} | ||
| - name: content-static | ||
| configMap: | ||
| name: {{ .Release.Name }}-content-static | ||
| {{- end }} | ||
| {{- if .Values.runtimeDetails }} | ||
| - name: content-runtime | ||
| emptyDir: | ||
| sizeLimit: 10Mi | ||
| medium: Memory | ||
| {{- end }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| name: {{ .Release.Name }} | ||
| namespace: {{ .Release.Namespace }} | ||
| spec: | ||
| selector: | ||
| app: {{ .Release.Name }} | ||
| ports: | ||
| - protocol: TCP | ||
| port: 80 | ||
| targetPort: 80 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| nginxImage: nginx:latest # Replace `:latest` with `@sha256:digest` of a chosen image for security reasons | ||
| contentType: "application/json" | ||
|
|
||
| # runtimeDetails: # optional, exposes the runtime configuration under path /runtime/ | ||
| # scanUrl: https://scan.sv.global.canton.network.xxx | ||
|
|
||
| # deploymentDetails: # optional, exposes static configuration under path / | ||
| # network: "dev" | ||
| # configDigest: | ||
| # allowedIpRanges: | ||
| # type: "md5" | ||
| # value: "AAA" | ||
| # approvedSvIdentities: | ||
| # type: "sha256" | ||
| # value: "BBB" | ||
| # sv: | ||
| # version: "0.3.3" | ||
| # synchronizer: | ||
| # active: | ||
| # chainIdSuffix: "id0" | ||
| # migrationId: 4 | ||
| # version: "0.3.3" | ||
| # staging: | ||
| # chainIdSuffix: "id1" | ||
| # migrationId: 5 | ||
| # version: "0.3.4" | ||
| # legacy: null | ||
|
|
||
| resources: | ||
| limits: | ||
| cpu: 500m | ||
| memory: 512Mi | ||
| requests: | ||
| cpu: 250m | ||
| memory: 256Mi |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-07/schema#", | ||
| "$defs": { | ||
| "synchronizer": { | ||
| "type": "object", | ||
| "required": [ "chainIdSuffix", "migrationId", "version" ], | ||
| "additionalProperties": false, | ||
| "properties": { | ||
| "chainIdSuffix": { "type": "string", "minLength": 1 }, | ||
| "migrationId": { "type": "integer", "minimum": 0, "maximum": 9 }, | ||
| "version": { "type": "string", "minLength": 1 } | ||
| } | ||
| }, | ||
| "digest": { | ||
| "type": "object", | ||
| "required": [ "type", "value" ], | ||
| "additionalProperties": false, | ||
| "properties": { | ||
| "type": { "type": "string", "enum": ["md5", "sha1", "sha256"] }, | ||
| "value": { "type": "string", "minLength": 1 } | ||
| } | ||
| } | ||
| }, | ||
| "type": "object", | ||
| "required": [ "resources", "nginxImage", "contentType" ], | ||
| "properties": { | ||
| "nginxImage": { | ||
| "type": "string", | ||
| "description": "The Docker image to use for Nginx. Defaults to 'nginx:latest' if not present." | ||
| }, | ||
| "contentType": { | ||
| "type": "string", | ||
| "description": "The content type for the Nginx server. Defaults to 'application/json' if not present." | ||
| }, | ||
| "runtimeDetails": { | ||
| "type": "object", | ||
| "required": [ "scanUrl" ], | ||
| "additionalProperties": false, | ||
| "properties": { | ||
| "scanUrl": { "type": "string", "minLength": 1 } | ||
| } | ||
| }, | ||
| "deploymentDetails": { | ||
| "type": "object", | ||
| "required": [ "network", "configDigest", "sv", "synchronizer" ], | ||
| "additionalProperties": false, | ||
| "properties": { | ||
| "network": { | ||
| "type": "string", | ||
| "enum": ["dev", "test", "main"] | ||
| }, | ||
| "configDigest": { | ||
| "type": "object", | ||
| "required": [ "allowedIpRanges", "approvedSvIdentities" ], | ||
| "additionalProperties": false, | ||
| "properties": { | ||
| "allowedIpRanges": { "$ref": "#/$defs/digest" }, | ||
| "approvedSvIdentities": { "$ref": "#/$defs/digest" } | ||
| } | ||
| }, | ||
| "sv": { | ||
| "type": "object", | ||
| "required": ["version"], | ||
| "additionalProperties": false, | ||
| "properties": { | ||
| "version": { "type": "string", "minLength": 1 } | ||
| } | ||
| }, | ||
| "synchronizer": { | ||
| "type": "object", | ||
| "required": ["active"], | ||
| "additionalProperties": false, | ||
| "properties": { | ||
| "active": { | ||
| "$ref": "#/$defs/synchronizer" | ||
| }, | ||
| "legacy": { | ||
| "oneOf": [ | ||
| { "type": "null" }, | ||
| { "$ref": "#/$defs/synchronizer" } | ||
| ] | ||
| }, | ||
| "staging": { | ||
| "oneOf": [ | ||
| { "type": "null" }, | ||
| { "$ref": "#/$defs/synchronizer" } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "resources": { | ||
| "type": "object", | ||
| "required": [ "limits", "requests" ], | ||
| "properties": { | ||
| "limits": { | ||
| "type": "object", | ||
| "required": [ "cpu", "memory" ], | ||
| "properties": { | ||
| "cpu": { | ||
| "type": "string", | ||
| "description": "CPU limit (e.g., 500m)." | ||
| }, | ||
| "memory": { | ||
| "type": "string", | ||
| "description": "Memory limit (e.g., 512Mi)." | ||
| } | ||
| } | ||
| }, | ||
| "requests": { | ||
| "type": "object", | ||
| "required": [ "cpu", "memory" ], | ||
| "properties": { | ||
| "cpu": { | ||
| "type": "string", | ||
| "description": "CPU request (e.g., 250m)." | ||
| }, | ||
| "memory": { | ||
| "type": "string", | ||
| "description": "Memory request (e.g., 256Mi)." | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This
exitmakes the updater container restart if update fails (which makes the problem easily visible) while the main container keep serving the latest successfully fetched data