diff options
Diffstat (limited to 'kubernetes/common')
| -rw-r--r-- | kubernetes/common/cassandra/values.yaml | 8 | ||||
| -rw-r--r-- | kubernetes/common/common/templates/_cassOp.tpl | 14 | ||||
| -rw-r--r-- | kubernetes/common/common/templates/_mariadb.tpl | 33 | ||||
| -rw-r--r-- | kubernetes/common/mariadb-galera/templates/service.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/common/mariadb-galera/values.yaml | 7 |
5 files changed, 43 insertions, 23 deletions
diff --git a/kubernetes/common/cassandra/values.yaml b/kubernetes/common/cassandra/values.yaml index 930fe9b2d3..205c7113df 100644 --- a/kubernetes/common/cassandra/values.yaml +++ b/kubernetes/common/cassandra/values.yaml @@ -29,7 +29,7 @@ global: # global defaults enableServiceAccount: false k8ssandraOperator: - cassandraVersion: 4.0.1 + cassandraVersion: 4.0.10 persistence: #storageClassName: default size: 10Gi @@ -41,12 +41,16 @@ k8ssandraOperator: casOptions: authorizer: AllowAllAuthorizer jvmOptions: - heapSize: 512M + heap_initial_size: 512M + heap_max_size: 4096M hostNetwork: false datacenters: - name: dc1 size: 3 + reaper: + enabled: true stargate: + enabled: true tag: v1.0.76 size: 1 jvmOptions: diff --git a/kubernetes/common/common/templates/_cassOp.tpl b/kubernetes/common/common/templates/_cassOp.tpl index d0f23877a4..b9f676665f 100644 --- a/kubernetes/common/common/templates/_cassOp.tpl +++ b/kubernetes/common/common/templates/_cassOp.tpl @@ -23,17 +23,30 @@ kind: K8ssandraCluster metadata: name: {{ .Values.k8ssandraOperator.config.clusterName }} spec: + {{ if .Values.k8ssandraOperator.reaper.enabled -}} reaper: + initContainerImage: + registry: {{ include "repositoryGenerator.dockerHubRepository" . }} containerImage: registry: {{ include "repositoryGenerator.dockerHubRepository" . }} autoScheduling: enabled: true + metadata: + commonLabels: + app: {{ .Values.k8ssandraOperator.config.clusterName }}-reaper + version: {{ .Values.k8ssandraOperator.cassandraVersion }} + {{- end }} + {{ if .Values.k8ssandraOperator.stargate.enabled -}} stargate: containerImage: registry: {{ include "repositoryGenerator.dockerHubRepository" . }} tag: {{ .Values.k8ssandraOperator.stargate.tag }} size: {{ .Values.k8ssandraOperator.stargate.size }} heapSize: {{ .Values.k8ssandraOperator.stargate.jvmOptions.heapSize }} + metadata: + commonLabels: + app: {{ .Values.k8ssandraOperator.config.clusterName }}-stargate + version: {{ .Values.k8ssandraOperator.cassandraVersion }} livenessProbe: initialDelaySeconds: 200 periodSeconds: 10 @@ -46,6 +59,7 @@ spec: failureThreshold: 20 successThreshold: 1 timeoutSeconds: 20 + {{- end }} cassandra: serverVersion: {{ .Values.k8ssandraOperator.cassandraVersion }} storageConfig: diff --git a/kubernetes/common/common/templates/_mariadb.tpl b/kubernetes/common/common/templates/_mariadb.tpl index 7e127e2437..5e0aed587c 100644 --- a/kubernetes/common/common/templates/_mariadb.tpl +++ b/kubernetes/common/common/templates/_mariadb.tpl @@ -126,6 +126,7 @@ spec: name: {{ $dbinst }} characterSet: utf8 collate: utf8_general_ci + retryInterval: 5s {{- end -}} {{/* @@ -151,6 +152,7 @@ spec: key: password # This field is immutable and defaults to 10 maxUserConnections: 100 + retryInterval: 5s {{- end -}} {{/* @@ -174,6 +176,7 @@ spec: database: {{ $dbname }} table: "*" username: {{ $dbuser }} + retryInterval: 5s grantOption: true {{- end -}} @@ -241,27 +244,20 @@ spec: rootPasswordSecretKeyRef: name: {{ $dbrootsecret }} key: password - image: - repository: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.mariadbOperator.image }} - tag: {{ $dot.Values.mariadbOperator.appVersion }} - pullPolicy: IfNotPresent + image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.mariadbOperator.image }}:{{ $dot.Values.mariadbOperator.appVersion }} + imagePullPolicy: IfNotPresent imagePullSecrets: - name: {{ include "common.namespace" . }}-docker-registry-key port: 3306 replicas: {{ $dot.Values.replicaCount }} + {{- if $dot.Values.mariadbOperator.galera.enabled }} galera: - {{- if eq (int $dot.Values.replicaCount) 1 }} - enabled: false - {{- else }} - enabled: {{ $dot.Values.mariadbOperator.galera.enabled }} - {{- end }} + enabled: true sst: mariabackup replicaThreads: 1 agent: - image: - repository: {{ include "repositoryGenerator.githubContainerRegistry" . }}/{{ .Values.mariadbOperator.galera.agentImage }} - tag: {{ $dot.Values.mariadbOperator.galera.agentVersion }} - pullPolicy: IfNotPresent + image: {{ include "repositoryGenerator.githubContainerRegistry" . }}/{{ .Values.mariadbOperator.galera.agentImage }}:{{ $dot.Values.mariadbOperator.galera.agentVersion }} + imagePullPolicy: IfNotPresent port: 5555 kubernetesAuth: enabled: true @@ -274,16 +270,15 @@ spec: podRecoveryTimeout: 5m podSyncTimeout: 10m initContainer: - image: - repository: {{ include "repositoryGenerator.githubContainerRegistry" . }}/{{ $dot.Values.mariadbOperator.galera.initImage }} - tag: {{ $dot.Values.mariadbOperator.galera.initVersion }} - pullPolicy: IfNotPresent + image: {{ include "repositoryGenerator.githubContainerRegistry" . }}/{{ $dot.Values.mariadbOperator.galera.initImage }}:{{ $dot.Values.mariadbOperator.galera.initVersion }} + imagePullPolicy: IfNotPresent volumeClaimTemplate: resources: requests: storage: 50Mi accessModes: - ReadWriteOnce + {{- end }} livenessProbe: exec: command: @@ -334,11 +329,11 @@ spec: resources: {{ include "common.resources" . | nindent 4 }} volumeClaimTemplate: {{- if $dot.Values.mariadbOperator.storageClassName }} - storageClassName: {{ $dot.Values.k8ssandraOperator.persistence.storageClassName }} + storageClassName: {{ $dot.Values.mariadbOperator.storageClassName }} {{- end }} resources: requests: - storage: {{ $dot.Values.persistence.size | quote }} + storage: {{ $dot.Values.mariadbOperator.persistence.size | quote }} accessModes: - ReadWriteOnce {{- if $dot.Values.db.user }} diff --git a/kubernetes/common/mariadb-galera/templates/service.yaml b/kubernetes/common/mariadb-galera/templates/service.yaml index 2dea4e9ac1..e1a910557f 100644 --- a/kubernetes/common/mariadb-galera/templates/service.yaml +++ b/kubernetes/common/mariadb-galera/templates/service.yaml @@ -34,6 +34,10 @@ spec: app: {{ include "common.servicename" . }} portLevelMtls: '{{ .Values.service.internalPort }}': +{{- if .Values.mariadbOperator.galera.enabled }} mode: STRICT +{{- else }} + mode: DISABLE +{{- end }} {{- end }} {{- end }} diff --git a/kubernetes/common/mariadb-galera/values.yaml b/kubernetes/common/mariadb-galera/values.yaml index a749c0959c..1ad72e2956 100644 --- a/kubernetes/common/mariadb-galera/values.yaml +++ b/kubernetes/common/mariadb-galera/values.yaml @@ -57,12 +57,15 @@ secrets: mariadbOperator: image: mariadb appVersion: 11.1.2 + persistence: + #storageClassName: default + size: 3Gi galera: enabled: true agentImage: mariadb-operator/agent - agentVersion: v0.0.2 + agentVersion: v0.0.3 initImage: mariadb-operator/init - initVersion: v0.0.5 + initVersion: v0.0.6 ## String to partially override common.names.fullname template (will maintain the release name) ## |