EnterpriseDB · litaocdl · Oct 14, 2024
diff --git a/.github/workflows/continuous-delivery.yml b/.github/workflows/continuous-delivery.yml
@@ -14,7 +14,7 @@ jobs:
       ep4k-changed: ${{ steps.filter.outputs.ep4k-changed }}
     steps:
       - name: Checkout
-        uses: actions/[email protected].2
+        uses: actions/[email protected].7
 
       - name: Check for changes
         uses: dorny/[email protected]
@@ -34,25 +34,25 @@ jobs:
     if: needs.change-triage.outputs.ep4k-changed == 'true'
     steps:
       - name: Checkout
-        uses: actions/[email protected].2
+        uses: actions/[email protected].7
         with:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v3.5
+        uses: azure/setup-helm@v4
         with:
           version: v3.11.3
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.9.0
+        uses: helm/kind-action@v1.10.0
 
       - name: Deploy using helm chart
         run: |
           helm upgrade --install edb-pg4k --namespace postgresql-operator-system \
           --create-namespace charts/edb-postgres-for-kubernetes --wait
 
       - name: Install kubectl
-        uses: azure/setup-kubectl@v3.2
+        uses: azure/setup-kubectl@v4
 
       - name: Deploy a cluster
         run: |
@@ -68,17 +68,17 @@ jobs:
     if: needs.change-triage.outputs.pg4k-pgd-changed == 'true'
     steps:
       - name: Checkout
-        uses: actions/[email protected].2
+        uses: actions/[email protected].7
         with:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v3.5
+        uses: azure/setup-helm@v4
         with:
           version: v3.11.3
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.9.0
+        uses: helm/kind-action@v1.10.0
 
       - name: Deploy using helm chart
         run: |
@@ -91,7 +91,7 @@ jobs:
 
 
       - name: Install kubectl
-        uses: azure/setup-kubectl@v3.2
+        uses: azure/setup-kubectl@v4
 
       - name: Deploy a cluster
         run: |
@@ -110,25 +110,25 @@ jobs:
     if: needs.change-triage.outputs.ep4k-changed == 'true'
     steps:
       - name: Checkout
-        uses: actions/[email protected].1
+        uses: actions/[email protected].7
         with:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v3.5
+        uses: azure/setup-helm@v4
         with:
           version: v3.11.3
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.8.0
+        uses: helm/kind-action@v1.10.0
 
       - name: Deploy in single-namespace mode using helm chart
         run: |
           helm upgrade --install edb-pg4k --namespace single-install \
           --set config.clusterWide=false \
           --create-namespace charts/edb-postgres-for-kubernetes --wait
       - name: Install kubectl
-        uses: azure/setup-kubectl@v3.2
+        uses: azure/setup-kubectl@v4
 
       - name: Deploy a cluster in the watched namespace
         run: |

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -11,12 +11,12 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/[email protected].2
+        uses: actions/[email protected].7
         with:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v3.5
+        uses: azure/setup-helm@v4
         with:
           version: v3.11.3
 

diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/[email protected].2
+        uses: actions/[email protected].7
       -
         name: Get tag
         run: |

diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/[email protected].2
+        uses: actions/[email protected].7
         with:
           fetch-depth: 0
 
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/[email protected].2
+        uses: actions/[email protected].7
         with:
           ref: gh-pages
           fetch-depth: 0

diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/[email protected].2
+        uses: actions/[email protected].7
       -
         name: Temporarily disable "include administrators" branch protection
         if: ${{ always() && github.ref == 'refs/heads/main' }}

diff --git a/charts/edb-postgres-distributed-for-kubernetes/README.md b/charts/edb-postgres-distributed-for-kubernetes/README.md
@@ -86,3 +86,5 @@ EDB Postgres Distributed for Kubernetes Helm Chart
 | webhook.validating.create | bool | `true` |  |
 | webhook.validating.failurePolicy | string | `"Fail"` |  |
 
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
diff --git a/charts/edb-postgres-for-kubernetes/Chart.yaml b/charts/edb-postgres-for-kubernetes/Chart.yaml
@@ -17,12 +17,12 @@ name: edb-postgres-for-kubernetes
 description: EDB Postgres for Kubernetes Helm Chart
 icon: https://www.enterprisedb.com/themes/custom/edb_bootstrap_sass/edb-logo-disc-dark-2.svg
 type: application
-version: "0.20.3"
+version: "0.20.4"
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.22.2"
+appVersion: "1.22.6"
 sources:
   - https://github.com/EnterpriseDB/edb-postgres-for-kubernetes-charts
 keywords:

diff --git a/charts/edb-postgres-for-kubernetes/README.md b/charts/edb-postgres-for-kubernetes/README.md
diff --git a/charts/edb-postgres-for-kubernetes/templates/_helpers.tpl b/charts/edb-postgres-for-kubernetes/templates/_helpers.tpl
@@ -372,14 +372,6 @@ namespace scope or clusterwide
 Define the set of rules that must be applied clusterwide
 */}}
 {{- define "edb-postgres-for-kubernetes.clusterwideRules" }}
-- apiGroups:
-  - ""
-  resources:
-  - namespaces
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - ""
   resources:
@@ -394,18 +386,14 @@ Define the set of rules that must be applied clusterwide
   - mutatingwebhookconfigurations
   verbs:
   - get
-  - list
   - patch
-  - update
 - apiGroups:
   - admissionregistration.k8s.io
   resources:
   - validatingwebhookconfigurations
   verbs:
   - get
-  - list
   - patch
-  - update
 - apiGroups:
   - apiextensions.k8s.io
   resources:

diff --git a/charts/edb-postgres-for-kubernetes/templates/config.yaml b/charts/edb-postgres-for-kubernetes/templates/config.yaml
@@ -25,15 +25,14 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 data:
-  {{- if .Values.config.clusterWide  -}}
+  {{- if .Values.config.clusterWide -}}
   {{- toYaml .Values.config.data | nindent 2 }}
   {{- else -}}
   {{- $watchNamespaceMap := dict "WATCH_NAMESPACE" .Release.Namespace -}}
   {{- $fullConfiguration := merge .Values.config.data $watchNamespaceMap -}}
   {{- toYaml $fullConfiguration | nindent 2 }}
   {{- end -}}
-{{- end }}
-{{- else -}}
+{{- else }}
 apiVersion: v1
 kind: Secret
 type: Opaque
@@ -46,5 +45,12 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 stringData:
+  {{- if .Values.config.clusterWide -}}
   {{- toYaml .Values.config.data | nindent 2 }}
+  {{- else -}}
+  {{- $watchNamespaceMap := dict "WATCH_NAMESPACE" .Release.Namespace -}}
+  {{- $fullConfiguration := merge .Values.config.data $watchNamespaceMap -}}
+  {{- toYaml $fullConfiguration | nindent 2 }}
+  {{- end -}}
+{{- end }}
 {{- end }}