diff --git a/.github/workflows/chart-test.yaml b/.github/workflows/chart-test.yaml index 4ce6f2a..70e437e 100644 --- a/.github/workflows/chart-test.yaml +++ b/.github/workflows/chart-test.yaml @@ -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 diff --git a/charts/console/Chart.yaml b/charts/console/Chart.yaml index 6de5e6a..8ede759 100644 --- a/charts/console/Chart.yaml +++ b/charts/console/Chart.yaml @@ -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 diff --git a/charts/console/README.md b/charts/console/README.md index cfe3af4..74cf447 100644 --- a/charts/console/README.md +++ b/charts/console/README.md @@ -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 | `[]` | @@ -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` | diff --git a/charts/console/templates/NOTES.txt b/charts/console/templates/NOTES.txt index 66f566a..aadc4f1 100644 --- a/charts/console/templates/NOTES.txt +++ b/charts/console/templates/NOTES.txt @@ -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 }} @@ -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 diff --git a/charts/console/templates/_helpers.tpl b/charts/console/templates/_helpers.tpl index 16d7a34..b8c5b9b 100644 --- a/charts/console/templates/_helpers.tpl +++ b/charts/console/templates/_helpers.tpl @@ -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 */}} diff --git a/charts/console/templates/console/deployment.yaml b/charts/console/templates/console/deployment.yaml index c425a12..a01acc7 100644 --- a/charts/console/templates/console/deployment.yaml +++ b/charts/console/templates/console/deployment.yaml @@ -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 }} @@ -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 }} @@ -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 }} diff --git a/charts/console/values.yaml b/charts/console/values.yaml index 73431cb..ab4a2e0 100644 --- a/charts/console/values.yaml +++ b/charts/console/values.yaml @@ -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' @@ -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'