Merge branch 'main' into main

CODEOWNERS

@@ -2,6 +2,6 @@
 # responsible for code in a repository. For details, please refer to
 # https://docs.github.com/en/free-pro-team@latest/github/creating-cloning-and-archiving-repositories/about-code-owners
 
-*               @fcanovai @gbartolini @leonardoce @mnencia @phisco @sxd
+*               @fcanovai @gbartolini @leonardoce @mnencia @phisco @sxd @itay-grudev
 /.github        @fcanovai @gbartolini @leonardoce @mnencia @phisco @sxd @itay-grudev
 /charts/cluster @itay-grudev

charts/cloudnative-pg/README.md

@@ -67,6 +67,8 @@ CloudNativePG Operator Helm Chart
 | rbac.create | bool | `true` | Specifies whether ClusterRole and ClusterRoleBinding should be created. |
 | replicaCount | int | `1` |  |
 | resources | object | `{}` |  |
+| service.ipFamilies | list | `[]` | Sets the families that should be supported and the order in which they should be applied to ClusterIP as well. Can be IPv4 and/or IPv6. |
+| service.ipFamilyPolicy | string | `""` | Set the ip family policy to configure dual-stack see [Configure dual-stack](https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services) |
 | service.name | string | `"cnpg-webhook-service"` | DO NOT CHANGE THE SERVICE NAME as it is currently used to generate the certificate and can not be configured |
 | service.port | int | `443` |  |
 | service.type | string | `"ClusterIP"` |  |

charts/cloudnative-pg/templates/service.yaml

@@ -26,6 +26,12 @@ metadata:
   {{- end }}
 spec:
   type: {{ .Values.service.type }}
+  {{- if .Values.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if .Values.service.ipFamilies }}
+  ipFamilies: {{ .Values.service.ipFamilies | toYaml | nindent 2 }}
+  {{- end }}
   ports:
   - port: {{ .Values.service.port }}
     targetPort: webhook-server

charts/cloudnative-pg/values.schema.json

@@ -206,6 +206,12 @@
         "service": {
             "type": "object",
             "properties": {
+                "ipFamilies": {
+                    "type": "array"
+                },
+                "ipFamilyPolicy": {
+                    "type": "string"
+                },
                 "name": {
                     "type": "string"
                 },

charts/cloudnative-pg/values.yaml

@@ -126,6 +126,10 @@ service:
   # and can not be configured
   name: cnpg-webhook-service
   port: 443
+  # -- Set the ip family policy to configure dual-stack see [Configure dual-stack](https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services)
+  ipFamilyPolicy: ""
+  # -- Sets the families that should be supported and the order in which they should be applied to ClusterIP as well. Can be IPv4 and/or IPv6.
+  ipFamilies: []
 
 resources: {}
   # If you want to specify resources, uncomment the following

charts/cluster/prometheus_rules/cluster-offline.yaml

@@ -4,7 +4,7 @@ alert: {{ $alert }}
 annotations:
   summary: CNPG Cluster has no running instances!
   description: |-
-    CloudNativePG Cluster "{{ .labels.job }}" has no ready instances.
+    CloudNativePG Cluster "{{ .namespace }}/{{ .cluster }}" has no ready instances.
 
     Having an offline cluster means your applications will not be able to access the database, leading to
     potential service disruption and/or data loss.