Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.4.0 - Merge main back into develop #1248

Merged
merged 11 commits into from
Oct 24, 2023
Merged

2.4.0 - Merge main back into develop #1248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3df896b
kuttl helm test increase timeout build 2.4.0
vivekr-splunk Oct 10, 2023
7eb6aab
kuttl helm test change parallel to 1
vivekr-splunk Oct 10, 2023
e2695d3
removed name from workflow
vivekr-splunk Oct 10, 2023
44a30ec
review comments addressed
vivekr-splunk Oct 10, 2023
33d4b2e
review comments addressed
vivekr-splunk Oct 10, 2023
d44e2f3
updated reviewers
vivekr-splunk Oct 11, 2023
600ac08
updated reviewers
vivekr-splunk Oct 12, 2023
d98cfc6
Merge pull request #1244 from splunk/promote-develop-to-main-2.4.0
gaurav-splunk Oct 12, 2023
b3739ea
fixed release version
vivekr-splunk Oct 12, 2023
06dd826
Merge pull request #1246 from splunk/main-release-fix
gaurav-splunk Oct 12, 2023
e70c93e
changes to support azure docker login (#1247)
vivekr-splunk Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
OPERATOR_SDK_VERSION=v1.28.1
REVIEWERS=pdhanoya-splunk,smohan-splunk,sgontla,gaurav-splunk,jryb,vivekr-splunk,kumarajeet
REVIEWERS=smohan-splunk,sgontla,gaurav-splunk,vivekr-splunk,kumarajeet
GO_VERSION=1.19.2
AWSCLI_URL=https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.8.6.zip
KUBECTL_VERSION=v1.28.0
AZ_CLI_VERSION=2.30.0
EKSCTL_VERSION=v0.143.0
EKS_CLUSTER_K8_VERSION=1.26
SPLUNK_ENTERPRISE_RELEASE_IMAGE=docker.io/splunk/splunk:9.1.1
SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:9.1.1
8 changes: 4 additions & 4 deletions .github/workflows/int-test-azure-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ jobs:
uses: azure/docker-login@v1
with:
login-server: ${{ secrets.AZURE_ACR_LOGIN_SERVER }}
username: ${{ secrets.AZURE_CREDENTIALS_CLIENT_ID }}
password: ${{ secrets.AZURE_CREDENTIALS_CLIENT_SECRET }}
username: ${{ secrets.AZURE_ACR_DOCKER_USERNAME }}
password: ${{ secrets.AZURE_ACR_DOCKER_PASSWORD }}
- name: Make Splunk Operator Image
run: |
make docker-build IMG=${{ secrets.AZURE_ACR_LOGIN_SERVER }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA
Expand Down Expand Up @@ -171,8 +171,8 @@ jobs:
uses: azure/docker-login@v1
with:
login-server: ${{ secrets.AZURE_ACR_LOGIN_SERVER }}
username: ${{ secrets.AZURE_CREDENTIALS_CLIENT_ID }}
password: ${{ secrets.AZURE_CREDENTIALS_CLIENT_SECRET }}
username: ${{ secrets.AZURE_ACR_DOCKER_USERNAME }}
password: ${{ secrets.AZURE_ACR_DOCKER_PASSWORD }}
- name: Pull Splunk Operator Image Locally
run: |
docker pull ${{ secrets.AZURE_ACR_LOGIN_SERVER }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA
Expand Down
6 changes: 3 additions & 3 deletions docs/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

* 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-2481: Fixed splunk operator usage examples

* CSPL-2399: fixed issue where pods are being stucked in Terminating state
* CSPL-2399: Fixed issue where pods are being stucked in Terminating state

* CSPL-2482: Documents updates related to splunk-ansible

Expand All @@ -24,7 +24,7 @@

* Git-1223: Fixed an issue in Storage Class for splunk operator helm chart

* Git-1151: fixed indexer deletion in upgrade scenario
* Git-1151: Fixed indexer deletion in upgrade scenario

* Fixed auth proxy service selector labels

Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Review the [Change Log](ChangeLog.md) page for a history of changes in each rele

## Prerequisites for the Splunk Operator

Please check [release notes](https://github.com/splunk/splunk-operator/releases) for support matrix
Please check [release notes](https://github.com/splunk/splunk-operator/releases) for supportability matrix

## Platform recommendations

Expand Down
4 changes: 2 additions & 2 deletions kuttl/kuttl-test-helm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ apiVersion: kuttl.dev/v1beta1
kind: TestSuite
testDirs:
- ./kuttl/tests/helm
parallel: 3
timeout: 5000
parallel: 1
timeout: 7000
startKIND: false
artifactsDir: kuttl-artifacts
kindNodeCache: false
Loading