Merge pull request #183 from RS-PYTHON/update-cloudnative-pg-1-27-0

Update to cloudnative-pg 1.27.0 / postgresql 17.5

Author: nleconte-csgroup

.github/workflows/test-deployment.yml

@@ -49,9 +49,10 @@ jobs:
           conda create -y -n rspy python=3.11
 
           # Install Ansible, Terraform, Openstackclient
-          conda run -n rspy conda install -y -c conda-forge ansible terraform python-openstackclient passlib boto3 kubernetes-helm kubernetes-client python-kubernetes
+          conda run -n rspy conda install -y -c conda-forge "ansible<12" terraform python-openstackclient passlib boto3 kubernetes-helm kubernetes-client python-kubernetes
+
+          conda run -n rspy ansible-galaxy collection install openstack.cloud amazon.aws kubernetes.core community.general
 
-          conda run -n rspy ansible-galaxy collection install openstack.cloud amazon.aws kubernetes.core
           ln -s /usr/share/miniconda/envs/rspy/bin/kubectl /usr/local/bin/kubectl
         shell: bash
       - name: Start minikube
@@ -81,7 +82,15 @@ jobs:
         run: |
           sed -i 's!debug: false!debug: true!g' roles/app-installer/tasks/install_app.yaml
           sed -i 's!cinder.csi.openstack.org!k8s.io/minikube-hostpath!g' apps/00-storage-class/sc-retain.yaml
-          sed -i 's!instances: 3!instances: 2!g' apps/01-cloudnative-pg/cluster.yaml
+          sed -i 's!instances: 3!instances: 1!g' apps/03-cloudnative-pg/cluster.yaml
           sed -i -e 's!https://iam.{{ platform_domain_name }}!http://keycloak-service.iam.svc.cluster.local:8080!g' -e 's!insecure_oidc_skip_issuer_verification="false"!insecure_oidc_skip_issuer_verification="true"!g' apps/oauth2-proxy/values.yaml
+          
+          # Minio for cloudnative pg
+          sed -i -e 's!{{ s3.access_key }}!access_key!' -e 's!{{ s3.secret_key }}!secret_key!' apps/03-cloudnative-pg/secrets.yaml
+          sed -i -e 's!{{ postgresql.bucket }}!bucket!' -e 's!{{ s3.endpoint }}!http://minio.minio.svc.cluster.local:9000!' apps/03-cloudnative-pg/objectstore.yaml
+          helm repo add minio https://charts.min.io/
+          helm repo update minio
+          helm install minio minio/minio --namespace minio --set mode=standalone --set persistence.enabled=false --set resources.requests.memory=1Gi --set rootUser=access_key --set rootPassword=secret_key --set buckets[0].name=bucket --create-namespace --wait
+
           conda run -n rspy --no-capture-output env PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=1 ansible-playbook apps.yaml -i inventory/mycluster/hosts.yaml
         shell: bash

NOTICE.md

@@ -43,14 +43,14 @@ Below are all the FOSS (Free and open-source software) used and their respective
 
 - PostgreSQL
   - Helm chart:
-    - Version: 0.20.1
-    - Licence: [Apache License 2.0](https://github.com/cloudnative-pg/charts/blob/cloudnative-pg-v0.20.1/LICENSE)
-    - Source: <https://github.com/cloudnative-pg/charts/tree/cloudnative-pg-v0.20.1>
+    - Version: 0.26.0
+    - Licence: [Apache License 2.0](https://github.com/cloudnative-pg/charts/blob/cloudnative-pg-v0.26.0/LICENSE)
+    - Source: <https://github.com/cloudnative-pg/charts/tree/cloudnative-pg-v0.26.0>
     - Copyright: Copyright The CloudNativePG authors. [Authors and Contributors](https://github.com/cloudnative-pg/charts/graphs/contributors)
   - Container image(s)
-    - ghcr.io/cloudnative-pg/cloudnative-pg:1.22.1
-      - License: [Apache License 2.0](https://github.com/cloudnative-pg/cloudnative-pg/blob/v1.22.1/LICENSE)
-    - ghcr.io/cloudnative-pg/postgresql:16.1
+    - ghcr.io/cloudnative-pg/cloudnative-pg:1.27.0
+      - License: [Apache License 2.0](https://github.com/cloudnative-pg/cloudnative-pg/blob/v1.27.0/LICENSE)
+    - ghcr.io/cloudnative-pg/postgresql:17.5
       - License: [Apache License 2.0](https://github.com/cloudnative-pg/postgres-containers/blob/main/LICENSE)
 
 - Loki

apps/00-crds-cloudnative-pg/kustomization.yaml

@@ -14,10 +14,17 @@
 
 
 resources:
-- https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/refs/tags/v1.22.1/config/crd/bases/postgresql.cnpg.io_clusters.yaml
-- https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/refs/tags/v1.22.1/config/crd/bases/postgresql.cnpg.io_backups.yaml
-- https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/refs/tags/v1.22.1/config/crd/bases/postgresql.cnpg.io_poolers.yaml
-- https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/refs/tags/v1.22.1/config/crd/bases/postgresql.cnpg.io_scheduledbackups.yaml
+- https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/refs/tags/v1.27.0/config/crd/bases/postgresql.cnpg.io_clusters.yaml
+- https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/refs/tags/v1.27.0/config/crd/bases/postgresql.cnpg.io_backups.yaml
+- https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/refs/tags/v1.27.0/config/crd/bases/postgresql.cnpg.io_scheduledbackups.yaml
+- https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/refs/tags/v1.27.0/config/crd/bases/postgresql.cnpg.io_poolers.yaml
+- https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/refs/tags/v1.27.0/config/crd/bases/postgresql.cnpg.io_imagecatalogs.yaml
+- https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/refs/tags/v1.27.0/config/crd/bases/postgresql.cnpg.io_clusterimagecatalogs.yaml
+- https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/refs/tags/v1.27.0/config/crd/bases/postgresql.cnpg.io_databases.yaml
+- https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/refs/tags/v1.27.0/config/crd/bases/postgresql.cnpg.io_publications.yaml
+- https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/refs/tags/v1.27.0/config/crd/bases/postgresql.cnpg.io_subscriptions.yaml
+- https://raw.githubusercontent.com/cloudnative-pg/cloudnative-pg/refs/tags/v1.27.0/config/crd/bases/postgresql.cnpg.io_failoverquorums.yaml
+- https://raw.githubusercontent.com/cloudnative-pg/plugin-barman-cloud/refs/tags/v0.6.0/config/crd/bases/barmancloud.cnpg.io_objectstores.yaml
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 labels:

apps/01-cert-manager/values.yaml

@@ -41,7 +41,6 @@ cainjector:
             - key: "node-role.kubernetes.io/infra"
               operator: Exists
 
-
 affinity:
   nodeAffinity:
     requiredDuringSchedulingIgnoredDuringExecution:

apps/02-plugin-cloudnative-pg/kustomization.yaml

@@ -0,0 +1,26 @@
+# Copyright 2024 CS Group
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+namespace: database
+
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+labels:
+- includeSelectors: true
+  includeTemplates: true
+  pairs:
+    app.kubernetes.io/instance: '{{ app_name }}'
+    wait-for-deployment: Ready
+resources:
+- https://github.com/cloudnative-pg/plugin-barman-cloud/releases/download/v0.6.0/manifest.yaml

apps/01-cloudnative-pg/cluster.yaml renamed to apps/03-cloudnative-pg/cluster.yaml

@@ -24,18 +24,11 @@ spec:
 
   enableSuperuserAccess: true
 
-  backup:
-    barmanObjectStore:
-      destinationPath: s3://{{ postgresql.bucket }}/postgresql-cluster/
-      endpointURL: {{ s3.endpoint }}
-      s3Credentials:
-        accessKeyId:
-          key: AK
-          name: psql-backup-obs
-        secretAccessKey:
-          key: SK
-          name: psql-backup-obs
-    retentionPolicy: "10d"
+  plugins:
+  - name: barman-cloud.cloudnative-pg.io
+    isWALArchiver: true
+    parameters:
+      barmanObjectName: ovh-gra
 
   postgresql:
     parameters:

apps/01-cloudnative-pg/configmap-create-database.yaml renamed to apps/03-cloudnative-pg/configmap-create-database.yaml

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 namespace: database
 
 helmCharts:
@@ -21,13 +20,16 @@ helmCharts:
   releaseName: '{{ app_name }}'
   repo: https://cloudnative-pg.io/charts/
   valuesFile: values.yaml
-  version: 0.20.1
+  version: 0.26.0
 
 resources:
 - cluster.yaml
 - configmap-create-database.yaml
-- secrets.yaml
+- objectstore.yaml
 - scheduled-backup.yaml
+- secrets.yaml
+- servicemonitor.yaml
+
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 labels:

apps/01-cloudnative-pg/kustomization.yaml renamed to apps/03-cloudnative-pg/kustomization.yaml

@@ -0,0 +1,30 @@
+# Copyright 2024 CS Group
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: barmancloud.cnpg.io/v1
+kind: ObjectStore
+metadata:
+  name: ovh-gra
+spec:
+  configuration:
+    destinationPath: s3://{{ postgresql.bucket }}/postgresql-cluster/
+    endpointURL: {{ s3.endpoint }}
+    s3Credentials:
+      accessKeyId:
+        key: AK
+        name: psql-backup-obs
+      secretAccessKey:
+        key: SK
+        name: psql-backup-obs
+  retentionPolicy: "10d"

apps/03-cloudnative-pg/objectstore.yaml

@@ -16,8 +16,14 @@ apiVersion: postgresql.cnpg.io/v1
 kind: ScheduledBackup
 metadata:
   name: backup-postgresql-cluster
+  labels:
+    wait-for-deployment: Ready
 spec:
+  immediate: true
   schedule: "0 0 11 * * *"
   backupOwnerReference: self
   cluster:
     name: postgresql-cluster
+  method: plugin
+  pluginConfiguration:
+    name: barman-cloud.cloudnative-pg.io