Update opensearch version and fix names from subcharts (#116)

charts/opensearch/Chart.yaml

@@ -22,17 +22,17 @@ 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: 1.0.0
+version: 1.0.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
 # follow Semantic Versioning. They should reflect the version the application is using.
-
+appVersion: "2.17.0"
 dependencies:
   - name: opensearch-dashboards
-    version: 2.19.0
+    version: 2.23.0
     repository:  https://opensearch-project.github.io/helm-charts/
   - name: opensearch
-    version: 2.21.0
+    version: 2.25.0
     repository:  https://opensearch-project.github.io/helm-charts/
 

charts/opensearch/templates/NOTES.txt

@@ -1,7 +1,7 @@
 {{- $pvcList := list }}
 {{- $replicas := int .Values.opensearch.replicas }}
-{{- range $e, $i := until $replicas }}
-{{- $pvcList = append $pvcList (printf "%s-%s-%d" "opensearch-cluster-master" "opensearch-cluster-master" $i) }}
+{{- range $i := until $replicas }}
+{{- $pvcList = append $pvcList (printf "%s-%s-%d" (include "opensearch.uname" $.Subcharts.opensearch) (include "opensearch.uname" $.Subcharts.opensearch) $i) }}
 {{- end }}
 - Your username is **admin**
 - Your password is **{{ include "opensearch.StrongPassword" . }}**

charts/opensearch/templates/_ingress.tpl

@@ -1,18 +1,5 @@
 {{/* vim: set filetype=mustache: */}}
 
-{{/*
-Returns true if the ingressClassname field is supported
-Usage:
-{{ include "common.ingress.supportsIngressClassname" . }}
-*/}}
-{{- define "opensearch.ingress.supportsIngressClassname" -}}
-{{- if semverCompare "<1.18-0" (include "opensearch.capabilities.kubeVersion" .) -}}
-{{- print "false" -}}
-{{- else -}}
-{{- print "true" -}}
-{{- end -}}
-{{- end -}}
-
 {{/* Ingress annotations */}}
 {{- define "opensearch.ingress.annotations" -}}
 {{- with .Values.ingress.annotations }}
@@ -40,13 +27,3 @@ cert-manager.io/cluster-issuer: {{ .Values.ingressDashboard.certManagerClusterIs
 acme.cert-manager.io/http01-ingress-class: {{ .Values.ingressDashboard.ingressClassName }}
 {{- end }}
 {{- end }}
-
-{{/* Ingress hostname */}}
-{{- define "opensearch.ingress.hostname" -}}
-{{- if .Values.ingress.generate }}
-{{- printf "%s" .Values.ingress.userHostname }}
-{{- else }}
-{{- printf "%s" .Values.ingress.hostname }}
-{{- end }}
-{{- end }}
-

charts/opensearch/templates/_route.tpl

@@ -19,21 +19,3 @@ haproxy.router.openshift.io/ip_whitelist: {{ .Values.security.allowlist.ip }}
 haproxy.router.openshift.io/ip_whitelist: {{ .Values.security.allowlist.ip }}
 {{- end }}
 {{- end }}
-
-{{/* Route hostname */}}
-{{- define "opensearch.route.hostname" -}}
-{{- if .Values.route.generate }}
-{{- printf "%s" .Values.route.userHostname }}
-{{- else }}
-{{- printf "%s" .Values.route.hostname }}
-{{- end }}
-{{- end }}
-
-{{/* Route Dashboard hostname */}}
-{{- define "opensearch.routeDasboard.hostname" -}}
-{{- if .Values.routeDashboard.generate }}
-{{- printf "%s" .Values.routeDashboard.userHostname }}
-{{- else }}
-{{- printf "%s" .Values.routeDashboard.hostname }}
-{{- end }}
-{{- end }}

charts/opensearch/templates/discovery-secret.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.opensearch.discoverable.allow }}
-{{- $fullName := include "opensearch.fullname" . -}}
+{{- $fullName := include "opensearch.fullname" .Subcharts.opensearch -}}
 {{- $serviceName:= printf "%s-%s" .Release.Name "opensearch" }}
 {{- $secretName := printf "%s-%s" "discoverable" $fullName -}}
 apiVersion: v1

charts/opensearch/templates/ingress-dashboards.yaml

@@ -1,24 +1,23 @@
 {{- if .Values.ingressDashboard.enabled -}}
-{{- $fullName := include "opensearch.fullname" . -}}
-{{- $svcPort := .Values.networking.dashboard.port -}}
+{{- $fullName := include "opensearch-dashboards.fullname" (index .Subcharts "opensearch-dashboards") -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}-dashboards
   labels:
-    {{- include "opensearch.labels" . | nindent 4 }}
+    {{- include "opensearch-dashboards.labels" (index .Subcharts "opensearch-dashboards") | nindent 4 }}
   annotations:
     {{- include "opensearch.ingressDashboard.annotations" . | nindent 4 }}
 spec:
-  {{- if and .Values.ingressDashboard.ingressClassName (eq "true" (include "opensearch.ingress.supportsIngressClassname" .)) }}
+  {{- if and .Values.ingressDashboard.ingressClassName (eq "true" (include "opensearch-dashboards.ingress.supportsIngressClassName" (index .Subcharts "opensearch-dashboards"))) }}
   ingressClassName: {{ .Values.ingressDashboard.ingressClassName | quote }}
   {{- end }}
 {{- if .Values.ingressDashboard.tls }}
   tls:
     - hosts:
         - {{ .Values.ingressDashboard.hostname | quote }}
     {{- if .Values.ingressDashboard.useCertManager }}
-      secretName: tls-cert-{{ include "opensearch.fullname" . }}-dashboard
+      secretName: tls-cert-{{ $fullName }}
     {{- end }}
 {{- end }}
   rules:
@@ -29,7 +28,7 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: {{ $fullName }}-opensearch-dashboards
+                name: {{ $fullName }}
                 port: 
-                  number: {{ $svcPort }}
+                  number: {{ (index .Values "opensearch-dashboards").service.port }}
 {{- end }}

charts/opensearch/templates/ingress.yaml

@@ -1,25 +1,24 @@
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "opensearch.fullname" . -}}
-{{- $svcPort := .Values.networking.service.port -}}
+{{- $fullName := include "opensearch.fullname" .Subcharts.opensearch -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}-ui
   labels:
-    {{- include "opensearch.labels" . | nindent 4 }}
+    {{- include "opensearch.labels" .Subcharts.opensearch | nindent 4 }}
   annotations:
     nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
     {{- include "opensearch.ingress.annotations" . | nindent 4 }}
 spec:
-  {{- if and .Values.ingress.ingressClassName (eq "true" (include "opensearch.ingress.supportsIngressClassname" .)) }}
+  {{- if and .Values.ingress.ingressClassName (eq "true" (include "opensearch.ingress.supportsIngressClassName" .Subcharts.opensearch)) }}
   ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
   {{- end }}
 {{- if .Values.ingress.tls }}
   tls:
     - hosts:
         - {{ .Values.ingress.hostname | quote }}
     {{- if .Values.ingress.useCertManager }}
-      secretName: tls-cert-{{ include "opensearch.fullname" . }}
+      secretName: tls-cert-{{ $fullName }}
     {{- end }}
 {{- end }}
   rules:
@@ -30,7 +29,7 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: opensearch-cluster-master
+                name: {{ include "opensearch.serviceName" .Subcharts.opensearch }}
                 port: 
-                  number: {{ $svcPort }}
+                  number: {{ .Values.opensearch.httpPort }}
 {{- end }}

charts/opensearch/templates/networkpolicy-ingress.yaml

@@ -3,17 +3,17 @@
 kind: NetworkPolicy
 apiVersion: networking.k8s.io/v1
 metadata:
-  name: {{ include "opensearch.fullname" . }}-2
+  name: {{ include "opensearch.fullname" .Subcharts.opensearch }}-2
 spec:
   podSelector:
     matchLabels:
-      {{- include "opensearch.selectorLabels" . | nindent 6 }}
+      {{- include "opensearch.selectorLabels" .Subcharts.opensearch | nindent 6 }}
   ingress:
   {{- with .Values.security.networkPolicy.from }}
-  - from: 
+  - from:
   {{- toYaml . | nindent 4 }}
   {{- end }}
   policyTypes:
   - Ingress
 {{- end }}
-{{- end }} 
+{{- end }}

charts/opensearch/templates/networkpolicy.yaml

@@ -2,14 +2,14 @@
 kind: NetworkPolicy
 apiVersion: networking.k8s.io/v1
 metadata:
-  name: {{ include "opensearch.fullname" . }}
+  name: {{ include "opensearch.fullname" .Subcharts.opensearch }}
 spec:
   podSelector:
     matchLabels:
-      {{- include "opensearch.selectorLabels" . | nindent 6 }}
+      {{- include "opensearch.selectorLabels" .Subcharts.opensearch | nindent 6 }}
   ingress:
   - from:
     - podSelector: {}
   policyTypes:
   - Ingress
-{{- end }} 
+{{- end }}

charts/opensearch/templates/route-dashboards.yaml

@@ -1,12 +1,11 @@
 {{- if .Values.route.enabled -}}
-{{- $fullName := include "opensearch.fullname" . -}}
-{{- $svcPort := .Values.networking.dashboard.port -}}
+{{- $fullName := include "opensearch-dashboards.fullname" (index .Subcharts "opensearch-dashboards") -}}
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
-  name: {{ $fullName }}-dashboards
+  name: {{ $fullName }}
   labels:
-    {{- include "opensearch.labels" . | nindent 4 }}
+    {{- include "opensearch.labels" .Subcharts.opensearch | nindent 4 }}
   annotations:
     {{- include "opensearch.routeDashboard.annotations" . | nindent 4 }}
 spec:
@@ -16,7 +15,7 @@ spec:
     kind: Service
     name: opensearch-cluster-master
   port: 
-    targetPort: {{ $svcPort }}
+    targetPort: {{ (index .Values "opensearch-dashboards").service.port }}
   tls:
     termination: {{ .Values.routeDashboard.tls.termination }}
     {{- if .Values.routeDashboard.tls.key }}

charts/opensearch/templates/route.yaml

@@ -1,6 +1,5 @@
 {{- if .Values.route.enabled -}}
 {{- $fullName := include "opensearch.fullname" . -}}
-{{- $svcPort := .Values.networking.service.port -}}
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
@@ -16,7 +15,7 @@ spec:
     kind: Service
     name: opensearch-cluster-master
   port: 
-    targetPort: {{ $svcPort }}
+    targetPort: {{ .Values.opensearch.httpPort }}
   tls:
     termination: {{ .Values.route.tls.termination }}
     {{- if .Values.route.tls.key }}