diff --git a/helm/squidex/Chart.lock b/helm/squidex/Chart.lock new file mode 100644 index 000000000..703e4ad2a --- /dev/null +++ b/helm/squidex/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: mongodb-replicaset + repository: https://charts.helm.sh/stable + version: 3.9.6 +digest: sha256:1a5bad984de19645496e3d7d260bd3ecde7096aad2830b49b6a47331175b67f5 +generated: "2025-04-23T17:27:02.6570067+02:00" diff --git a/helm/squidex/Chart.yaml b/helm/squidex/Chart.yaml index 63693e32f..75b2b2d32 100644 --- a/helm/squidex/Chart.yaml +++ b/helm/squidex/Chart.yaml @@ -24,5 +24,5 @@ sources: dependencies: - name: mongodb-replicaset version: 3.9.6 - repository: https://kubernetes-charts.storage.googleapis.com/ + repository: https://charts.helm.sh/stable condition: mongodb-replicaset.enabled diff --git a/helm/squidex7-2.0.0.tgz b/helm/squidex7-2.0.0.tgz new file mode 100644 index 000000000..bcab6b284 Binary files /dev/null and b/helm/squidex7-2.0.0.tgz differ diff --git a/helm/squidex7/Chart.lock b/helm/squidex7/Chart.lock new file mode 100644 index 000000000..17594608f --- /dev/null +++ b/helm/squidex7/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: mongodb + repository: https://charts.bitnami.com/bitnami + version: 16.5.1 +digest: sha256:c521dfb894a5ca0e31a531df6e88f873d75d90087e6d5182224169c97797804e +generated: "2025-04-23T16:16:07.0409615+02:00" diff --git a/helm/squidex7/Chart.yaml b/helm/squidex7/Chart.yaml index c09f54c53..f0e0de6e4 100644 --- a/helm/squidex7/Chart.yaml +++ b/helm/squidex7/Chart.yaml @@ -5,8 +5,8 @@ name: squidex7 icon: https://raw.githubusercontent.com/Squidex/squidex/master/media/logo-squared.png description: Squidex CMS v7.0 and newer -version: 1.0.3 -appVersion: "7.15.0" +version: 2.0.0 +appVersion: "7.18.0" home: https://squidex.io/ @@ -22,7 +22,7 @@ sources: - https://github.com/Squidex/squidex dependencies: - - name: mongodb-replicaset - version: 3.9.6 - repository: https://kubernetes-charts.storage.googleapis.com/ - condition: mongodb-replicaset.enabled + - name: mongodb + version: 16.5.1 + repository: https://charts.bitnami.com/bitnami + condition: mongodb.enabled diff --git a/helm/squidex7/README.md b/helm/squidex7/README.md index 34938646f..1aa4d3adb 100644 --- a/helm/squidex7/README.md +++ b/helm/squidex7/README.md @@ -46,17 +46,17 @@ The command removes all the Kubernetes components associated with the chart and ### Global parameters -| Name | Description | Value | -| ------------------------- | ------------------------------ | ------------------------------ | -| `service.type` | Kubernetes Service type | `ClusterIP` | -| `service.port` | Kubernetes Service port | `80` | -| `deployment.replicaCount` | Number of instances. | `1` | -| `image.repository` | Squidex image registry | `squidex/squidex` | -| `image.tag` | Squidex image tag | null: Uses chart's App Version | -| `image.pullPolicy` | Squidex image pull policy | `IfNotPresent` | -| `ingress.enabled` | True to deploy an ingress | `true` | -| `ingress.hostName` | The host name for the ingress. | `squidex.local` | - +| Name | Description | Value | +| -------------------------- | ------------------------------ | ----------------- | +| `service.type` | Kubernetes Service type | `ClusterIP` | +| `service.port` | Kubernetes Service port | `80` | +| `deployment.replicaCount` | Number of instances. | `1` | +| `image.repository` | Squidex image registry | `squidex/squidex` | +| `image.pullPolicy` | Squidex image pull policy | `IfNotPresent` | +| `runAsNonRoot` | | `false` | +| `ingress.enabled` | True to deploy an ingress | `true` | +| `ingress.ingressClassName` | The ingress class. | `nginx` | +| `ingress.hostName` | The host name for the ingress. | `squidex.local` | ### Squidex parameters @@ -86,7 +86,7 @@ The command removes all the Kubernetes components associated with the chart and | `env.IDENTITY__OIDCRESPONSETYPE` | The type of the response. id_token or code. | `nil` | | `env.IDENTITY__OIDCSCOPES` | The scopes. | `[]` | | `env.IDENTITY__OIDCSINGOUTREDIRECTURL` | The redirect URL for the sign out. | `nil` | -| `env.LOGGING__APPLICATIONINSIGHTS__ENABLED` | Enable monitoring via application insights. | `falsen` | +| `env.LOGGING__APPLICATIONINSIGHTS__ENABLED` | Enable monitoring via application insights. | `false` | | `env.LOGGING__APPLICATIONINSIGHTS__CONNECTIONSTRING` | The connection string to application insights. | `nil` | | `env.LOGGING__COLORS` | Use colors in the console output. | `false` | | `env.LOGGING__HUMAN` | Setting the flag to true, enables well formatteds json logs. | `false` | @@ -101,18 +101,23 @@ The command removes all the Kubernetes components associated with the chart and | `env.STORE__MONGODB__CONTENTDATABASE` | The name of the database for content items. | `SquidexContent` | | `env.URLS__BASEURL` | Set the base url of your application, to generate correct urls in background process. | `https://squidex.local/` | | `env.URLS__ENFORCEHTTPS` | Set it to true to redirect the user from http to https permanently | `false` | - +| `env.ASPNETCORE_URLS` | An override to ensure that kestrel starts on a non-privileged port | `http://+:80` | ### MongoDB parameters -| Name | Description | Value | -| -------------------------------------------------- | ---------------------------------------------- | ------------------- | -| `mongodb-replicaset.enabled` | Uses the custom mongoDB instance. | `true` | -| `mongodb-replicaset.replicas` | The number of replicas. | `3` | -| `mongodb-replicaset.persistentVolume.enabled` | If true, persistent volume claims are created. | `true` | -| `mongodb-replicaset.persistentVolume.storageClass` | Persistent volume storage class. | `""` | -| `mongodb-replicaset.persistentVolume.accessModes` | Persistent volume access modes. | `["ReadWriteOnce"]` | -| `mongodb-replicaset.persistentVolume.size` | Persistent volume size. | `10Gi` | +| Name | Description | Value | +| ---------------------------------- | ---------------------------------------------------------- | ------------------- | +| `mongodb.architecture` | MongoDB(®) architecture (standalone or replicaset | `replicaset` | +| `mongodb.enabled` | Uses the custom mongoDB instance. | `true` | +| `mongodb.replicaCount` | The number of replicas. | `3` | +| `mongodb.auth.enabled` | Enable authentication for MongoDB. | `false` | +| `mongodb.auth.rootUsername` | The MongoDB root user name. | `""` | +| `mongodb.auth.rootPassword` | The MongoDB root password. | `""` | +| `mongodb.auth.existingSecret` | The name of the existing secret to use for authentication. | `""` | +| `mongodb.persistence.enabled` | If true, persistent volume claims are created. | `true` | +| `mongodb.persistence.storageClass` | The storage class for the persistent volume claim. | `""` | +| `mongodb.persistence.accessModes` | Persistent volume access modes. | `["ReadWriteOnce"]` | +| `mongodb.persistence.size` | Persistent volume size. | `10Gi` | Parameters are generated with: https://github.com/bitnami-labs/readme-generator-for-helm#configuration-file diff --git a/helm/squidex7/charts/mongodb-16.5.1.tgz b/helm/squidex7/charts/mongodb-16.5.1.tgz new file mode 100644 index 000000000..81684d4c0 Binary files /dev/null and b/helm/squidex7/charts/mongodb-16.5.1.tgz differ diff --git a/helm/squidex7/charts/mongodb-replicaset-3.9.6.tgz b/helm/squidex7/charts/mongodb-replicaset-3.9.6.tgz deleted file mode 100644 index 3079c403c..000000000 Binary files a/helm/squidex7/charts/mongodb-replicaset-3.9.6.tgz and /dev/null differ diff --git a/helm/squidex7/templates/_helpers.tpl b/helm/squidex7/templates/_helpers.tpl index bb29cde14..05e2e95e5 100644 --- a/helm/squidex7/templates/_helpers.tpl +++ b/helm/squidex7/templates/_helpers.tpl @@ -26,8 +26,8 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{- define "squidex.mongoDefaultHostname" }} {{- $release := .Release}} {{- $clusterSuffix := .Values.clusterSuffix}} - {{- range $index, $i := until (int (index .Values "mongodb-replicaset").replicas) }} - {{- $replica := printf "%s-mongodb-replicaset-%d.%s-mongodb-replicaset.%s.svc.%s" $release.Name $i $release.Name $release.Namespace $clusterSuffix }} + {{- range $index, $i := until (int (index .Values "mongodb").replicaCount) }} + {{- $replica := printf "%s-mongodb-%d.%s-mongodb-headless.%s.svc.%s" $release.Name $i $release.Name $release.Namespace $clusterSuffix }} {{- if eq $i 0}} {{- $replica }} {{- else -}} diff --git a/helm/squidex7/values.yaml b/helm/squidex7/values.yaml index 8c4290a86..cdc56161a 100644 --- a/helm/squidex7/values.yaml +++ b/helm/squidex7/values.yaml @@ -27,9 +27,6 @@ image: ## @param image.repository Squidex image registry ## repository: squidex/squidex - ## @param image.tag Override Squidex image tag; use chart's AppVersion otherwise - ## - # tag: "7.0.2" ## @param image.pullPolicy Squidex image pull policy ## pullPolicy: IfNotPresent @@ -50,7 +47,7 @@ clusterSuffix: cluster.local ## Set to true to run Squidex as nonroot. Defaults to false for backwards compatibility. runAsNonRoot: false -## @param podSecurityContext - object - optional +## @skip podSecurityContext - object - optional ## You can modify the security context used to run PODS in the cluster ## For information regarding which settings are required per policy see: https://kubernetes.io/docs/concepts/security/pod-security-standards/ ## An example that follows the Restricted profile is described below: @@ -63,7 +60,7 @@ podSecurityContext: runAsGroup: 10000 fsGroup: 10000 -## @param containerSecurityContext - object - optional +## @skip containerSecurityContext - object - optional ## You can modify the security context used to run CONTAINERS in the cluster ## For information regarding which settings are required per policy see: https://kubernetes.io/docs/concepts/security/pod-security-standards/ ## An example that follows the Restricted profile is described below: @@ -85,6 +82,7 @@ ingress: ## If true, Squidex Ingress will be created. ## enabled: true + ## @param ingress.ingressClassName The ingress class. ingressClassName: nginx ## Squidex Ingress annotations # annotations: @@ -240,56 +238,62 @@ env: ASSETSTORE__TYPE: MongoDb ## @param env.URLS__BASEURL Set the base url of your application, to generate correct urls in background process. + ## URLS__BASEURL: https://squidex.local/ # ## @param env.URLS__ENFORCEHTTPS Set it to true to redirect the user from http to https permanently + ## URLS__ENFORCEHTTPS: false - ## @param env.ASPNETCORE_URLS: an override to ensure that kestrel starts on a non-privileged port + ## @param env.ASPNETCORE_URLS An override to ensure that kestrel starts on a non-privileged port + ## ASPNETCORE_URLS: http://+:80 ## @section MongoDB parameters -mongodb-replicaset: - ## @param mongodb-replicaset.enabled Uses the custom mongoDB instance. +mongodb: + ## @param mongodb.architecture MongoDB(®) architecture (standalone or replicaset + ## + architecture: replicaset + ## @param mongodb.enabled Uses the custom mongoDB instance. ## enabled: true - ## @param mongodb-replicaset.replicas The number of replicas. + ## @param mongodb.replicaCount The number of replicas. ## - replicas: 3 + replicaCount: 3 - ## @skip mongodb-replicaset.auth auth: + ## @param mongodb.auth.enabled Enable authentication for MongoDB. + ## enabled: false - existingKeySecret: "" - existingAdminSecret: "" - existingMetricsSecret: "" - # adminUser: username - # adminPassword: password - # metricsUser: metrics - # metricsPassword: password - # key: keycontent + ## @param mongodb.auth.rootUsername The MongoDB root user name. + ## + rootUsername: "" + ## @param mongodb.auth.rootPassword The MongoDB root password. + ## + rootPassword: "" + ## @param mongodb.auth.existingSecret The name of the existing secret to use for authentication. + ## + existingSecret: "" - persistentVolume: - ## @param mongodb-replicaset.persistentVolume.enabled If true, persistent volume claims are created. + persistence: + ## @param mongodb.persistence.enabled If true, persistent volume claims are created. ## enabled: true - ## @param mongodb-replicaset.persistentVolume.storageClass Persistent volume storage class. - ## mongodb-replicaset data Persistent Volume Storage Class - ## If defined, storageClassName: - ## If set to "-", storageClassName: "", which disables dynamic provisioning - ## If undefined (the default) or set to null, no storageClassName spec is - ## set, choosing the default provisioner. (gp2 on AWS, standard on - ## GKE, AWS & OpenStack) - ## + ## @param mongodb.persistence.storageClass The storage class for the persistent volume claim. ## storageClass: "" - ## @param mongodb-replicaset.persistentVolume.accessModes Persistent volume access modes. + ## @param mongodb.persistence.accessModes Persistent volume access modes. ## accessModes: - ReadWriteOnce - ## @param mongodb-replicaset.persistentVolume.size Persistent volume size. + ## @param mongodb.persistence.size Persistent volume size. ## size: 10Gi + + ## @skip mongodb.arbiter + arbiter: + ## @skip mongodb.arbiter.enabled + enabled: false - ## @skip mongodb-replicaset.nodeSelector + ## @skip mongodb.nodeSelector nodeSelector: {}