v12 of chart with centrifugo v6 (#104)

centrifugal · Jan 16, 2025 · fc3a805 · fc3a805
1 parent 88f4d67
commit fc3a805
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 78 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Centrifugal
+Copyright (c) Centrifugal Labs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/charts/centrifugo/Chart.yaml b/charts/centrifugo/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: centrifugo
 description: Centrifugo is a scalable real-time messaging server in language-agnostic way
-version: 11.8.10
-appVersion: 5.4.9
+version: 12.0.0
+appVersion: 6.0.0
 home: https://centrifugal.dev
 icon: https://centrifugal.dev/img/favicon.png
 maintainers:

diff --git a/charts/centrifugo/README.md b/charts/centrifugo/README.md
diff --git a/charts/centrifugo/templates/deployment.yaml b/charts/centrifugo/templates/deployment.yaml
@@ -71,35 +71,37 @@ spec:
           command:
             - centrifugo
           args:
-            - --health
-            - --prometheus
-            - --port
+            - --health.enabled
+            - --prometheus.enabled
+            - --http_server.port
             - "{{ .Values.service.port }}"
-            - --internal_port
+            - --http_server.internal_port
             - "{{ .Values.internalService.port }}"
-            - --grpc_api
-            - --grpc_api_port
+            - --grpc_api.enabled
+            - --grpc_api.port
             - "{{ .Values.grpcService.port }}"
-            - --uni_grpc_port
+            - --uni_grpc.port
             - "{{ .Values.uniGrpcService.port }}"
           env:
             - name: CENTRIFUGO_ADMIN_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ include "centrifugo.secretName" . }}
                   key: adminPassword
+                  optional: true
             - name: CENTRIFUGO_ADMIN_SECRET
               valueFrom:
                 secretKeyRef:
                   name: {{ include "centrifugo.secretName" . }}
                   key: adminSecret
-            - name: CENTRIFUGO_TOKEN_HMAC_SECRET_KEY
+                  optional: true
+            - name: CENTRIFUGO_CLIENT_TOKEN_HMAC_SECRET_KEY
               valueFrom:
                 secretKeyRef:
                   name: {{ include "centrifugo.secretName" . }}
                   key: tokenHmacSecretKey
                   optional: true
-            - name: CENTRIFUGO_API_KEY
+            - name: CENTRIFUGO_HTTP_API_KEY
               valueFrom:
                 secretKeyRef:
                   name: {{ include "centrifugo.secretName" . }}
@@ -111,31 +113,31 @@ spec:
                   name: {{ include "centrifugo.secretName" . }}
                   key: grpcApiKey
                   optional: true
-            - name: CENTRIFUGO_REDIS_ADDRESS
+            - name: CENTRIFUGO_ENGINE_REDIS_ADDRESS
               valueFrom:
                 secretKeyRef:
                   name: {{ include "centrifugo.secretName" . }}
                   key: redisAddress
                   optional: true
-            - name: CENTRIFUGO_REDIS_USER
+            - name: CENTRIFUGO_ENGINE_REDIS_USER
               valueFrom:
                 secretKeyRef:
                   name: {{ include "centrifugo.secretName" . }}
                   key: redisUser
                   optional: true
-            - name: CENTRIFUGO_REDIS_PASSWORD
+            - name: CENTRIFUGO_ENGINE_REDIS_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ include "centrifugo.secretName" . }}
                   key: redisPassword
                   optional: true
-            - name: CENTRIFUGO_REDIS_SENTINEL_PASSWORD
+            - name: CENTRIFUGO_ENGINE_REDIS_SENTINEL_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ include "centrifugo.secretName" . }}
                   key: redisSentinelPassword
                   optional: true
-            - name: CENTRIFUGO_NATS_URL
+            - name: CENTRIFUGO_BROKER_NATS_URL
               valueFrom:
                 secretKeyRef:
                   name: {{ include "centrifugo.secretName" . }}

diff --git a/charts/centrifugo/templates/secret.yaml b/charts/centrifugo/templates/secret.yaml
@@ -19,13 +19,9 @@ data:
   {{- end }}
   {{- if .Values.secrets.adminPassword }}
   adminPassword: {{ .Values.secrets.adminPassword | b64enc | quote }}
-  {{- else }}
-  adminPassword: {{ randAlphaNum 12 | b64enc | quote }}
   {{- end }}
   {{- if .Values.secrets.adminSecret }}
   adminSecret: {{ .Values.secrets.adminSecret | b64enc | quote }}
-  {{- else }}
-  adminSecret: {{ randAlphaNum 24 | b64enc | quote }}
   {{- end }}
   {{- if .Values.secrets.redisAddress }}
   redisAddress: {{ .Values.secrets.redisAddress | b64enc | quote }}

diff --git a/charts/centrifugo/values.yaml b/charts/centrifugo/values.yaml
@@ -270,13 +270,16 @@ config:
   # Engine to use. Default memory engine allows running only one Centrifugo pod.
   # Scale to many pods with Redis engine or Nats broker. Refer to Centrifugo
   # documentation: https://centrifugal.github.io/centrifugo/server/engines/
-  engine: "memory"
+  engine:
+    type: "memory"
 
   # Enable admin web interface by default.
-  admin: true
+  admin:
+    enabled: true
 
   # Array of namespaces.
-  namespaces: []
+  channel:
+    namespaces: []
 
 # Additional volumes for Centrifugo deployment.
 volumes: []