From 6233bd6add28a1009fad79c0c0aca9234ada10d8 Mon Sep 17 00:00:00 2001
From: Arend Lapere <arend.lapere@gmail.com>
Date: Tue, 24 Jan 2023 14:31:01 +0100
Subject: [PATCH] Support ipFamilyPolicy on services

Signed-off-by: Arend Lapere <arend.lapere@gmail.com>
---
 charts/opensearch-dashboards/CHANGELOG.md           | 8 ++------
 charts/opensearch-dashboards/Chart.yaml             | 2 +-
 charts/opensearch-dashboards/templates/service.yaml | 3 +++
 charts/opensearch-dashboards/values.yaml            | 1 +
 charts/opensearch/CHANGELOG.md                      | 4 ++--
 charts/opensearch/Chart.yaml                        | 2 +-
 charts/opensearch/templates/service.yaml            | 3 +++
 charts/opensearch/values.yaml                       | 1 +
 8 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/charts/opensearch-dashboards/CHANGELOG.md b/charts/opensearch-dashboards/CHANGELOG.md
index d0218fff..5b0691d5 100644
--- a/charts/opensearch-dashboards/CHANGELOG.md
+++ b/charts/opensearch-dashboards/CHANGELOG.md
@@ -13,14 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 ---
-## [2.8.0]
+## [2.8.1]
 ### Added
+- Support setting ipFamilyPolicy on Service
 ### Changed
-- Updated OpenSearch Dashboards appVersion to 2.5.0
-### Deprecated
-### Removed
-### Fixed
-### Security
 ---
 ## [2.7.0]
 ### Added
diff --git a/charts/opensearch-dashboards/Chart.yaml b/charts/opensearch-dashboards/Chart.yaml
index b4e6cc5f..6a1e7ebd 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.8.0
+version: 2.8.1
 
 # 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/templates/service.yaml b/charts/opensearch-dashboards/templates/service.yaml
index ddd66e72..6b28568a 100644
--- a/charts/opensearch-dashboards/templates/service.yaml
+++ b/charts/opensearch-dashboards/templates/service.yaml
@@ -13,6 +13,9 @@ metadata:
 {{- end }}
 spec:
   type: {{ .Values.service.type }}
+  {{- if (semverCompare ">= 1.23-0" .Capabilities.KubeVersion.Version) }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+  {{- 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 bda9540a..41c5cc01 100644
--- a/charts/opensearch-dashboards/values.yaml
+++ b/charts/opensearch-dashboards/values.yaml
@@ -145,6 +145,7 @@ serverHost: "0.0.0.0"
 
 service:
   type: ClusterIP
+  ipFamilyPolicy: SingleStack
   port: 5601
   loadBalancerIP: ""
   nodePort: ""
diff --git a/charts/opensearch/CHANGELOG.md b/charts/opensearch/CHANGELOG.md
index bfad7bbd..d90ee7ce 100644
--- a/charts/opensearch/CHANGELOG.md
+++ b/charts/opensearch/CHANGELOG.md
@@ -13,10 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 ---
-## [2.10.0]
+## [2.10.1]
 ### Added
+- Support setting ipFamilyPolicy on Service
 ### Changed
-- Updated OpenSearch appVersion to 2.5.0
 ### Deprecated
 ### Removed
 ### Fixed
diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml
index 4feea055..8da87adc 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.10.0
+version: 2.10.1
 
 # 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/templates/service.yaml b/charts/opensearch/templates/service.yaml
index 3b74924f..702b0be9 100644
--- a/charts/opensearch/templates/service.yaml
+++ b/charts/opensearch/templates/service.yaml
@@ -12,6 +12,9 @@ metadata:
 {{ toYaml .Values.service.annotations | indent 4 }}
 spec:
   type: {{ .Values.service.type }}
+  {{- if (semverCompare ">= 1.23-0" .Capabilities.KubeVersion.Version) }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+  {{- end }}
   selector:
     {{- include "opensearch.selectorLabels" . | nindent 4 }}
   ports:
diff --git a/charts/opensearch/values.yaml b/charts/opensearch/values.yaml
index 1587ffca..a02d5cc3 100644
--- a/charts/opensearch/values.yaml
+++ b/charts/opensearch/values.yaml
@@ -268,6 +268,7 @@ service:
   headless:
     annotations: {}
   type: ClusterIP
+  ipFamilyPolicy: SingleStack
   nodePort: ""
   annotations: {}
   httpPortName: http