Merge remote-tracking branch 'upstream/main'

MaibornWolff · Nov 6, 2024 · d73cb2b · d73cb2b
2 parents 6add733 + 3e04130
commit d73cb2b
Show file tree

Hide file tree

Showing 55 changed files with 2,162 additions and 687 deletions.
diff --git a/.github/workflows/functional-tests.yaml b/.github/workflows/functional-tests.yaml
@@ -44,6 +44,12 @@ jobs:
 
   cluster-helm-chart:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+            - 2.13.0
+            - 1.3.16
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -77,7 +83,7 @@ jobs:
 
           ## Install helm chart
           helm install opensearch-operator ../charts/opensearch-operator --set manager.image.repository=controller --set manager.image.tag=latest --set manager.image.pullPolicy=IfNotPresent --namespace default --wait
-          helm install opensearch-cluster ../charts/opensearch-cluster --set OpenSearchClusterSpec.enabled=true --wait
+          helm install opensearch-cluster ../charts/opensearch-cluster --set  opensearchCluster.general.version=${{ matrix.version }} --set opensearchCluster.dashboards.version=${{ matrix.version }} --wait
           cd functionaltests
 
           ## Run tests

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -31,6 +31,7 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+
       - name: set Env
         id: github-ver
         run: |
@@ -69,4 +70,3 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag_name: ${{ github.ref }}
           name: ${{ github.ref }}
-
diff --git a/README.md b/README.md
@@ -34,20 +34,7 @@ The Operator can be easily installed using Helm:
 
 ## Compatibility
 
-The opensearch k8s operator aims to be compatible to all supported opensearch versions. Please check the table below for details:
-
-| Operator Version | Min Supported Opensearch Version | Max supported Opensearch version | Comment |
-|------------------|----------------------------------|----------------------------------|---------|
-| 2.5              | 1.0                              | 2.11                             |         |
-| 2.4              | 1.0                              | 2.8                              |         |
-| 2.3              | 1.0                              | 2.8                              |         |
-| 2.2              | 1.0                              | 2.5                              |         |
-| 2.1              | 1.0                              | 2.3                              |         |
-| 2.0              | 1.0                              | 2.3                              |         |
-| 1.x              | 1.0                              | 1.x                              |         |
-| 0.x              | 1.0                              | 1.x                              | Beta    |
-
-This table only lists versions that have been explicitly tested with the operator, the operator will not prevent you from using other versions. Newer minor versions (2.x) not listed here generally also work but you should proceed with caution and test it out in a non-production environment first.
+The operator aims to be compatible with all current and supported Opensearch 2.x versions. When a new Opensearch version comes out it might take some time for the operator to support specific features, but in general all 2.x versions should work. Note that the operator will not prevent you from running any version, regardless of if it was tested or not.
 
 ## Development
 

diff --git a/charts/opensearch-cluster/Chart.yaml b/charts/opensearch-cluster/Chart.yaml
@@ -2,5 +2,9 @@ apiVersion: v2
 name: opensearch-cluster
 description: A Helm chart for OpenSearch Cluster
 type: application
-version: 2.6.0
-appVersion: 2.6.0
+
+## The opensearch-cluster Helm Chart version
+version: 2.7.0
+
+## The operator version
+appVersion: 2.7.0
diff --git a/charts/opensearch-cluster/templates/opensearch-cluster-cr.yaml b/charts/opensearch-cluster/templates/opensearch-cluster-cr.yaml
@@ -27,6 +27,10 @@ spec:
     imagePullSecrets:
       {{ toYaml .Values.opensearchCluster.initHelper.imagePullSecrets | nindent 6 }}
     {{- end }}
+    {{- if .Values.opensearchCluster.initHelper.resources }}
+    resources:
+      {{- toYaml .Values.opensearchCluster.initHelper.resources | nindent 6 }}
+    {{- end }}
   {{- end }}
   general:
     {{- if .Values.opensearchCluster.general.version }}
@@ -82,6 +86,10 @@ spec:
     monitoring:
       {{ toYaml .Values.opensearchCluster.general.monitoring | nindent 6 }}
     {{- end }}
+    {{- if .Values.opensearchCluster.general.snapshotRepositories }}
+    snapshotRepositories:
+      {{- toYaml .Values.opensearchCluster.general.snapshotRepositories | nindent 6 }}
+    {{- end }}
   {{- if .Values.opensearchCluster.dashboards }}
   dashboards:
     {{- if .Values.opensearchCluster.dashboards.image }}
@@ -197,6 +205,14 @@ spec:
       nodeSelector:
         {{- toYaml $val.nodeSelector | nindent 8 }}
       {{- end }}
+      {{- if $val.affinity }}
+      affinity:
+        {{- toYaml $val.affinity | nindent 8 }}
+      {{- end }}
+      {{- if $val.tolerations }}
+      tolerations:
+        {{- toYaml $val.tolerations | nindent 8 }}
+      {{- end }}
       {{- if  $val.labels }}
       labels: # Add any extra labels as key-value pairs here
         {{ toYaml  $val.labels | nindent 8 }}

diff --git a/charts/opensearch-cluster/values.yaml b/charts/opensearch-cluster/values.yaml
@@ -27,6 +27,17 @@ opensearchCluster:
       limits:
         memory: "1Gi"
         cpu: "500m"
+  initHelper:
+    imagePullSecrets: []
+    # - registryKeySecretName
+    imagePullPolicy: IfNotPresent
+    resources: {}
+    # requests:
+    #   memory: "1Gi"
+    #   cpu: "500m"
+    # limits:
+    #   memory: "1Gi"
+    #   cpu: "500m"
   nodePools:
     - component: masters
       diskSize: "30Gi"

diff --git a/charts/opensearch-operator/Chart.yaml b/charts/opensearch-operator/Chart.yaml
@@ -12,13 +12,13 @@ description: The OpenSearch Operator Helm chart for Kubernetes
 # pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application
 
-# This is the chart version. This version number should be incremented each time you make changes
+# This is the opensearch-operator 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.6.0
+version: 2.7.0
 
-# This is the version number of the application being deployed. This version number should be
+# This is the version number of the application being deployed (the operator). 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.
 # It is recommended to use it with quotes.
-appVersion: 2.6.0
+appVersion: 2.7.0