diff --git a/charts/opensearch-dashboards/CHANGELOG.md b/charts/opensearch-dashboards/CHANGELOG.md index 73c780eb..d12d33a4 100644 --- a/charts/opensearch-dashboards/CHANGELOG.md +++ b/charts/opensearch-dashboards/CHANGELOG.md @@ -13,6 +13,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### Security --- +## [2.9.2] +### Added +- Support setting ipFamilyPolicy on Service +- Support setting ipFamilies on Service +--- ## [2.9.1] ### Added ### Changed diff --git a/charts/opensearch-dashboards/Chart.yaml b/charts/opensearch-dashboards/Chart.yaml index aa0d14bb..89449933 100644 --- a/charts/opensearch-dashboards/Chart.yaml +++ b/charts/opensearch-dashboards/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.9.1 +version: 2.9.2 # 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 diff --git a/charts/opensearch-dashboards/README.md b/charts/opensearch-dashboards/README.md index 14315860..b2ba75bf 100644 --- a/charts/opensearch-dashboards/README.md +++ b/charts/opensearch-dashboards/README.md @@ -72,6 +72,8 @@ | `service.nodePort` | Custom [nodePort][] port that can be set if you are using `service.type: nodePort` | `""` | | `service.transportPortName` | The name of the transport port within the service | `transport` | | `service.type` | OpenSearch [Service Types][] | `ClusterIP` | +| `service.ipFamilyPolicy` | This sets the preferred ip addresses in case of a dual-stack server, there are three options [PreferDualStack, SingleStack, RequireDualStack], [more information on dual stack](https://kubernetes.io/docs/concepts/services-networking/dual-stack/) | `""` | +| `service.ipFamilies` | Sets the preferred IP variants and in which order they are preferred, the first family you list is used for the legacy .spec.ClusterIP field, [more information on dual stack](https://kubernetes.io/docs/concepts/services-networking/dual-stack/) | `""` | | `tolerations` | Configurable [tolerations][] | `[]` | | `updateStrategy` | The [updateStrategy][] for the StatefulSet. By default Kubernetes will wait for the cluster to be green after upgrading each pod. Setting this to `OnDelete` will allow you to manually delete each pod during upgrades | `RollingUpdate` | | `extraObjects` | Array of extra K8s manifests to deploy | list `[]` | diff --git a/charts/opensearch-dashboards/templates/service.yaml b/charts/opensearch-dashboards/templates/service.yaml index ddd66e72..e520f5c1 100644 --- a/charts/opensearch-dashboards/templates/service.yaml +++ b/charts/opensearch-dashboards/templates/service.yaml @@ -13,6 +13,14 @@ metadata: {{- end }} spec: type: {{ .Values.service.type }} + {{- if (semverCompare ">= 1.23-0" .Capabilities.KubeVersion.Version) }} + {{- if .Values.service.ipFamilyPolicy }} + ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }} + {{- end }} + {{- if .Values.service.ipFamilies }} + ipFamilies: {{ .Values.service.ipFamilies }} + {{- end }} + {{- end }} {{- if .Values.service.loadBalancerIP }} loadBalancerIP: {{ .Values.service.loadBalancerIP }} {{- end }} diff --git a/charts/opensearch-dashboards/values.yaml b/charts/opensearch-dashboards/values.yaml index cdc0b034..0f765b41 100644 --- a/charts/opensearch-dashboards/values.yaml +++ b/charts/opensearch-dashboards/values.yaml @@ -145,6 +145,13 @@ serverHost: "0.0.0.0" service: type: ClusterIP + # The IP family and IP families options are to set the behaviour in a dual-stack environment + # Omitting these values will let the service fall back to whatever the CNI dictates the defaults + # should be + # + # ipFamilyPolicy: SingleStack + # ipFamilies: + # - IPv4 port: 5601 loadBalancerIP: "" nodePort: "" diff --git a/charts/opensearch/CHANGELOG.md b/charts/opensearch/CHANGELOG.md index cec50f8e..02508287 100644 --- a/charts/opensearch/CHANGELOG.md +++ b/charts/opensearch/CHANGELOG.md @@ -13,6 +13,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### Security --- +## [2.11.3] +### Added +- Support setting ipFamilyPolicy on Service +- Support setting ipFamilies on Service +--- ## [2.11.2] ### Added - Service ports for performance analyzer diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml index cffe0a8a..642ade63 100644 --- a/charts/opensearch/Chart.yaml +++ b/charts/opensearch/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.11.2 +version: 2.11.3 # 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 diff --git a/charts/opensearch/README.md b/charts/opensearch/README.md index e3f0da0b..5e1bb25b 100644 --- a/charts/opensearch/README.md +++ b/charts/opensearch/README.md @@ -100,6 +100,8 @@ helm uninstall my-release | `service.nodePort` | Custom [nodePort][] port that can be set if you are using `service.type: nodePort` | `""` | | `service.transportPortName` | The name of the transport port within the service | `transport` | | `service.type` | OpenSearch [Service Types][] | `ClusterIP` | +| `service.ipFamilyPolicy` | This sets the preferred ip addresses in case of a dual-stack server, there are three options [PreferDualStack, SingleStack, RequireDualStack], [more information on dual stack](https://kubernetes.io/docs/concepts/services-networking/dual-stack/) | `""` | +| `service.ipFamilies` | Sets the preferred IP variants and in which order they are preferred, the first family you list is used for the legacy .spec.ClusterIP field, [more information on dual stack](https://kubernetes.io/docs/concepts/services-networking/dual-stack/) | `""` | | `sidecarResources` | Allows you to set the [resources][] for the sidecar containers in the StatefulSet | {} | | `sysctlInit` | Allows you to enable the `sysctlInit` to set sysctl vm.max_map_count through privileged `initContainer`. | `enabled: false` | | `sysctlVmMaxMapCount` | Sets the [vm.max_map_count][] needed for OpenSearch | `262144` | diff --git a/charts/opensearch/templates/service.yaml b/charts/opensearch/templates/service.yaml index 1ab46b86..4c28b2f3 100644 --- a/charts/opensearch/templates/service.yaml +++ b/charts/opensearch/templates/service.yaml @@ -12,6 +12,14 @@ metadata: {{ toYaml .Values.service.annotations | indent 4 }} spec: type: {{ .Values.service.type }} + {{- if (semverCompare ">= 1.23-0" .Capabilities.KubeVersion.Version) }} + {{- if .Values.service.ipFamilyPolicy }} + ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }} + {{- end }} + {{- if .Values.service.ipFamilies }} + ipFamilies: {{ .Values.service.ipFamilies }} + {{- end }} + {{- end }} selector: {{- include "opensearch.selectorLabels" . | nindent 4 }} ports: diff --git a/charts/opensearch/values.yaml b/charts/opensearch/values.yaml index 1a67c6fa..96802a12 100644 --- a/charts/opensearch/values.yaml +++ b/charts/opensearch/values.yaml @@ -270,6 +270,13 @@ service: headless: annotations: {} type: ClusterIP + # The IP family and IP families options are to set the behaviour in a dual-stack environment + # Omitting these values will let the service fall back to whatever the CNI dictates the defaults + # should be + # + # ipFamilyPolicy: SingleStack + # ipFamilies: + # - IPv4 nodePort: "" annotations: {} httpPortName: http