diff --git a/Makefile b/Makefile index 359648d7d..6d9bf1845 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # To re-generate a bundle for another specific version without changing the standard setup, you can: # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) -VERSION ?= 2.5.0 +VERSION ?= 2.5.2 # SPLUNK_ENTERPRISE_IMAGE defines the splunk docker tag that is used as default image. SPLUNK_ENTERPRISE_IMAGE ?= "docker.io/splunk/splunk:edge" diff --git a/bundle/manifests/splunk-operator.clusterserviceversion.yaml b/bundle/manifests/splunk-operator.clusterserviceversion.yaml index 8ebe30c0f..689b65588 100644 --- a/bundle/manifests/splunk-operator.clusterserviceversion.yaml +++ b/bundle/manifests/splunk-operator.clusterserviceversion.yaml @@ -120,7 +120,7 @@ metadata: 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.5.1 + name: splunk-operator.v2.5.2 namespace: placeholder spec: apiservicedefinitions: {} @@ -815,7 +815,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.name - image: docker.io/splunk/splunk-operator:2.5.1 + image: docker.io/splunk/splunk-operator:2.5.2 imagePullPolicy: Always livenessProbe: httpGet: @@ -929,5 +929,5 @@ spec: relatedImages: - image: docker.io/splunk/splunk:9.1.3 name: splunk-enterprise - replaces: splunk-operator.v2.5.0 - version: 2.5.1 + replaces: splunk-operator.v2.5.1 + version: 2.5.2 diff --git a/config/manifests/bases/splunk-operator.clusterserviceversion.yaml b/config/manifests/bases/splunk-operator.clusterserviceversion.yaml index c0d9b1fa9..553f440bd 100644 --- a/config/manifests/bases/splunk-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/splunk-operator.clusterserviceversion.yaml @@ -12,7 +12,7 @@ metadata: administrative workflows using Kubernetes best practices. olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.9"}]' repository: https://github.com/splunk/splunk-operator - name: splunk-operator.v2.5.1 + name: splunk-operator.v2.5.2 namespace: placeholder spec: apiservicedefinitions: {} @@ -274,5 +274,5 @@ spec: provider: name: Splunk Inc. url: www.splunk.com - replaces: splunk-operator.v2.5.0 - version: 2.5.1 + replaces: splunk-operator.v2.5.1 + version: 2.5.2 diff --git a/docs/AppFramework.md b/docs/AppFramework.md index c842039c7..7102a05a5 100644 --- a/docs/AppFramework.md +++ b/docs/AppFramework.md @@ -542,7 +542,7 @@ spec: serviceAccountName: splunk-operator containers: - name: splunk-operator - image: "docker.io/splunk/splunk-operator:2.5.1" + image: "docker.io/splunk/splunk-operator:2.5.2" volumeMounts: - mountPath: /opt/splunk/appframework/ name: app-staging diff --git a/docs/Helm.md b/docs/Helm.md index 5f19fd46c..e6842fc77 100644 --- a/docs/Helm.md +++ b/docs/Helm.md @@ -35,7 +35,7 @@ There are a couple ways you can configure your operator deployment 1. Using a ```new_values.yaml``` file to override default values (Recommended) ``` -helm install -f new_values.yaml splunk/splunk-operator -n +helm install -f new_values.yaml --set installCRDs=true splunk/splunk-operator -n ``` 2. Using the Helm CLI directly to set new values @@ -46,7 +46,7 @@ helm install --set = splunk/splunk-operator -n splunk/splunk-operator -n +helm upgrade -f new_values.yaml --set installCRDs=true splunk/splunk-operator -n ``` Read more about configuring values [here](https://helm.sh/docs/intro/using_helm/). @@ -74,7 +74,7 @@ The ```helm list``` command can be used to retrieve all deployed releases. By default, the Splunk Operator has cluster-wide access. Let's upgrade the ```splunk-operator-test``` release by revoking cluster-wide access: ``` -helm upgrade --set splunkOperator.clusterWideAccess=false splunk-operator-test splunk/splunk-operator -n splunk-operator +helm upgrade --set splunkOperator.clusterWideAccess=false --set installCRDs=true splunk-operator-test splunk/splunk-operator -n splunk-operator ``` ``` NAME: splunk-operator-test @@ -100,7 +100,7 @@ helm dependency build splunk/splunk-enterprise ``` If the operator is already installed then you will need to disable the dependency: ``` -helm install --set splunk-operator.enabled=false splunk/splunk-enterprise -n +helm install --set splunk-operator.enabled=false --set installCRDs=true splunk/splunk-enterprise -n ``` Installing ```splunk/splunk-enterprise``` will deploy Splunk Enterprise custom resources according to your configuration, the following ```new_values.yaml``` file specifies override configurations to deploy a Cluster Manager, an Indexer Cluster and a Search Head Cluster. @@ -124,7 +124,7 @@ helm show values splunk/splunk-enterprise To install a Splunk Enterprise deployment according to our configurations above: ``` -helm install -f new_values.yaml splunk-enterprise-test splunk/splunk-enterprise -n splunk-operator +helm install --set installCRDs=true -f new_values.yaml splunk-enterprise-test splunk/splunk-enterprise -n splunk-operator ``` ``` NAME: splunk-enterprise-test @@ -166,6 +166,6 @@ The Splunk Enterprise chart has support for three Splunk Validated Architectures Install a Standalone deployment using the following command: ``` -helm install --set s1.enabled=true splunk/splunk-enterprise -n +helm install --set s1.enabled=true --set installCRDs=true splunk/splunk-enterprise -n ``` Visit the Splunk Operator github repository to learn more about the configurable values of [splunk/splunk-operator](https://github.com/splunk/splunk-operator/blob/develop/helm-chart/splunk-operator/values.yaml) and [splunk/splunk-enterprise](https://github.com/splunk/splunk-operator/blob/develop/helm-chart/splunk-enterprise/values.yaml). diff --git a/docs/Install.md b/docs/Install.md index 0cc41f81e..7bbd26932 100644 --- a/docs/Install.md +++ b/docs/Install.md @@ -7,7 +7,7 @@ If you want to customize the installation of the Splunk Operator, download a copy of the installation YAML locally, and open it in your favorite editor. ``` -wget -O splunk-operator-cluster.yaml https://github.com/splunk/splunk-operator/releases/download/2.5.1/splunk-operator-cluster.yaml +wget -O splunk-operator-cluster.yaml https://github.com/splunk/splunk-operator/releases/download/2.5.2/splunk-operator-cluster.yaml ``` ## Default Installation @@ -17,7 +17,7 @@ Based on the file used Splunk Operator can be installed cluster-wide or namespac By installing `splunk-operator-cluster.yaml` Operator will watch all the namespaces of your cluster for splunk enterprise custom resources ``` -wget -O splunk-operator-cluster.yaml https://github.com/splunk/splunk-operator/releases/download/2.5.1/splunk-operator-cluster.yaml +wget -O splunk-operator-cluster.yaml https://github.com/splunk/splunk-operator/releases/download/2.5.2/splunk-operator-cluster.yaml kubectl apply -f splunk-operator-cluster.yaml ``` @@ -44,10 +44,10 @@ If Splunk Operator is installed clusterwide and user wants to manage multiple na ## Install operator to watch single namespace with restrictive permission -In order to install operator with restrictive permission to watch only single namespace use [splunk-operator-namespace.yaml](https://github.com/splunk/splunk-operator/releases/download/2.5.1/splunk-operator-namespace.yaml). This will create Role and Role-Binding to only watch single namespace. By default operator will be installed in `splunk-operator` namespace, user can edit the file to change the namespace +In order to install operator with restrictive permission to watch only single namespace use [splunk-operator-namespace.yaml](https://github.com/splunk/splunk-operator/releases/download/2.5.2/splunk-operator-namespace.yaml). This will create Role and Role-Binding to only watch single namespace. By default operator will be installed in `splunk-operator` namespace, user can edit the file to change the namespace ``` -wget -O splunk-operator-namespace.yaml https://github.com/splunk/splunk-operator/releases/download/2.5.1/splunk-operator-namespace.yaml +wget -O splunk-operator-namespace.yaml https://github.com/splunk/splunk-operator/releases/download/2.5.2/splunk-operator-namespace.yaml kubectl apply -f splunk-operator-namespace.yaml ``` diff --git a/docs/README.md b/docs/README.md index 33daf6dfb..1e9958eb5 100644 --- a/docs/README.md +++ b/docs/README.md @@ -113,12 +113,12 @@ For production environments, we are requiring the use of Splunk SmartStore. As a A Kubernetes cluster administrator can install and start the Splunk Operator for specific namespace by running: ``` -kubectl apply -f https://github.com/splunk/splunk-operator/releases/download/2.5.1/splunk-operator-namespace.yaml --server-side --force-conflicts +kubectl apply -f https://github.com/splunk/splunk-operator/releases/download/2.5.2/splunk-operator-namespace.yaml --server-side --force-conflicts ``` A Kubernetes cluster administrator can install and start the Splunk Operator for cluster-wide by running: ``` -kubectl apply -f https://github.com/splunk/splunk-operator/releases/download/2.5.1/splunk-operator-cluster.yaml --server-side --force-conflicts +kubectl apply -f https://github.com/splunk/splunk-operator/releases/download/2.5.2/splunk-operator-cluster.yaml --server-side --force-conflicts ``` The [Advanced Installation Instructions](Install.md) page offers guidance for advanced configurations, including the use of private image registries, installation at cluster scope, and installing the Splunk Operator as a user who is not a Kubernetes administrator. Users of Red Hat OpenShift should review the [Red Hat OpenShift](OpenShift.md) page. diff --git a/docs/SplunkOperatorUpgrade.md b/docs/SplunkOperatorUpgrade.md index 92a10be5e..c44cb993c 100644 --- a/docs/SplunkOperatorUpgrade.md +++ b/docs/SplunkOperatorUpgrade.md @@ -29,7 +29,7 @@ A Splunk Operator for Kubernetes upgrade might include support for a later versi 1. Download the latest Splunk Operator installation yaml file. ​ ``` -wget -O splunk-operator-namespace.yaml https://github.com/splunk/splunk-operator/releases/download/2.5.1/splunk-operator-namespace.yaml +wget -O splunk-operator-namespace.yaml https://github.com/splunk/splunk-operator/releases/download/2.5.2/splunk-operator-namespace.yaml ``` ​ 2. (Optional) Review the file and update it with your specific customizations used during your install. diff --git a/docs/index.yaml b/docs/index.yaml index 60b589fe6..4881937af 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -1,9 +1,29 @@ apiVersion: v1 entries: splunk-enterprise: + - apiVersion: v2 + appVersion: 2.5.2 + created: "2024-02-22T11:14:58.461556-08:00" + dependencies: + - condition: splunk-operator.enabled + name: splunk-operator + repository: file://splunk-operator/helm-chart/splunk-operator + version: 2.5.2 + description: A Helm chart for Splunk Enterprise managed by the Splunk Operator + digest: 9ca4ce4071e9445309eda798d9e27fa3e7412f7130361899fd91d48155514516 + maintainers: + - email: vivekr@splunk.com + name: Vivek Reddy + - email: akondur@splunk.com + name: Arjun Kondur + name: splunk-enterprise + type: application + urls: + - https://splunk.github.io/splunk-operator/splunk-enterprise-2.5.2.tgz + version: 2.5.2 - apiVersion: v2 appVersion: 2.5.1 - created: "2024-02-20T23:37:00.411185-08:00" + created: "2024-02-22T11:14:58.405993-08:00" dependencies: - condition: splunk-operator.enabled name: splunk-operator @@ -23,7 +43,7 @@ entries: version: 2.5.1 - apiVersion: v2 appVersion: 2.5.0 - created: "2024-02-20T23:37:00.350497-08:00" + created: "2024-02-22T11:14:58.356418-08:00" dependencies: - condition: splunk-operator.enabled name: splunk-operator @@ -43,7 +63,7 @@ entries: version: 2.5.0 - apiVersion: v2 appVersion: 2.4.0 - created: "2024-02-20T23:37:00.298337-08:00" + created: "2024-02-22T11:14:58.319925-08:00" dependencies: - condition: splunk-operator.enabled name: splunk-operator @@ -65,7 +85,7 @@ entries: version: 2.4.0 - apiVersion: v2 appVersion: 2.3.0 - created: "2024-02-20T23:37:00.260683-08:00" + created: "2024-02-22T11:14:58.293586-08:00" dependencies: - condition: splunk-operator.enabled name: splunk-operator @@ -87,7 +107,7 @@ entries: version: 2.3.0 - apiVersion: v2 appVersion: 2.2.1 - created: "2024-02-20T23:37:00.245715-08:00" + created: "2024-02-22T11:14:58.280007-08:00" dependencies: - condition: splunk-operator.enabled name: splunk-operator @@ -102,7 +122,7 @@ entries: version: 2.2.1 - apiVersion: v2 appVersion: 2.2.0 - created: "2024-02-20T23:37:00.230197-08:00" + created: "2024-02-22T11:14:58.26568-08:00" dependencies: - condition: splunk-operator.enabled name: splunk-operator @@ -117,7 +137,7 @@ entries: version: 2.2.0 - apiVersion: v2 appVersion: 2.1.0 - created: "2024-02-20T23:37:00.202125-08:00" + created: "2024-02-22T11:14:58.240504-08:00" dependencies: - condition: splunk-operator.enabled name: splunk-operator @@ -131,9 +151,24 @@ entries: - https://splunk.github.io/splunk-operator/splunk-enterprise-1.0.0.tgz version: 1.0.0 splunk-operator: + - apiVersion: v2 + appVersion: 2.5.2 + created: "2024-02-22T11:14:58.56495-08:00" + description: A Helm chart for the Splunk Operator for Kubernetes + digest: fa2915642c8e9c9547620bc8ea5b7b22128f650ebe2f431bc18294a40727861a + maintainers: + - email: vivekr@splunk.com + name: Vivek Reddy + - email: akondur@splunk.com + name: Arjun Kondur + name: splunk-operator + type: application + urls: + - https://splunk.github.io/splunk-operator/splunk-operator-2.5.2.tgz + version: 2.5.2 - apiVersion: v2 appVersion: 2.5.1 - created: "2024-02-20T23:37:00.520295-08:00" + created: "2024-02-22T11:14:58.554046-08:00" description: A Helm chart for the Splunk Operator for Kubernetes digest: 02e6a28c2daaaed160277b10c64174d2235e571ca1fc5f93e8cf3c80493c60f9 maintainers: @@ -148,7 +183,7 @@ entries: version: 2.5.1 - apiVersion: v2 appVersion: 2.5.0 - created: "2024-02-20T23:37:00.505356-08:00" + created: "2024-02-22T11:14:58.536654-08:00" description: A Helm chart for the Splunk Operator for Kubernetes digest: ed93f8fac421f92cfdbfd043ec27911a07ec7db2c05b4efc3137cef4f2bfca4a maintainers: @@ -163,7 +198,7 @@ entries: version: 2.5.0 - apiVersion: v2 appVersion: 2.4.0 - created: "2024-02-20T23:37:00.491724-08:00" + created: "2024-02-22T11:14:58.523006-08:00" description: A Helm chart for the Splunk Operator for Kubernetes digest: 9d0377747e46df4bf4b9dbd447c9ff46c926bfe2c66fd07d6d27a61abb31cb42 maintainers: @@ -180,7 +215,7 @@ entries: version: 2.4.0 - apiVersion: v2 appVersion: 2.3.0 - created: "2024-02-20T23:37:00.476627-08:00" + created: "2024-02-22T11:14:58.510395-08:00" description: A Helm chart for the Splunk Operator for Kubernetes digest: 23e70ec4059bc92920d7d3adce3bff6b8aba0d5eb5d4c0efe225bf3b88d5b274 maintainers: @@ -197,7 +232,7 @@ entries: version: 2.3.0 - apiVersion: v2 appVersion: 2.2.1 - created: "2024-02-20T23:37:00.46003-08:00" + created: "2024-02-22T11:14:58.496719-08:00" description: A Helm chart for the Splunk Operator for Kubernetes digest: 8868b9ae2ebde0c667b13c97d71d904a31b5a9f2c803b199bc77324f1727e1fd name: splunk-operator @@ -207,7 +242,7 @@ entries: version: 2.2.1 - apiVersion: v2 appVersion: 2.2.0 - created: "2024-02-20T23:37:00.443857-08:00" + created: "2024-02-22T11:14:58.484622-08:00" description: A Helm chart for the Splunk Operator for Kubernetes digest: 49c72276bd7ff93465b0545d8b0814f684cade7d2cd191b6d73d4c3660bd1fb4 name: splunk-operator @@ -217,7 +252,7 @@ entries: version: 2.2.0 - apiVersion: v2 appVersion: 2.1.0 - created: "2024-02-20T23:37:00.426958-08:00" + created: "2024-02-22T11:14:58.473466-08:00" description: A Helm chart for the Splunk Operator for Kubernetes digest: 34e5463f8f5442655d05cb616b50391b738a0827b30d8440b4c7fce99a291d9a name: splunk-operator @@ -225,4 +260,4 @@ entries: urls: - https://splunk.github.io/splunk-operator/splunk-operator-1.0.0.tgz version: 1.0.0 -generated: "2024-02-20T23:37:00.187591-08:00" +generated: "2024-02-22T11:14:58.226104-08:00" diff --git a/docs/splunk-enterprise-2.5.2.tgz b/docs/splunk-enterprise-2.5.2.tgz new file mode 100644 index 000000000..097c9dab3 Binary files /dev/null and b/docs/splunk-enterprise-2.5.2.tgz differ diff --git a/docs/splunk-operator-2.5.2.tgz b/docs/splunk-operator-2.5.2.tgz new file mode 100644 index 000000000..c3667980a Binary files /dev/null and b/docs/splunk-operator-2.5.2.tgz differ diff --git a/go.mod b/go.mod index 1bc357ff5..e02d38e61 100644 --- a/go.mod +++ b/go.mod @@ -7,8 +7,8 @@ require ( github.com/go-logr/logr v1.3.0 github.com/google/go-cmp v0.6.0 github.com/minio/minio-go/v7 v7.0.16 - github.com/onsi/ginkgo/v2 v2.14.0 - github.com/onsi/gomega v1.30.0 + github.com/onsi/ginkgo/v2 v2.15.0 + github.com/onsi/gomega v1.31.1 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.14.0 github.com/stretchr/testify v1.8.1 diff --git a/go.sum b/go.sum index 63f4f77ea..85793519e 100644 --- a/go.sum +++ b/go.sum @@ -257,8 +257,12 @@ github.com/onsi/ginkgo/v2 v2.13.2 h1:Bi2gGVkfn6gQcjNjZJVO8Gf0FHzMPf2phUei9tejVMs github.com/onsi/ginkgo/v2 v2.13.2/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM= github.com/onsi/ginkgo/v2 v2.14.0 h1:vSmGj2Z5YPb9JwCWT6z6ihcUvDhuXLc3sJiqd3jMKAY= github.com/onsi/ginkgo/v2 v2.14.0/go.mod h1:JkUdW7JkN0V6rFvsHcJ478egV3XH9NxpD27Hal/PhZw= +github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY= +github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM= github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo= +github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/helm-chart/splunk-enterprise/Chart.yaml b/helm-chart/splunk-enterprise/Chart.yaml index 8884eea37..0ffb3fa35 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.5.1 +version: 2.5.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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "2.5.1" +appVersion: "2.5.2" maintainers: - name: Vivek Reddy email: vivekr@splunk.com @@ -29,6 +29,6 @@ maintainers: email: akondur@splunk.com dependencies: - name: splunk-operator - version: "2.5.1" + version: "2.5.2" repository: "file://splunk-operator/helm-chart/splunk-operator" condition: splunk-operator.enabled diff --git a/helm-chart/splunk-enterprise/charts/splunk-operator-2.5.2.tgz b/helm-chart/splunk-enterprise/charts/splunk-operator-2.5.2.tgz new file mode 100644 index 000000000..c3667980a Binary files /dev/null and b/helm-chart/splunk-enterprise/charts/splunk-operator-2.5.2.tgz differ diff --git a/helm-chart/splunk-operator/Chart.yaml b/helm-chart/splunk-operator/Chart.yaml index 0433e7090..e5cce13c6 100644 --- a/helm-chart/splunk-operator/Chart.yaml +++ b/helm-chart/splunk-operator/Chart.yaml @@ -19,10 +19,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.5.1" +version: "2.5.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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "2.5.1" \ No newline at end of file +appVersion: "2.5.2" \ No newline at end of file diff --git a/helm-chart/splunk-operator/values.yaml b/helm-chart/splunk-operator/values.yaml index 06f2e02b2..8b3b1906f 100644 --- a/helm-chart/splunk-operator/values.yaml +++ b/helm-chart/splunk-operator/values.yaml @@ -32,7 +32,7 @@ splunkOperator: # Splunk operator image and pull policy # reference: https://github.com/splunk/splunk-operator image: - repository: docker.io/splunk/splunk-operator:2.5.1 + repository: docker.io/splunk/splunk-operator:2.5.2 pullPolicy: IfNotPresent # Set image pull secrets to pull image from a private registry