From da45c84fb7e5945a2b0a4054163fe302f5d8892b Mon Sep 17 00:00:00 2001 From: Paul Voss Date: Wed, 20 Jul 2022 12:37:34 +0200 Subject: [PATCH 01/14] Add podAnnotations to pxc-operator Signed-off-by: Paul Voss --- charts/pxc-operator/templates/deployment.yaml | 4 ++++ charts/pxc-operator/values.yaml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/charts/pxc-operator/templates/deployment.yaml b/charts/pxc-operator/templates/deployment.yaml index cc77a715..06dd83ca 100644 --- a/charts/pxc-operator/templates/deployment.yaml +++ b/charts/pxc-operator/templates/deployment.yaml @@ -18,6 +18,10 @@ spec: type: RollingUpdate template: metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} labels: app.kubernetes.io/component: operator app.kubernetes.io/name: {{ include "pxc-operator.name" . }} diff --git a/charts/pxc-operator/values.yaml b/charts/pxc-operator/values.yaml index c1043374..fb028ec9 100644 --- a/charts/pxc-operator/values.yaml +++ b/charts/pxc-operator/values.yaml @@ -40,3 +40,5 @@ nodeSelector: {} tolerations: [] affinity: {} + +podAnnotations: {} From 8fa11c28836c215f17e8801d1eb9cd61bb71d5f5 Mon Sep 17 00:00:00 2001 From: Damiano Albani Date: Mon, 26 Sep 2022 13:04:46 +0200 Subject: [PATCH 02/14] Fix container port for metrics --- charts/psmdb-operator/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/psmdb-operator/templates/deployment.yaml b/charts/psmdb-operator/templates/deployment.yaml index 4a744c17..753e4e53 100644 --- a/charts/psmdb-operator/templates/deployment.yaml +++ b/charts/psmdb-operator/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - - containerPort: 60000 + - containerPort: 8080 protocol: TCP name: metrics command: From d64f24e1172e9a5bb3e20e9ee089e06793c21011 Mon Sep 17 00:00:00 2001 From: Damiano Albani Date: Mon, 26 Sep 2022 13:05:53 +0200 Subject: [PATCH 03/14] Add port for health To be used for liveness and readiness probes. --- .../psmdb-operator/templates/deployment.yaml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/charts/psmdb-operator/templates/deployment.yaml b/charts/psmdb-operator/templates/deployment.yaml index 753e4e53..3af1edb2 100644 --- a/charts/psmdb-operator/templates/deployment.yaml +++ b/charts/psmdb-operator/templates/deployment.yaml @@ -29,6 +29,9 @@ spec: - containerPort: 8080 protocol: TCP name: metrics + - containerPort: 8081 + protocol: TCP + name: health command: - percona-server-mongodb-operator env: @@ -48,14 +51,14 @@ spec: value: "{{ .Values.env.resyncPeriod }}" - name: LOG_VERBOSE value: "{{ .Values.env.logVerbose }}" - # livenessProbe: - # httpGet: - # path: / - # port: metrics - # readinessProbe: - # httpGet: - # path: / - # port: metrics + livenessProbe: + httpGet: + path: /healthz + port: health + readinessProbe: + httpGet: + path: /healthz + port: health resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }} From 387d989b272b947ad6d6cdcf5031bdcd962c6f5f Mon Sep 17 00:00:00 2001 From: Damiano Albani Date: Mon, 26 Sep 2022 12:56:14 +0200 Subject: [PATCH 04/14] Bump chart version --- charts/psmdb-operator/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/psmdb-operator/Chart.yaml b/charts/psmdb-operator/Chart.yaml index 97059010..450c2174 100644 --- a/charts/psmdb-operator/Chart.yaml +++ b/charts/psmdb-operator/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.13.0" description: A Helm chart for Deploying the Percona Kubernetes Operator for Percona Server for MongoDB name: psmdb-operator home: https://www.percona.com/doc/kubernetes-operator-for-psmongodb/kubernetes.html -version: 1.13.1 +version: 1.13.2 maintainers: - name: cap1984 email: ivan.pylypenko@percona.com From a7c87ff0fcda1110c31632a461af6544e3ce2891 Mon Sep 17 00:00:00 2001 From: Sergey Pronin Date: Tue, 8 Aug 2023 10:55:46 +0300 Subject: [PATCH 05/14] K8SPG-416 Update values.yaml --- charts/pg-db/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/pg-db/values.yaml b/charts/pg-db/values.yaml index 6a1ee8a1..b1ded965 100644 --- a/charts/pg-db/values.yaml +++ b/charts/pg-db/values.yaml @@ -266,6 +266,8 @@ pmm: # max_worker_processes: 2 # shared_buffers: 1GB # work_mem: 2MB +# pg_hba: +# - host all mytest 123.123.123.123/32 reject secrets: name: From ca54d9010f53ec940e49a76aa4ea7b7017d75eed Mon Sep 17 00:00:00 2001 From: Sergey Pronin Date: Tue, 8 Aug 2023 10:58:55 +0300 Subject: [PATCH 06/14] Update README.md --- charts/pg-db/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/pg-db/README.md b/charts/pg-db/README.md index 6934a1fd..fac8df20 100644 --- a/charts/pg-db/README.md +++ b/charts/pg-db/README.md @@ -147,6 +147,8 @@ The chart can be customized using the following configurable parameters: | `pmm.serverHost` | PMM server related K8S service hostname | `monitoring-service` | | `pmm.resources.requests.memory` | Container resource request for RAM | `200M` | | `pmm.resources.requests.cpu` | Container resource request for CPU | `500m` | +| `patroni.dynamicConfiguration.postgresql.parameters` | Custom PostgreSQL configuration options | `{}` | +| `patroni.dynamicConfiguration.postgresql.pg_hba` | PostgreSQL Host-Based Authentication section | `{}` | | `secrets.name` | Database secrets object name. Object will be autogenerated if the name is not explicitly specified |`-users`| | `secrets.primaryuser` | primary user password (in use for replication only) |`autogrenerated by operator`| | `secrets.postgres` | postges user password (superuser, not accessible via pgbouncer) |`autogrenerated by operator`| From 9f0004513b04c7502b3ca3891db8851142431e86 Mon Sep 17 00:00:00 2001 From: Sergey Pronin Date: Tue, 8 Aug 2023 10:59:08 +0300 Subject: [PATCH 07/14] Update Chart.yaml --- charts/pg-db/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/pg-db/Chart.yaml b/charts/pg-db/Chart.yaml index 480bc341..cc1dfa8d 100644 --- a/charts/pg-db/Chart.yaml +++ b/charts/pg-db/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: pg-db description: 'A Helm chart to deploy the PostgreSQL database with the Percona Operator for PostgreSQL' type: application -version: 2.2.4 +version: 2.2.5 appVersion: 2.2.0 home: https://docs.percona.com/percona-operator-for-postgresql/2.0/ maintainers: From 454dadaa4c6bc91a2bb22a5131c4a83d03b36472 Mon Sep 17 00:00:00 2001 From: Tomislav Plavcic Date: Tue, 23 Jan 2024 15:39:53 +0100 Subject: [PATCH 08/14] K8SPG-497 - Update pg-db and pg-operator charts for 2.3.1 release --- charts/pg-db/Chart.yaml | 4 ++-- charts/pg-db/README.md | 8 ++++---- charts/pg-db/values.yaml | 4 ++-- charts/pg-operator/Chart.yaml | 4 ++-- charts/pg-operator/README.md | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/charts/pg-db/Chart.yaml b/charts/pg-db/Chart.yaml index 29115a41..8628b348 100644 --- a/charts/pg-db/Chart.yaml +++ b/charts/pg-db/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pg-db description: 'A Helm chart to deploy the PostgreSQL database with the Percona Operator for PostgreSQL' type: application -version: 2.3.1 -appVersion: 2.3.0 +version: 2.3.2 +appVersion: 2.3.1 home: https://docs.percona.com/percona-operator-for-postgresql/2.0/ maintainers: - name: tplavcic diff --git a/charts/pg-db/README.md b/charts/pg-db/README.md index 30159bf0..0cdcc5e8 100644 --- a/charts/pg-db/README.md +++ b/charts/pg-db/README.md @@ -24,7 +24,7 @@ To install the chart with the `pg` release name using a dedicated namespace (rec ```sh helm repo add percona https://percona.github.io/percona-helm-charts/ -helm install my-db percona/pg-db --version 2.3.0 --namespace my-namespace +helm install my-db percona/pg-db --version 2.3.1 --namespace my-namespace ``` The chart can be customized using the following configurable parameters: @@ -32,9 +32,9 @@ The chart can be customized using the following configurable parameters: | Parameter | Description | Default | | ------------------------------- | ------------------------------------------------------------------------------|-------------------------------------------------------------| | `finalizers` | Finalizers list | `{}` | -| `crVersion` | CR Cluster Manifest version | `2.3.0` | +| `crVersion` | CR Cluster Manifest version | `2.3.1` | | `repository` | PostgreSQL container image repository | `percona/percona-postgresql-operator` | -| `image` | Postgres image | `percona/percona-postgresql-operator:2.3.0-ppg16-postgres` | +| `image` | Postgres image | `percona/percona-postgresql-operator:2.3.1-ppg16-postgres` | | `imagePullPolicy` | image Pull Policy | `Always` | | `port` | PostgreSQL port | `5432` | | `postgresVersion` | PostgreSQL container version tag | `16` | @@ -116,7 +116,7 @@ The chart can be customized using the following configurable parameters: | `backups.restore.enabled` | Enables or disables restoring a previously made backup | `false` | | `backups.restore.repoName` | Name of the pgBackRest repository that contains the backup to be restored | `repo1` | | `backups.restore.options` | The pgBackRest command-line options for the pgBackRest restore command | `--type=time` | -| `backups.pgbackrest.image` | Set this variable if you need to use a custom pgBackrest image | `percona/percona-postresql-operator:2.3.0-ppg16-pgbackrest` | +| `backups.pgbackrest.image` | Set this variable if you need to use a custom pgBackrest image | `percona/percona-postresql-operator:2.3.1-ppg16-pgbackrest` | | `backups.repos.repo2.s3.bucket` | Storage bucket | `` | | `backups.repos.repo2.s3.region` | S3-compatible storage name | `` | | `backups.repos.repo2.s3.endpoint` | S3-compatible storage endpoint | `` | diff --git a/charts/pg-db/values.yaml b/charts/pg-db/values.yaml index b24ffc40..a5ae8c7d 100644 --- a/charts/pg-db/values.yaml +++ b/charts/pg-db/values.yaml @@ -8,7 +8,7 @@ finalizers: # Set this if you want that operator deletes the ssl objects on cluster deletion # - percona.com/delete-ssl -crVersion: 2.3.0 +crVersion: 2.3.1 repository: registry-1.percona.com/percona/percona-postgresql-operator image: "" imagePullPolicy: Always @@ -284,7 +284,7 @@ pmm: # work_mem: 2MB # # extensions: -# image: percona/percona-postgresql-operator:2.3.0 +# image: percona/percona-postgresql-operator:2.3.1 # imagePullPolicy: Always # storage: # type: s3 diff --git a/charts/pg-operator/Chart.yaml b/charts/pg-operator/Chart.yaml index 87206def..761ce51f 100644 --- a/charts/pg-operator/Chart.yaml +++ b/charts/pg-operator/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pg-operator description: 'A Helm chart to deploy the Percona Operator for PostgreSQL' type: application -version: 2.3.2 -appVersion: 2.3.0 +version: 2.3.3 +appVersion: 2.3.1 home: https://docs.percona.com/percona-operator-for-postgresql/2.0/ maintainers: - name: tplavcic diff --git a/charts/pg-operator/README.md b/charts/pg-operator/README.md index 8eb433c7..a31c7915 100644 --- a/charts/pg-operator/README.md +++ b/charts/pg-operator/README.md @@ -35,7 +35,7 @@ Chart. | Parameter | Description | Default | | ------------------------------- | ------------------------------------------------------------------------| -------------------------------------------------| -| `image` | PG Operator Container image full path | `percona/percona-postgresql-operator:2.3.0` | +| `image` | PG Operator Container image full path | `percona/percona-postgresql-operator:2.3.1` | | `imagePullPolicy` | PG Operator Container pull policy | `Always`| | `resources` | Resource requests and limits | `{}` | | `nodeSelector` | Labels for Pod assignment | `{}` | @@ -49,7 +49,7 @@ Chart. To deploy Percona Operator for PostgreSQL cluster with disabled telemetry run the following command: ```sh -helm install my-db percona/pg-db --version 2.3.0 --namespace my-namespace +helm install my-db percona/pg-db --version 2.3.1 --namespace my-namespace ``` See more about Percona Operator for PostgreSQL deployment in its chart [here](https://github.com/percona/percona-helm-charts/tree/main/charts/pg-db) or in the [Helm chart installation guide](https://www.percona.com/doc/kubernetes-operator-for-postgresql/helm.html). From 7c0559b12ae8641b88695b918bee1dcc44d315a5 Mon Sep 17 00:00:00 2001 From: Don Wonders Date: Tue, 23 Jan 2024 21:14:43 -0500 Subject: [PATCH 09/14] add support for adding annotations to deployment, pod, service account --- charts/psmdb-operator/README.md | 3 +++ charts/psmdb-operator/templates/deployment.yaml | 6 +++++- charts/psmdb-operator/templates/role-binding.yaml | 2 ++ charts/psmdb-operator/values.yaml | 10 ++++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/charts/psmdb-operator/README.md b/charts/psmdb-operator/README.md index 2a2a0337..040421cd 100644 --- a/charts/psmdb-operator/README.md +++ b/charts/psmdb-operator/README.md @@ -32,6 +32,9 @@ The chart can be customized using the following configurable parameters: | `image.pullSecrets` | PSMDB Operator Pod pull secret | `[]` | | `replicaCount` | PSMDB Operator Pod quantity | `1` | | `tolerations` | List of node taints to tolerate | `[]` | +| `annotations` | PSMDB Operator Deployment annotations | `{}` | +| `podAnnotations` | PSMDB Operator pod annotations | `{}` | +| `serviceAccount.annotations` | PSMDB Operator ServiceAccount annotations | `{}` | | `resources` | Resource requests and limits | `{}` | | `nodeSelector` | Labels for Pod assignment | `{}` | | `podAnnotations` | Annotations for pod | `{}` | diff --git a/charts/psmdb-operator/templates/deployment.yaml b/charts/psmdb-operator/templates/deployment.yaml index a208e8ef..feb0ab8b 100644 --- a/charts/psmdb-operator/templates/deployment.yaml +++ b/charts/psmdb-operator/templates/deployment.yaml @@ -4,7 +4,9 @@ metadata: name: {{ include "psmdb-operator.fullname" . }} namespace: {{ .Release.Namespace }} labels: -{{ include "psmdb-operator.labels" . | indent 4 }} + {{- include "psmdb-operator.labels" . | nindent 4 }} + annotations: + {{- toYaml .Values.annotations | nindent 4 }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -20,6 +22,8 @@ spec: labels: app.kubernetes.io/name: {{ include "psmdb-operator.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + annotations: + {{- toYaml .Values.podAnnotations | nindent 8 }} spec: serviceAccountName: {{ include "psmdb-operator.fullname" . }} securityContext: diff --git a/charts/psmdb-operator/templates/role-binding.yaml b/charts/psmdb-operator/templates/role-binding.yaml index 3f452840..0f0e4c3c 100644 --- a/charts/psmdb-operator/templates/role-binding.yaml +++ b/charts/psmdb-operator/templates/role-binding.yaml @@ -4,6 +4,8 @@ kind: ServiceAccount metadata: name: {{ include "psmdb-operator.fullname" . }} namespace: {{ .Release.Namespace }} + annotations: + {{- toYaml .Values.serviceAccount.annotations | nindent 4 }} --- {{- end }} {{- if .Values.rbac.create }} diff --git a/charts/psmdb-operator/values.yaml b/charts/psmdb-operator/values.yaml index ab989c84..c6a7aad6 100644 --- a/charts/psmdb-operator/values.yaml +++ b/charts/psmdb-operator/values.yaml @@ -62,6 +62,16 @@ fullnameOverride: "" env: resyncPeriod: 5s +# annotations to add to the deployment +annotations: {} + +# annotations to add to the pod +podAnnotations: {} + +serviceAccount: + # annotations to add to the service account + annotations: {} + resources: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little From 7847a560cc5d40c6c1b142a6450e4b2ab3512cc3 Mon Sep 17 00:00:00 2001 From: Thomas Decaux Date: Mon, 29 Jan 2024 12:12:46 -0500 Subject: [PATCH 10/14] fix(pmm/secret): use Values.secret.annotations (#263) * fix(pmm/secret): use Values.secret.annotations * Add "secret.annotations" in values.yaml * edit readme * bump chart patch version --- charts/pmm/Chart.yaml | 2 +- charts/pmm/README.md | 1 + charts/pmm/templates/secret.yaml | 2 +- charts/pmm/values.yaml | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/pmm/Chart.yaml b/charts/pmm/Chart.yaml index d9967ef6..f47183d3 100644 --- a/charts/pmm/Chart.yaml +++ b/charts/pmm/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: pmm description: A Helm chart for Percona Monitoring and Management (PMM) type: application -version: 1.3.8 +version: 1.3.9 appVersion: "2.41.0" home: https://github.com/percona/pmm maintainers: diff --git a/charts/pmm/README.md b/charts/pmm/README.md index 2d543758..984587d9 100644 --- a/charts/pmm/README.md +++ b/charts/pmm/README.md @@ -59,6 +59,7 @@ It removes all of the resources associated with the last release of the chart as | Name | Description | Value | | --------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | | `secret.name` | Defines the name of the k8s secret that holds passwords and other secrets | `pmm-secret` | +| `secret.annotations` | Defines the annotations of the k8s secret that holds passwords and other secrets | `{}` | | `secret.create` | If true then secret will be generated by Helm chart. Otherwise it is expected to be created by user. | `true` | | `secret.pmm_password` | Initial PMM password - it changes only on the first deployment, ignored if PMM was already provisioned and just restarted. If PMM admin password is not set, it will be generated. | `""` | | `certs` | Optional certificates, if not provided PMM would use generated self-signed certificates, | `{}` | diff --git a/charts/pmm/templates/secret.yaml b/charts/pmm/templates/secret.yaml index 50c827c8..040235f4 100644 --- a/charts/pmm/templates/secret.yaml +++ b/charts/pmm/templates/secret.yaml @@ -5,7 +5,7 @@ metadata: name: {{ .Values.secret.name }} labels: {{- include "pmm.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} + {{- with .Values.secret.annotations }} annotations: {{- toYaml . | nindent 4 }} {{- end }} diff --git a/charts/pmm/values.yaml b/charts/pmm/values.yaml index d19f1f02..78990397 100644 --- a/charts/pmm/values.yaml +++ b/charts/pmm/values.yaml @@ -59,6 +59,8 @@ secret: ## @param secret.name Defines the name of the k8s secret that holds passwords and other secrets ## name: pmm-secret + ## @param secret.annotations -- Secret annotations configuration + annotations: {} ## @param secret.create If true then secret will be generated by Helm chart. Otherwise it is expected to be created by user. ## create: true From deda5ee53ca66092f280ad424db6390f3fcbf29e Mon Sep 17 00:00:00 2001 From: Tomislav Plavcic Date: Tue, 30 Jan 2024 17:02:35 +0100 Subject: [PATCH 11/14] K8SPXC-1351 - Bump pxc-operator chart and update readme for podAnnotations --- charts/pxc-operator/Chart.yaml | 2 +- charts/pxc-operator/README.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/pxc-operator/Chart.yaml b/charts/pxc-operator/Chart.yaml index 12128d39..71f6a905 100644 --- a/charts/pxc-operator/Chart.yaml +++ b/charts/pxc-operator/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.13.0 description: A Helm chart for deploying the Percona Operator for MySQL (based on Percona XtraDB Cluster) name: pxc-operator home: https://docs.percona.com/percona-operator-for-mysql/pxc/ -version: 1.13.3 +version: 1.13.4 maintainers: - name: tplavcic email: tomislav.plavcic@percona.com diff --git a/charts/pxc-operator/README.md b/charts/pxc-operator/README.md index 75b4acbe..4cccf3ae 100644 --- a/charts/pxc-operator/README.md +++ b/charts/pxc-operator/README.md @@ -32,6 +32,7 @@ The chart can be customized using the following configurable parameters: | `imagePullSecrets` | PXC Operator Pod pull secret | `[]` | | `replicaCount` | PXC Operator Pod quantity | `1` | | `tolerations` | List of node taints to tolerate | `[]` | +| `podAnnotations` | Operator Pod user-defined annotations | `{}` | | `resources` | Resource requests and limits | `{}` | | `nodeSelector` | Labels for Pod assignment | `{}` | | `logStructured` | Force PXC operator to print JSON-wrapped log messages | `false` | From 528bed66533bc08dd66bd80b1991dd111eac26c0 Mon Sep 17 00:00:00 2001 From: Tomislav Plavcic Date: Tue, 30 Jan 2024 18:24:55 +0100 Subject: [PATCH 12/14] K8SPSMDB-1037 - psmdb-operator - annotations for deployment, pod and service account --- charts/psmdb-operator/Chart.yaml | 2 +- charts/psmdb-operator/README.md | 4 ++-- charts/psmdb-operator/templates/deployment.yaml | 6 +++--- .../psmdb-operator/templates/role-binding.yaml | 4 +++- charts/psmdb-operator/values.yaml | 16 ++++++---------- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/charts/psmdb-operator/Chart.yaml b/charts/psmdb-operator/Chart.yaml index 602848ef..aaf6b1e5 100644 --- a/charts/psmdb-operator/Chart.yaml +++ b/charts/psmdb-operator/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.15.0" description: A Helm chart for deploying the Percona Operator for MongoDB name: psmdb-operator home: https://docs.percona.com/percona-operator-for-mongodb/ -version: 1.15.0 +version: 1.15.1 maintainers: - name: tplavcic email: tomislav.plavcic@percona.com diff --git a/charts/psmdb-operator/README.md b/charts/psmdb-operator/README.md index 040421cd..3237153e 100644 --- a/charts/psmdb-operator/README.md +++ b/charts/psmdb-operator/README.md @@ -33,8 +33,7 @@ The chart can be customized using the following configurable parameters: | `replicaCount` | PSMDB Operator Pod quantity | `1` | | `tolerations` | List of node taints to tolerate | `[]` | | `annotations` | PSMDB Operator Deployment annotations | `{}` | -| `podAnnotations` | PSMDB Operator pod annotations | `{}` | -| `serviceAccount.annotations` | PSMDB Operator ServiceAccount annotations | `{}` | +| `podAnnotations` | PSMDB Operator Pod annotations | `{}` | | `resources` | Resource requests and limits | `{}` | | `nodeSelector` | Labels for Pod assignment | `{}` | | `podAnnotations` | Annotations for pod | `{}` | @@ -43,6 +42,7 @@ The chart can be customized using the following configurable parameters: | `rbac.create` | If false RBAC will not be created. RBAC resources will need to be created manually | `true` | | `securityContext` | Container Security Context | `{}` | | `serviceAccount.create` | If false the ServiceAccounts will not be created. The ServiceAccounts must be created manually | `true` | +| `serviceAccount.annotations` | PSMDB Operator ServiceAccount annotations | `{}` | | `logStructured` | Force PSMDB operator to print JSON-wrapped log messages | `false` | | `logLevel` | PSMDB Operator logging level | `INFO` | | `disableTelemetry` | Disable sending PSMDB Operator telemetry data to Percona | `false` | diff --git a/charts/psmdb-operator/templates/deployment.yaml b/charts/psmdb-operator/templates/deployment.yaml index feb0ab8b..c4ccdcd6 100644 --- a/charts/psmdb-operator/templates/deployment.yaml +++ b/charts/psmdb-operator/templates/deployment.yaml @@ -5,8 +5,10 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{- include "psmdb-operator.labels" . | nindent 4 }} + {{- with .Values.annotations }} annotations: - {{- toYaml .Values.annotations | nindent 4 }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -22,8 +24,6 @@ spec: labels: app.kubernetes.io/name: {{ include "psmdb-operator.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - annotations: - {{- toYaml .Values.podAnnotations | nindent 8 }} spec: serviceAccountName: {{ include "psmdb-operator.fullname" . }} securityContext: diff --git a/charts/psmdb-operator/templates/role-binding.yaml b/charts/psmdb-operator/templates/role-binding.yaml index 0f0e4c3c..fb2bdbe3 100644 --- a/charts/psmdb-operator/templates/role-binding.yaml +++ b/charts/psmdb-operator/templates/role-binding.yaml @@ -4,8 +4,10 @@ kind: ServiceAccount metadata: name: {{ include "psmdb-operator.fullname" . }} namespace: {{ .Release.Namespace }} + {{- with .Values.serviceAccount.annotations }} annotations: - {{- toYaml .Values.serviceAccount.annotations | nindent 4 }} + {{- toYaml . | nindent 4 }} + {{- end }} --- {{- end }} {{- if .Values.rbac.create }} diff --git a/charts/psmdb-operator/values.yaml b/charts/psmdb-operator/values.yaml index c6a7aad6..37f58e23 100644 --- a/charts/psmdb-operator/values.yaml +++ b/charts/psmdb-operator/values.yaml @@ -31,7 +31,13 @@ rbac: serviceAccount: # serviceAccount.create: Whether to create the Service Accounts or not create: true + # annotations to add to the service account + annotations: {} + +# annotations to add to the operator deployment +annotations: {} +# annotations to add to the operator pod podAnnotations: {} # prometheus.io/scrape: "true" # prometheus.io/port: "8080" @@ -62,16 +68,6 @@ fullnameOverride: "" env: resyncPeriod: 5s -# annotations to add to the deployment -annotations: {} - -# annotations to add to the pod -podAnnotations: {} - -serviceAccount: - # annotations to add to the service account - annotations: {} - resources: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little From 196fbb204412e0745b4ab04f64f29b6ccd9eec25 Mon Sep 17 00:00:00 2001 From: Tomislav Plavcic Date: Wed, 31 Jan 2024 10:25:15 +0100 Subject: [PATCH 13/14] Add newline in psmdb-operator Chart.yaml --- charts/psmdb-operator/Chart.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/psmdb-operator/Chart.yaml b/charts/psmdb-operator/Chart.yaml index 97e6cc39..af93f046 100644 --- a/charts/psmdb-operator/Chart.yaml +++ b/charts/psmdb-operator/Chart.yaml @@ -10,4 +10,5 @@ maintainers: - name: nmarukovich email: natalia.marukovich@percona.com - name: spron-in - email: sergey.pronin@percona.com \ No newline at end of file + email: sergey.pronin@percona.com + From 6f9583f25e47661de8df022a76e7452803e3cf15 Mon Sep 17 00:00:00 2001 From: Tomislav Plavcic Date: Wed, 31 Jan 2024 10:33:15 +0100 Subject: [PATCH 14/14] Remove newline in psmdb-operator Chart.yaml --- charts/psmdb-operator/Chart.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/psmdb-operator/Chart.yaml b/charts/psmdb-operator/Chart.yaml index af93f046..40e79057 100644 --- a/charts/psmdb-operator/Chart.yaml +++ b/charts/psmdb-operator/Chart.yaml @@ -11,4 +11,3 @@ maintainers: email: natalia.marukovich@percona.com - name: spron-in email: sergey.pronin@percona.com -