From abbc85bc5413250da255d0f2ac0d8bda7567b09d Mon Sep 17 00:00:00 2001 From: vivekr-splunk <94569031+vivekr-splunk@users.noreply.github.com> Date: Fri, 6 Oct 2023 15:11:45 -0700 Subject: [PATCH] Helm 2.4.0 and Operator Bundle changes (#1242) * operator bundle generation 2.4.0 Signed-off-by: vivekr-splunk * operator bundle generation 2.4.0 Signed-off-by: vivekr-splunk * bundle docker file updated Signed-off-by: vivekr-splunk * updaged change log for 2.4 Signed-off-by: vivekr-splunk * updaged change log for 2.4 Signed-off-by: vivekr-splunk * removed 4 Signed-off-by: vivekr-splunk --------- Signed-off-by: vivekr-splunk --- README.md | 10 ++++---- bundle.Dockerfile | 2 +- ...splunk-operator.clusterserviceversion.yaml | 10 ++++---- bundle/metadata/annotations.yaml | 2 +- docs/ChangeLog.md | 23 ++++++++++++++++++- helm-chart/splunk-enterprise/Chart.yaml | 4 ++-- helm-chart/splunk-operator/Chart.yaml | 4 ++-- helm-chart/splunk-operator/values.yaml | 2 +- 8 files changed, 39 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 4a5cd4b3d..8a1003593 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ You must have [Docker Engine](https://docs.docker.com/install/) installed to build the Splunk Operator. This project uses [Go modules](https://blog.golang.org/using-go-modules), -and requires [golang](https://golang.org/doc/install) 1.19.2 or later. +and requires [golang](https://golang.org/doc/install) 1.21.1 or later. You must `export GO111MODULE=on` if cloning these repositories into your `$GOPATH` (not recommended). @@ -34,7 +34,7 @@ The [Kubernetes Operator SDK](https://github.com/operator-framework/operator-sdk must also be installed to build this project. ``` -git clone -b v1.25.0 https://github.com/operator-framework/operator-sdk +git clone -b v1.31.0 https://github.com/operator-framework/operator-sdk cd operator-sdk make tidy make install @@ -121,13 +121,13 @@ make deploy IMG=docker.io/splunk/splunk-operator: ``` If you want operator for specific namespace then you must pass `WATCH_NAMESPACE` parameter to `make deploy` command - + ``` make deploy IMG=docker.io/splunk/splunk-operator: WATCH_NAMESPACE="namespace1" ``` -If you want operator to use specific version of splunk instance, then you must pass `RELATED_IMAGE_SPLUNK_ENTERPRISE` parameter to `make deploy` command - +If you want operator to use specific version of splunk instance, then you must pass `RELATED_IMAGE_SPLUNK_ENTERPRISE` parameter to `make deploy` command + ``` make deploy IMG=docker.io/splunk/splunk-operator: WATCH_NAMESPACE="namespace1" RELATED_IMAGE_SPLUNK_ENTERPRISE="splunk/splunk:edge" ``` diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 2e9cbbed8..7d88182e9 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=splunk-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.1 +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 diff --git a/bundle/manifests/splunk-operator.clusterserviceversion.yaml b/bundle/manifests/splunk-operator.clusterserviceversion.yaml index 31b5b88e7..82c3ada1d 100644 --- a/bundle/manifests/splunk-operator.clusterserviceversion.yaml +++ b/bundle/manifests/splunk-operator.clusterserviceversion.yaml @@ -111,13 +111,13 @@ metadata: capabilities: Seamless Upgrades categories: Big Data, Logging & Tracing, Monitoring, Security, AI/Machine Learning containerImage: splunk/splunk-operator@sha256:c4e0d314622699496f675760aad314520d050a66627fdf33e1e21fa28ca85d50 - createdAt: "2023-06-09T21:59:10Z" + createdAt: "2023-10-06T19:00:23Z" description: The Splunk Operator for Kubernetes enables you to quickly and easily deploy Splunk Enterprise on your choice of private or public cloud provider. The Operator simplifies scaling and management of Splunk Enterprise by automating administrative workflows using Kubernetes best practices. olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.9"}]' - operators.operatorframework.io/builder: operator-sdk-v1.28.1 + operators.operatorframework.io/builder: operator-sdk-v1.31.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/splunk/splunk-operator name: splunk-operator.v2.2.1 @@ -801,14 +801,14 @@ spec: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: RELATED_IMAGE_SPLUNK_ENTERPRISE - value: docker.io/splunk/splunk:9.0.5 + value: docker.io/splunk/splunk:9.1.1 - name: OPERATOR_NAME value: splunk-operator - name: POD_NAME valueFrom: fieldRef: fieldPath: metadata.name - image: docker.io/splunk/splunk-operator:2.3.0 + image: docker.io/splunk/splunk-operator:2.4.0 imagePullPolicy: Always livenessProbe: httpGet: @@ -913,7 +913,7 @@ spec: name: Splunk Inc. url: www.splunk.com relatedImages: - - image: docker.io/splunk/splunk:9.0.5 + - image: docker.io/splunk/splunk:9.1.1 name: splunk-enterprise replaces: splunk-operator.v2.2.0 version: 2.2.1 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index a0a8cd8b9..b107ab04f 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -5,7 +5,7 @@ annotations: operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: splunk-operator operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.metrics.builder: operator-sdk-v1.28.1 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.31.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 diff --git a/docs/ChangeLog.md b/docs/ChangeLog.md index 1e134503c..39aeed0c4 100644 --- a/docs/ChangeLog.md +++ b/docs/ChangeLog.md @@ -2,7 +2,28 @@ ## 2.4.0 (2023-10-13) -* This is the 2.4.0 release. The Splunk Operator for Kubernetes is a supported platform for deploying Splunk Enterprise with the prerequisites and constraints laid out [here](https://github.com/splunk/splunk-operator/blob/main/docs/README.md#prerequisites-for-the-splunk-operator) +This is the 2.4.0 release. The Splunk Operator for Kubernetes is a supported platform for deploying Splunk Enterprise with the prerequisites and constraints laid out [here](https://github.com/splunk/splunk-operator/blob/main/docs/README.md#prerequisites-for-the-splunk-operator) + + +* CSPL-2481: fixed splunk operator usage examples + +* CSPL-2399: fixed issue where pods are being stucked in Terminating state + +* CSPL-2482: Documents updates related to splunk-ansible + +* CSPL-2483: Support for additional labels to operator pod in splunk operator helm chart + +* CSPL-2480: Support helm flow control to restrict volume values added to deployment template when using PVC + +* CSPL-2443: Support private bucket support in Splunk Operator when IRSA used + +* CSPL-2457: Upgraded Golang to 1.21.1 + +* CSPL-2459: Upgraded operator-sdk to 1.31.0 + +* Git-1223: Fixed an issue in Storage Class for splunk operator helm chart + +* Git-1151: fixed indexer deletion in upgrade scenario ### Supported Splunk Version >| Splunk Version| diff --git a/helm-chart/splunk-enterprise/Chart.yaml b/helm-chart/splunk-enterprise/Chart.yaml index f558f0e42..5ffda823f 100644 --- a/helm-chart/splunk-enterprise/Chart.yaml +++ b/helm-chart/splunk-enterprise/Chart.yaml @@ -15,13 +15,13 @@ 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.3.0 +version: 2.4.0 # 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. # It is recommended to use it with quotes. -appVersion: "2.3.0" +appVersion: "2.4.0" maintainers: - name: Vivek Reddy email: vivekr@splunk.com diff --git a/helm-chart/splunk-operator/Chart.yaml b/helm-chart/splunk-operator/Chart.yaml index 0d598d94e..d2b8ce2de 100644 --- a/helm-chart/splunk-operator/Chart.yaml +++ b/helm-chart/splunk-operator/Chart.yaml @@ -21,10 +21,10 @@ 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.3.0" +version: "2.4.0" # 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. # It is recommended to use it with quotes. -appVersion: "2.3.0" \ No newline at end of file +appVersion: "2.4.0" \ No newline at end of file diff --git a/helm-chart/splunk-operator/values.yaml b/helm-chart/splunk-operator/values.yaml index be7a5def6..b41d28b67 100644 --- a/helm-chart/splunk-operator/values.yaml +++ b/helm-chart/splunk-operator/values.yaml @@ -1,6 +1,6 @@ # Splunk image image: - repository: docker.io/splunk/splunk:9.0.5 + repository: docker.io/splunk/splunk:9.1.1 # The kube-rbac-proxy is a small HTTP proxy for a single upstream, that can perform RBAC # authorization against the Kubernetes API.