Merge pull request #410 from percona/EVEREST-107-fix-pg-flag

EVEREST-107 | Update flag names in everest-db-namespace chart
percona · Nov 12, 2024 · 456b860 · 456b860
2 parents 7732bc5 + 5b0d249
commit 456b860
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/everest-pr-checks.yaml b/.github/workflows/everest-pr-checks.yaml
@@ -97,6 +97,11 @@ jobs:
             kubectl wait --for=jsonpath='.status.phase'=Succeeded csv/$csv -n everest --timeout=600s
           done
 
+          # Check DB engines
+          kubectl wait --for=jsonpath='.status.status'=installed dbengine/percona-server-mongodb-operator --timeout=600s -n everest
+          kubectl wait --for=jsonpath='.status.status'=installed dbengine/percona-xtradb-cluster-operator --timeout=600s -n everest
+          kubectl wait --for=jsonpath='.status.status'=installed dbengine/percona-postgresql-operator --timeout=600s -n everest
+
           # Uninstall
           helm uninstall everest -n everest
           kubectl delete ns everest

diff --git a/charts/everest/charts/everest-db-namespace/README.md b/charts/everest/charts/everest-db-namespace/README.md
@@ -29,7 +29,7 @@ Kubernetes: `>= 1.27.0`
 | compatibility.openshift | bool | `false` | If set, enable OpenShift compatibility. |
 | namespaceOverride | string | `""` | Namespace override. Defaults to the value of .Release.Namespace. |
 | olm.namespace | string | `"everest-olm"` | Namespace where OLM is installed in the cluster. |
-| pg | bool | `true` | If set, installs the Percona Postgresql Server operator. |
+| postgresql | bool | `true` | If set, installs the Percona Postgresql Server operator. |
 | psmdb | bool | `true` | If set, installs the Percona Server MongoDB operator. |
 | pxc | bool | `true` | If set, installs the Percona XtraDB Cluster operator. |
 | telemetry | bool | `true` | If set, enabled sending telemetry information. |

diff --git a/charts/everest/charts/everest-db-namespace/templates/pg.subscription.yaml b/charts/everest/charts/everest-db-namespace/templates/pg.subscription.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.pg }}
+{{- if .Values.postgresql }}
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:

diff --git a/charts/everest/charts/everest-db-namespace/values.yaml b/charts/everest/charts/everest-db-namespace/values.yaml
@@ -10,7 +10,7 @@ psmdb: true
 # -- If set, installs the Percona XtraDB Cluster operator.
 pxc: true
 # -- If set, installs the Percona Postgresql Server operator.
-pg: true
+postgresql: true
 
 olm:
   # -- Namespace where OLM is installed in the cluster.