Skip to content
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.

Sign up for GitHub

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

Update console 1.26.0 #97

Merged
merged 6 commits into from
Aug 19, 2024
Merged

Update console 1.26.0 #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
07753d7
Update console 1.26.0
qboileau Aug 14, 2024
4387c8f
fix readme
qboileau Aug 14, 2024
f0c80d2
Fix probe scheme
qboileau Aug 19, 2024
01cb36d
Minor fixes in CI step name and install notes
qboileau Aug 19, 2024
a776c5d
Fix notes format
qboileau Aug 19, 2024
6c22026
Fix note format
qboileau Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/chart-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,6 @@ jobs:
run: ct install --config .github/ct-config.yaml
if: steps.list-changed.outputs.changed == 'true'

- name: Create k3d cluster
- name: Delete k3d cluster
if: always()
run: make k3d-down
2 changes: 1 addition & 1 deletion charts/console/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: console
appVersion: 1.25.1
appVersion: 1.26.0
version: 1.10.0
description: Helm chart to deploy Conduktor Console on Kubernetes
icon: https://www.conduktor.io/svgs/logo/symbol.svg
Expand Down
6 changes: 3 additions & 3 deletions charts/console/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ Refer to our [documentation](https://docs.conduktor.io/platform/configuration/co
| --------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------------------------- |
| `platform.image.registry` | Conduktor Console image registry | `docker.io` |
| `platform.image.repository` | Conduktor Console image repository | `conduktor/conduktor-console` |
| `platform.image.tag` | Conduktor Console image tag (immutable tags are recommended) | `1.25.1` |
| `platform.image.tag` | Conduktor Console image tag (immutable tags are recommended) | `1.26.0` |
| `platform.image.digest` | Conduktor Console image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended) | `""` |
| `platform.image.pullPolicy` | Conduktor Console image pull policy | `IfNotPresent` |
| `platform.image.pullSecrets` | Conduktor Console image pull secrets | `[]` |
Expand Down Expand Up @@ -264,12 +264,12 @@ Console expose metrics that could be collected and presented if your environment
| `platformCortex.enabled` | Enable Conduktor Console Cortex | `true` |
| `platformCortex.image.registry` | Conduktor Console Cortex image registry | `docker.io` |
| `platformCortex.image.repository` | Conduktor Console Cortex image repository | `conduktor/conduktor-console-cortex` |
| `platformCortex.image.tag` | Conduktor Console Cortex image tag (immutable tags are recommended) | `1.25.1` |
| `platformCortex.image.tag` | Conduktor Console Cortex image tag (immutable tags are recommended) | `1.26.0` |
| `platformCortex.image.digest` | Conduktor Console Cortex image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended) | `""` |
| `platformCortex.image.pullPolicy` | Conduktor Console Cortex image pull policy | `IfNotPresent` |
| `platformCortex.image.pullSecrets` | Conduktor Console Cortex image pull secrets | `[]` |
| `platformCortex.image.debug` | Enable Conduktor Console Cortex image debug mode | `false` |
| `platformCortex.replicaCount` | Number of Conduktor Console replicas to deploy | `1` |
| `platformCortex.replicaCount` | Number of Conduktor Console Cortex replicas to deploy | `1` |
| `platformCortex.containerPorts.cortex` | Conduktor Console Cortex HTTP (or HTTPS if configured) container port | `9009` |
| `platformCortex.containerPorts.alertmanager` | Conduktor Console AlertManager HTTP (or HTTPS if configured) container port | `9010` |
| `platformCortex.containerPorts.prometheus` | Conduktor Console Prometheus HTTP (or HTTPS if configured) container port | `9090` |
Expand Down
6 changes: 4 additions & 2 deletions charts/console/templates/NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{{- $isSSLEnabled := not (empty (include "conduktor.platform.tls.enabled" .)) -}}
{{- $proto := ternary "https" "http" (or .Values.ingress.tls $isSSLEnabled) -}}
CHART NAME: {{ .Chart.Name }}
CHART VERSION: {{ .Chart.Version }}
APP VERSION: {{ .Chart.AppVersion }}
Expand Down Expand Up @@ -25,12 +27,12 @@ In order to replicate the container startup scripts execute this command:
{{- end }}

{{ if .Values.ingress.enabled }}
Conduktor Console will be accessible at : http://{{ .Values.ingress.hostname }}
Conduktor Console will be accessible at : {{ printf "%s://%s" $proto .Values.ingress.hostname }}
{{- else }}
Forward Console service locally with the command (may take a few seconds to be ready):
kubectl port-forward -n {{ .Release.Namespace }} svc/{{ template "common.names.fullname" . }} 8080:80

Conduktor Console will be accessible at : http://127.0.0.1:8080
Conduktor Console will be accessible at : {{ printf "%s://127.0.0.1:8080" $proto }}
{{- end }}

To connect use following admin account ADMIN_LOGIN and ADMIN_PASSWORD
Expand Down
9 changes: 9 additions & 0 deletions charts/console/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,15 @@ Platform service internal domain name
{{- end -}}


{{/*
Platform probe scheme HTTP or HTTPS
*/}}
{{- define "conduktor.platform.probe.scheme" -}}
{{- $isSSLEnabled := not (empty (include "conduktor.platform.tls.enabled" .)) }}
{{- $proto := ternary "HTTPS" "HTTP" $isSSLEnabled -}}
{{- printf "%s" $proto -}}
{{- end -}}

{{/*
Platform internal url from service in format http(s)://platform.nsp.svc.cluster.local:8080
*/}}
Expand Down
3 changes: 3 additions & 0 deletions charts/console/templates/console/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ spec:
{{- else if .Values.platform.livenessProbe.enabled }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.platform.livenessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
scheme: {{ include "conduktor.platform.probe.scheme" . | quote }}
path: /api/health/live
port: http
{{- end }}
Expand All @@ -173,6 +174,7 @@ spec:
{{- else if .Values.platform.readinessProbe.enabled }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.platform.readinessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
scheme: {{ include "conduktor.platform.probe.scheme" . | quote }}
path: /api/health/ready
port: http
{{- end }}
Expand All @@ -181,6 +183,7 @@ spec:
{{- else if .Values.platform.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.platform.startupProbe "enabled") "context" $) | nindent 12 }}
httpGet:
scheme: {{ include "conduktor.platform.probe.scheme" . | quote }}
path: /api/health/live
port: http
{{- end }}
Expand Down
4 changes: 2 additions & 2 deletions charts/console/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ platform:
image:
registry: docker.io
repository: conduktor/conduktor-console
tag: 1.25.1
tag: 1.26.0
digest: ""
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
Expand Down Expand Up @@ -772,7 +772,7 @@ platformCortex:
image:
registry: docker.io
repository: conduktor/conduktor-console-cortex
tag: 1.25.1
tag: 1.26.0
digest: ""
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
Expand Down
Loading