Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 kuttl/tests/helm/m4-with-operator/m4_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ sva:
name: cm
allSites: "site1,site2"
site: site1
zone: us-west-2d
zone: us-west-2c

indexerClusters:
- name: idx1
site: site1
zone: us-west-2d
zone: us-west-2c
- name: idx2
site: site2
zone: us-west-2b
Expand Down
4 changes: 2 additions & 2 deletions kuttl/tests/helm/m4/m4_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ sva:
name: cm
allSites: "site1,site2"
site: site1
zone: us-west-2d
zone: us-west-2c

indexerClusters:
- name: idx1
site: site1
zone: us-west-2d
zone: us-west-2c
- name: idx2
site: site2
zone: us-west-2b
Expand Down
4 changes: 2 additions & 2 deletions kuttl/tests/helm_sva/m4/m4_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ sva:
name: cm
allSites: "site1,site2"
site: site1
zone: us-west-2d
zone: us-west-2c
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated to this test case, should we separate cluster deployment from test cases ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's only the m4 cases that this matters due to the different sites. If it's possible to make them cluster agnostic, that would be great, like getting the available zones as inputs instead of hard coding them. It looks like the m4 integration test cases do not set zones, so we could look at how those sites are getting set up and make changes to the helm tests to replicate that.

As you mentioned, the goal of this PR is to stabilize the workflows, so this request can be done in a separate PR.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

QQ (non-blocking) - where does those new VPC/subnet configs live that required this PR's zone update?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kubabuczak created new ones in response to a security issue involving our team's AWS account, and were updated in the github secrets that are used by the workflows. Example: https://github.com/splunk/splunk-operator/blob/main/.github/workflows/helm-test-workflow.yml#L58


indexerClusters:
- name: idx1
site: site1
zone: us-west-2d
zone: us-west-2c
- name: idx2
site: site2
zone: us-west-2b
Expand Down
Loading