diff --git a/charts/keycloakx/README.md b/charts/keycloakx/README.md index 5f1f546b..2a8032d9 100644 --- a/charts/keycloakx/README.md +++ b/charts/keycloakx/README.md @@ -174,6 +174,8 @@ The following table lists the configurable parameters of the Keycloak-X chart an | `proxy.enabled` | If `true`, the `KC_PROXY` env variable will be set to the configured mode | `true` | | `proxy.mode` | The configured proxy mode | `edge` | | `http.relativePath` | The relative http path (context-path) | `/auth` | +| `http.internalPort` | The port of the internal management interface | `http-internal` | +| `http.internalScheme` | The scheme of the internal management interface | `HTTP` | | `metrics.enabled` | If `true` then the metrics endpoint is exposed | `true` | | `health.enabled` | If `true` then the health endpoint is exposed. If the `readinessProbe` is is needed `metrics.enable` must be `true`. | `true` | | `serviceMonitor.enabled` | If `true`, a ServiceMonitor resource for the prometheus-operator is created | `false` | diff --git a/charts/keycloakx/templates/servicemonitor.yaml b/charts/keycloakx/templates/servicemonitor.yaml index 79f80937..fb3a2c89 100644 --- a/charts/keycloakx/templates/servicemonitor.yaml +++ b/charts/keycloakx/templates/servicemonitor.yaml @@ -34,6 +34,7 @@ spec: endpoints: - port: {{ .port }} path: {{ tpl .path $ | quote }} + scheme: {{ .Values.http.internalScheme | lower }} interval: {{ .interval }} scrapeTimeout: {{ .scrapeTimeout }} {{- end }} diff --git a/charts/keycloakx/values.schema.json b/charts/keycloakx/values.schema.json index c3cf60ff..8b355b64 100644 --- a/charts/keycloakx/values.schema.json +++ b/charts/keycloakx/values.schema.json @@ -83,7 +83,9 @@ "type": "array" }, "http": { - "relativePath": "string" + "relativePath": "string", + "internalPort": "string", + "internalScheme": "string" }, "image": { "$ref": "#/definitions/image" diff --git a/charts/keycloakx/values.yaml b/charts/keycloakx/values.yaml index 4f704ced..125eb248 100644 --- a/charts/keycloakx/values.yaml +++ b/charts/keycloakx/values.yaml @@ -167,6 +167,7 @@ livenessProbe: | httpGet: path: '{{ tpl .Values.http.relativePath $ | trimSuffix "/" }}/health/live' port: '{{ .Values.http.internalPort }}' + scheme: '{{ .Values.http.internalScheme }}' initialDelaySeconds: 0 timeoutSeconds: 5 @@ -175,6 +176,7 @@ readinessProbe: | httpGet: path: '{{ tpl .Values.http.relativePath $ | trimSuffix "/" }}/health/ready' port: '{{ .Values.http.internalPort }}' + scheme: '{{ .Values.http.internalScheme }}' initialDelaySeconds: 10 timeoutSeconds: 1 @@ -183,6 +185,7 @@ startupProbe: | httpGet: path: '{{ tpl .Values.http.relativePath $ | trimSuffix "/" }}/health' port: '{{ .Values.http.internalPort }}' + scheme: '{{ .Values.http.internalScheme }}' initialDelaySeconds: 15 timeoutSeconds: 1 failureThreshold: 60 @@ -420,6 +423,7 @@ http: # For backwards compatibility reasons we set this to the value used by previous Keycloak versions. relativePath: "/auth" internalPort: http-internal + internalScheme: HTTP serviceMonitor: # If `true`, a ServiceMonitor resource for the prometheus-operator is created