fix: use appVersion by default, optimize keycloak startup time

docker-compose.full.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 name: 'full-cosmo'
 services:
   # Services for the demo
@@ -150,7 +149,9 @@ services:
   keycloak:
     image: ghcr.io/wundergraph/cosmo/keycloak:${DC_KEYCLOAK_VERSION:-latest}
     environment:
-      KEYCLOAK_EXTRA_ARGS: '--import-realm --health-enabled=true'
+      KEYCLOAK_EXTRA_ARGS: '--import-realm --optimized'
+      KEYCLOAK_ENABLE_HEALTH_ENDPOINTS: 'true'
+      KEYCLOAK_ENABLE_STATISTICS: 'true'
       KEYCLOAK_ADMIN: ${KEYCLOAK_ADMIN:-admin}
       KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD:-changeme}
       KEYCLOAK_DATABASE_PORT: ${POSTGRES_PORT:-5432}

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 name: cosmo-dev
 services:
   postgres:
@@ -25,7 +24,9 @@ services:
       context: keycloak
       dockerfile: Dockerfile
     environment:
-      KEYCLOAK_EXTRA_ARGS: '--import-realm --health-enabled=true'
+      KEYCLOAK_EXTRA_ARGS: '--import-realm --optimized'
+      KEYCLOAK_ENABLE_HEALTH_ENDPOINTS: 'true'
+      KEYCLOAK_ENABLE_STATISTICS: 'true'
       KEYCLOAK_ADMIN: ${KEYCLOAK_ADMIN:-admin}
       KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD:-changeme}
       KEYCLOAK_DATABASE_PORT: ${POSTGRES_PORT:-5432}

helm/README.md

@@ -58,6 +58,8 @@ make docker-build-minikube # If you're running k8s on the same CPU architecture
                            # If your cluster runs on a linux/amd64 architecture please update the Makefile accordingly
 ```
 
+**Important**: You have to set `image.version` in `values.yaml` for each service to use the locally built images. By default, a chart always tries to pin to the latest compatible version of the image.
+
 #### 4. Install the Helm chart
 
 For development, we recommend installing the Helm chart with Kapp the following command:

helm/cosmo/README.md

@@ -171,9 +171,11 @@ This is the official Helm Chart for WunderGraph Cosmo - The Full Lifecycle Graph
 | keycloak.externalDatabase.port | int | `5432` |  |
 | keycloak.externalDatabase.user | string | `"postgres"` |  |
 | keycloak.extraEnvVars[0].name | string | `"KEYCLOAK_EXTRA_ARGS"` |  |
-| keycloak.extraEnvVars[0].value | string | `"--import-realm --health-enabled=true"` |  |
-| keycloak.extraEnvVars[1].name | string | `"KEYCLOAK_DATABASE_PASSWORD"` |  |
-| keycloak.extraEnvVars[1].value | string | `"changeme"` |  |
+| keycloak.extraEnvVars[0].value | string | `"--import-realm --optimized"` |  |
+| keycloak.extraEnvVars[1].name | string | `"KEYCLOAK_ENABLE_HEALTH_ENDPOINTS"` |  |
+| keycloak.extraEnvVars[1].value | string | `"true"` |  |
+| keycloak.extraEnvVars[2].name | string | `"KEYCLOAK_DATABASE_PASSWORD"` |  |
+| keycloak.extraEnvVars[2].value | string | `"changeme"` |  |
 | keycloak.extraVolumeMounts[0].mountPath | string | `"/opt/bitnami/keycloak/data/import/realm.json"` |  |
 | keycloak.extraVolumeMounts[0].name | string | `"realm-config-volume"` |  |
 | keycloak.extraVolumeMounts[0].readOnly | bool | `true` |  |
@@ -184,11 +186,13 @@ This is the official Helm Chart for WunderGraph Cosmo - The Full Lifecycle Graph
 | keycloak.image.registry | string | `"ghcr.io"` |  |
 | keycloak.image.repository | string | `"wundergraph/cosmo/keycloak"` |  |
 | keycloak.image.tag | string | `"latest"` |  |
-| keycloak.podAnnotations."kapp.k14s.io/change-group" | string | `"cosmo.apps.keycloak.wundergraph.com/deployment"` |  |
-| keycloak.podAnnotations."kapp.k14s.io/change-rule.postgresql" | string | `"upsert after upserting cosmo.apps.postgresql.wundergraph.com/deployment"` |  |
+| keycloak.metrics.enabled | bool | `true` |  |
+| keycloak.podAnnotations."kapp.k14s.io/change-group" | string | `"cosmo.apps.keycloak.wundergraph.com/deployment"` | Support for k14s.io. This annotation will form a group to coordinate deployments with kapp. |
+| keycloak.podAnnotations."kapp.k14s.io/change-rule.postgresql" | string | `"upsert after upserting cosmo.apps.postgresql.wundergraph.com/deployment"` | Support for k14s.io. This annotation will wait for the postgresql deployments to be ready before deploying. |
 | keycloak.postgresql.enabled | bool | `false` |  |
 | keycloak.production | bool | `false` |  |
 | keycloak.replicaCount | int | `1` |  |
+| keycloak.resourcesPreset | string | `"none"` | Is set to 'small' by default which is too small and runs in OOMKilled |
 | keycloak.service.ports.http | int | `8080` |  |
 | keycloak.startupProbe.enabled | bool | `true` |  |
 | minio.auth.rootPassword | string | `"changeme"` |  |

helm/cosmo/charts/cdn/Chart.yaml

@@ -20,5 +20,5 @@ version: "0.0.1"
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.10.0"
+appVersion: "0.10.2"
 home: https://wundergraph.com

helm/cosmo/charts/cdn/README.md

@@ -1,6 +1,6 @@
 # cdn
 
-![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.10.0](https://img.shields.io/badge/AppVersion-0.10.0-informational?style=flat-square)
+![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.10.2](https://img.shields.io/badge/AppVersion-0.10.2-informational?style=flat-square)
 
 WunderGraph Cosmo CDN
 
@@ -28,7 +28,6 @@ WunderGraph Cosmo CDN
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.registry | string | `"ghcr.io"` |  |
 | image.repository | string | `"wundergraph/cosmo/cdn"` |  |
-| image.version | string | `"latest"` | Overrides the image tag whose default is the chart appVersion. |
 | imagePullSecrets | list | `[]` |  |
 | ingress.hosts | string | `nil` |  |
 | ingress.tls | list | `[]` |  |

helm/cosmo/charts/cdn/templates/_helpers.tpl

@@ -9,10 +9,12 @@ Expand the name of the chart.
 Create the image path for the passed in image field
 */}}
 {{- define "cdn.image" -}}
-{{- if eq (substr 0 7 .Values.image.version) "sha256:" -}}
+{{- if and (.Values.image.version) (eq (substr 0 7 .Values.image.version) "sha256:") -}}
 {{- printf "%s/%s@%s" .Values.image.registry .Values.image.repository .Values.image.version -}}
+{{- else if .Values.image.version -}}
+{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository .Values.image.version -}}
 {{- else -}}
-{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository (.Values.image.version | default .Chart.AppVersion) -}}
+{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository .Chart.AppVersion -}}
 {{- end -}}
 {{- end -}}
 

helm/cosmo/charts/cdn/values.yaml

@@ -9,7 +9,7 @@ image:
   registry: ghcr.io
   pullPolicy: IfNotPresent
   # -- Overrides the image tag whose default is the chart appVersion.
-  version: "latest"
+  #version: "latest"
 
 # -- Add labels to all deployed resources
 commonLabels: {}

helm/cosmo/charts/controlplane/Chart.yaml

@@ -20,5 +20,5 @@ version: "0.1.0"
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.105.0"
+appVersion: "0.107.3"
 home: https://wundergraph.com

helm/cosmo/charts/controlplane/README.md

@@ -1,6 +1,6 @@
 # controlplane
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.105.0](https://img.shields.io/badge/AppVersion-0.105.0-informational?style=flat-square)
+![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.107.3](https://img.shields.io/badge/AppVersion-0.107.3-informational?style=flat-square)
 
 WunderGraph Cosmo Controlplane
 
@@ -76,7 +76,6 @@ WunderGraph Cosmo Controlplane
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.registry | string | `"ghcr.io"` |  |
 | image.repository | string | `"wundergraph/cosmo/controlplane"` |  |
-| image.version | string | `"latest"` | Overrides the image tag whose default is the chart appVersion. |
 | imagePullSecrets | list | `[]` |  |
 | ingress.hosts | string | `nil` |  |
 | ingress.tls | list | `[]` |  |

helm/cosmo/charts/controlplane/templates/_helpers.tpl

@@ -9,10 +9,12 @@ Expand the name of the chart.
 Create the image path for the passed in image field
 */}}
 {{- define "controlplane.image" -}}
-{{- if eq (substr 0 7 .Values.image.version) "sha256:" -}}
+{{- if and (.Values.image.version) (eq (substr 0 7 .Values.image.version) "sha256:") -}}
 {{- printf "%s/%s@%s" .Values.image.registry .Values.image.repository .Values.image.version -}}
+{{- else if .Values.image.version -}}
+{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository .Values.image.version -}}
 {{- else -}}
-{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository (.Values.image.version | default .Chart.AppVersion) -}}
+{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository .Chart.AppVersion -}}
 {{- end -}}
 {{- end -}}
 

helm/cosmo/charts/controlplane/values.yaml

@@ -9,7 +9,7 @@ image:
   registry: ghcr.io
   pullPolicy: IfNotPresent
   # -- Overrides the image tag whose default is the chart appVersion.
-  version: 'latest'
+  #version: 'latest'
 
 # -- Add labels to all deployed resources
 commonLabels: {}

helm/cosmo/charts/graphqlmetrics/README.md

@@ -34,7 +34,6 @@ WunderGraph Cosmo GraphQL Metrics Collector
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.registry | string | `"ghcr.io"` |  |
 | image.repository | string | `"wundergraph/cosmo/graphqlmetrics"` |  |
-| image.version | string | `"latest"` | Overrides the image tag whose default is the chart appVersion. |
 | imagePullSecrets | list | `[]` |  |
 | ingress.hosts | string | `nil` |  |
 | ingress.tls | list | `[]` |  |

helm/cosmo/charts/graphqlmetrics/templates/_helpers.tpl

@@ -9,10 +9,12 @@ Expand the name of the chart.
 Create the image path for the passed in image field
 */}}
 {{- define "graphqlmetrics.image" -}}
-{{- if eq (substr 0 7 .Values.image.version) "sha256:" -}}
+{{- if and (.Values.image.version) (eq (substr 0 7 .Values.image.version) "sha256:") -}}
 {{- printf "%s/%s@%s" .Values.image.registry .Values.image.repository .Values.image.version -}}
+{{- else if .Values.image.version -}}
+{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository .Values.image.version -}}
 {{- else -}}
-{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository (.Values.image.version | default .Chart.AppVersion) -}}
+{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository .Chart.AppVersion -}}
 {{- end -}}
 {{- end -}}
 

helm/cosmo/charts/graphqlmetrics/values.yaml

@@ -9,7 +9,7 @@ image:
   registry: ghcr.io
   pullPolicy: IfNotPresent
   # -- Overrides the image tag whose default is the chart appVersion.
-  version: "latest"
+  #version: "latest"
 
 # -- Add labels to all deployed resources
 commonLabels: {}

helm/cosmo/charts/otelcollector/README.md

@@ -33,7 +33,6 @@ WunderGraph Cosmo Open Telemetry Collector.
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.registry | string | `"ghcr.io"` |  |
 | image.repository | string | `"wundergraph/cosmo/otelcollector"` |  |
-| image.version | string | `"latest"` |  |
 | imagePullSecrets | list | `[]` |  |
 | ingress.hosts | string | `nil` |  |
 | ingress.tls | list | `[]` |  |

helm/cosmo/charts/otelcollector/templates/_helpers.tpl

@@ -9,10 +9,12 @@ Expand the name of the chart.
 Create the image path for the passed in image field
 */}}
 {{- define "otelcollector.image" -}}
-{{- if eq (substr 0 7 .Values.image.version) "sha256:" -}}
+{{- if and (.Values.image.version) (eq (substr 0 7 .Values.image.version) "sha256:") -}}
 {{- printf "%s/%s@%s" .Values.image.registry .Values.image.repository .Values.image.version -}}
+{{- else if .Values.image.version -}}
+{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository .Values.image.version -}}
 {{- else -}}
-{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository (.Values.image.version | default .Chart.AppVersion) -}}
+{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository .Chart.AppVersion -}}
 {{- end -}}
 {{- end -}}
 

helm/cosmo/charts/otelcollector/values.yaml

@@ -9,7 +9,7 @@ image:
   registry: ghcr.io
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  version: "latest"
+  #version: "latest"
 
 # -- Add labels to all deployed resources
 commonLabels: {}

helm/cosmo/charts/router/Chart.yaml

@@ -21,7 +21,7 @@ version: 0.8.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.107.2"
+appVersion: "0.110.1"
 
 keywords:
   - wundergraph

helm/cosmo/charts/router/README.md

@@ -1,6 +1,6 @@
 # router
 
-![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.107.2](https://img.shields.io/badge/AppVersion-0.107.2-informational?style=flat-square)
+![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.110.1](https://img.shields.io/badge/AppVersion-0.110.1-informational?style=flat-square)
 
 This is the official Helm Chart for the WunderGraph Cosmo Router.
 
@@ -43,7 +43,6 @@ This is the official Helm Chart for the WunderGraph Cosmo Router.
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.registry | string | `"ghcr.io"` |  |
 | image.repository | string | `"wundergraph/cosmo/router"` |  |
-| image.version | string | `"latest"` | Overrides the image tag whose default is the chart appVersion. |
 | imagePullSecrets | list | `[]` |  |
 | ingress.hosts | string | `nil` |  |
 | ingress.tls | list | `[]` |  |

helm/cosmo/charts/router/templates/_helpers.tpl

@@ -9,10 +9,12 @@ Expand the name of the chart.
 Create the image path for the passed in image field
 */}}
 {{- define "router.image" -}}
-{{- if eq (substr 0 7 .Values.image.version) "sha256:" -}}
+{{- if and (.Values.image.version) (eq (substr 0 7 .Values.image.version) "sha256:") -}}
 {{- printf "%s/%s@%s" .Values.image.registry .Values.image.repository .Values.image.version -}}
+{{- else if .Values.image.version -}}
+{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository .Values.image.version -}}
 {{- else -}}
-{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository (.Values.image.version | default .Chart.AppVersion) -}}
+{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository .Chart.AppVersion -}}
 {{- end -}}
 {{- end -}}
 

helm/cosmo/charts/router/values.yaml

@@ -9,7 +9,7 @@ image:
   registry: ghcr.io
   pullPolicy: IfNotPresent
   # -- Overrides the image tag whose default is the chart appVersion.
-  version: "latest"
+  #version: "latest"
 
 # -- Add labels to all deployed resources
 commonLabels: {}

helm/cosmo/charts/studio/Chart.yaml

@@ -19,5 +19,5 @@ version: "0.0.1"
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.87.0"
+appVersion: "0.88.1"
 home: https://wundergraph.com

helm/cosmo/charts/studio/README.md

@@ -1,6 +1,6 @@
 # studio
 
-![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.87.0](https://img.shields.io/badge/AppVersion-0.87.0-informational?style=flat-square)
+![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.88.1](https://img.shields.io/badge/AppVersion-0.88.1-informational?style=flat-square)
 
 WunderGraph Cosmo Studio.
 
@@ -24,7 +24,6 @@ WunderGraph Cosmo Studio.
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.registry | string | `"ghcr.io"` |  |
 | image.repository | string | `"wundergraph/cosmo/studio"` |  |
-| image.version | string | `"latest"` | Overrides the image tag whose default is the chart appVersion. |
 | imagePullSecrets | list | `[]` |  |
 | ingress.hosts | string | `nil` |  |
 | ingress.tls | list | `[]` |  |

helm/cosmo/charts/studio/templates/_helpers.tpl

@@ -9,10 +9,12 @@ Expand the name of the chart.
 Create the image path for the passed in image field
 */}}
 {{- define "studio.image" -}}
-{{- if eq (substr 0 7 .Values.image.version) "sha256:" -}}
+{{- if and (.Values.image.version) (eq (substr 0 7 .Values.image.version) "sha256:") -}}
 {{- printf "%s/%s@%s" .Values.image.registry .Values.image.repository .Values.image.version -}}
+{{- else if .Values.image.version -}}
+{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository .Values.image.version -}}
 {{- else -}}
-{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository (.Values.image.version | default .Chart.AppVersion) -}}
+{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository .Chart.AppVersion -}}
 {{- end -}}
 {{- end -}}
 

helm/cosmo/charts/studio/values.yaml

@@ -9,7 +9,7 @@ image:
   registry: ghcr.io
   pullPolicy: IfNotPresent
   # -- Overrides the image tag whose default is the chart appVersion.
-  version: "latest"
+  #version: "latest"
 
 # -- Add labels to all deployed resources
 commonLabels: {}

helm/cosmo/values.yaml

@@ -355,9 +355,9 @@ keycloak:
       http: 8080
   replicaCount: 1
   podAnnotations:
-    # Support for k14s.io. This annotation will form a group to coordinate deployments with kapp.
+    # -- Support for k14s.io. This annotation will form a group to coordinate deployments with kapp.
     kapp.k14s.io/change-group: 'cosmo.apps.keycloak.wundergraph.com/deployment'
-    # Support for k14s.io. This annotation will wait for the postgresql deployments to be ready before deploying.
+    # -- Support for k14s.io. This annotation will wait for the postgresql deployments to be ready before deploying.
     kapp.k14s.io/change-rule.postgresql: 'upsert after upserting cosmo.apps.postgresql.wundergraph.com/deployment'
   auth:
     adminUser: 'admin'
@@ -366,11 +366,17 @@ keycloak:
     enabled: true
   cache:
     enabled: false
+  # -- Is set to 'small' by default which is too small and runs in OOMKilled
+  resourcesPreset: none
+  metrics:
+    enabled: true
   postgresql:
     enabled: false
   extraEnvVars:
     - name: KEYCLOAK_EXTRA_ARGS
-      value: '--import-realm --health-enabled=true'
+      value: '--import-realm --optimized'
+    - name: KEYCLOAK_ENABLE_HEALTH_ENDPOINTS
+      value: 'true'
     - name: KEYCLOAK_DATABASE_PASSWORD
       value: 'changeme'
   extraVolumeMounts:

keycloak/Dockerfile

@@ -16,5 +16,10 @@ FROM --platform=${BUILDPLATFORM} bitnami/keycloak:25.0.2
 
 COPY --from=0 /app/target/*.jar /opt/bitnami/keycloak/providers/
 
+# Prebuild keycloak for using with postgres for faster startup
+# The features needs to be kept in sync with the keycloak features in helm chart and docker compose
+# Needs to be done after copying the providers
+RUN /opt/bitnami/keycloak/bin/kc.sh build --db=postgres --metrics-enabled true --health-enabled true --http-relative-path "/"
+
 EXPOSE 8080
 EXPOSE 8443