Skip to content

Commit

Permalink
Merge branch 'main' into dev/single-namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
itay-grudev authored Nov 20, 2024
2 parents 1a466d3 + 2ee4e01 commit f9698f0
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions charts/cloudnative-pg/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,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"` | |
Expand Down
6 changes: 6 additions & 0 deletions charts/cloudnative-pg/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions charts/cloudnative-pg/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,12 @@
"service": {
"type": "object",
"properties": {
"ipFamilies": {
"type": "array"
},
"ipFamilyPolicy": {
"type": "string"
},
"name": {
"type": "string"
},
Expand Down
4 changes: 4 additions & 0 deletions charts/cloudnative-pg/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,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
Expand Down

0 comments on commit f9698f0

Please sign in to comment.