Skip to content

Commit c80d85d

Browse files
kasiakoziolkasiakoziol
committed
Merge branch 'CSPL-3551-ingestion-cr' into feature/CSPL-4212-restart-splunkd
2 parents c35cf05 + 5dd2edc commit c80d85d

File tree

156 files changed

+20651
-797
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+20651
-797
lines changed

‎.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ REVIEWERS=vivekr-splunk,rlieberman-splunk,patrykw-splunk,Igor-splunk,kasiakoziol
33
GO_VERSION=1.23.0
44
AWSCLI_URL=https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.8.6.zip
55
KUBECTL_VERSION=v1.29.1
6-
AZ_CLI_VERSION=2.30.0
6+
AZ_CLI_VERSION=2.79.0
77
EKSCTL_VERSION=v0.215.0
88
EKS_CLUSTER_K8_VERSION=1.34
99
EKS_INSTANCE_TYPE=m5.2xlarge

‎.github/actions/set-cluster-name/action.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: 'Set EKS Test Cluster Name'
2+
description: 'Generate a shortened, standardized EKS test cluster name'
3+
inputs:
4+
test-type:
5+
description: 'Type of test (e.g., smoke, integration)'
6+
required: true
7+
platform:
8+
description: 'Platform variant (e.g., distroless, arm-ubuntu, arm-rhel, arm-al2023, helm, namespace, nightly, manual, or empty for standard)'
9+
required: false
10+
default: ''
11+
test-name:
12+
description: 'Test name from matrix (e.g., basic, managerappframeworkc3)'
13+
required: true
14+
run-id:
15+
description: 'GitHub run ID for uniqueness'
16+
required: true
17+
outputs:
18+
cluster-name:
19+
description: 'The generated cluster name'
20+
value: ${{ steps.generate-name.outputs.cluster_name }}
21+
runs:
22+
using: "composite"
23+
steps:
24+
- name: Generate cluster name
25+
id: generate-name
26+
shell: bash
27+
run: |
28+
TEST_NAME="${{ inputs.test-name }}"
29+
30+
# Shorten long test names
31+
case "$TEST_NAME" in
32+
managerappframeworkc3) TEST_NAME="mgr-appfw-c3" ;;
33+
managerappframeworkm4) TEST_NAME="mgr-appfw-m4" ;;
34+
appframeworksS1) TEST_NAME="appfw-s1" ;;
35+
managersecret) TEST_NAME="mgr-secret" ;;
36+
managermc) TEST_NAME="mgr-mc" ;;
37+
esac
38+
39+
# Build cluster name based on platform
40+
if [ -z "${{ inputs.platform }}" ]; then
41+
# Standard platform (no platform suffix)
42+
CLUSTER_NAME="eks-test-${{ inputs.test-type }}-${TEST_NAME}-${{ inputs.run-id }}"
43+
else
44+
# Platform-specific
45+
CLUSTER_NAME="eks-test-${{ inputs.test-type }}-${{ inputs.platform }}-${TEST_NAME}-${{ inputs.run-id }}"
46+
fi
47+
48+
echo "cluster_name=${CLUSTER_NAME}" >> $GITHUB_OUTPUT
49+
echo "Generated cluster name: ${CLUSTER_NAME}"
50+

‎.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,19 @@ jobs:
147147
ARM64: "true"
148148
GRAVITON_TESTING: "true"
149149
steps:
150-
- name: Set Test Cluster Name
151-
run: |
152-
echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
153150
- name: Chekcout code
154151
uses: actions/checkout@v2
152+
- name: Set Test Cluster Name
153+
id: set-cluster-name
154+
uses: ./.github/actions/set-cluster-name
155+
with:
156+
test-type: smoke
157+
platform: arm-al2023
158+
test-name: ${{ matrix.test }}
159+
run-id: ${{ github.run_id }}
160+
- name: Export cluster name to environment
161+
run: |
162+
echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
155163
- name: Dotenv Action
156164
id: dotenv
157165
uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359

‎.github/workflows/arm-AL2023-int-test-workflow.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,6 @@ jobs:
9595
ARM64: "true"
9696
GRAVITON_TESTING: "true"
9797
steps:
98-
- name: Set Test Cluster Name
99-
run: |
100-
echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
10198
- name: Set Test Cluster Nodes and Parallel Runs
10299
run: >-
103100
if grep -q "appframework" <<< "${{ matrix.test }}"; then
@@ -106,6 +103,17 @@ jobs:
106103
fi
107104
- name: Checkcout code
108105
uses: actions/checkout@v2
106+
- name: Set Test Cluster Name
107+
id: set-cluster-name
108+
uses: ./.github/actions/set-cluster-name
109+
with:
110+
test-type: integration
111+
platform: arm-al2023
112+
test-name: ${{ matrix.test }}
113+
run-id: ${{ github.run_id }}
114+
- name: Export cluster name to environment
115+
run: |
116+
echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
109117
- name: Dotenv Action
110118
id: dotenv
111119
uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359

‎.github/workflows/arm-RHEL-build-test-push-workflow.yml‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: ARM RHEL Integration Test WorkFlow
1+
name: ARM RHEL Smoke Test WorkFlow
22
permissions:
33
contents: read
44
packages: write
@@ -54,7 +54,7 @@ jobs:
5454
export BASE_IMAGE_VERSION=9.5
5555
export IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA
5656
make docker-buildx PLATFORMS=$PLATFORMS BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=$IMG
57-
int-tests-arm-rhel:
57+
smoke-tests-arm-rhel:
5858
strategy:
5959
fail-fast: false
6060
matrix:
@@ -80,8 +80,8 @@ jobs:
8080
SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
8181
SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator
8282
TEST_FOCUS: "${{ matrix.test }}"
83-
# This regex matches any string not containing integration keyword
84-
TEST_TO_SKIP: "^(?:[^i]+|i(?:$|[^n]|n(?:$|[^t]|t(?:$|[^e]|e(?:$|[^g]|g(?:$|[^r]|r(?:$|[^a]|a(?:$|[^t]|t(?:$|[^i]|i(?:$|[^o]|o(?:$|[^n])))))))))))*$"
83+
# This regex matches any string not containing smoke keyword
84+
TEST_TO_SKIP: "^(?:[^s]+|s(?:$|[^m]|m(?:$|[^o]|o(?:$|[^k]|k(?:$|[^e])))))*$"
8585
TEST_CLUSTER_PLATFORM: eks
8686
EKS_VPC_PRIVATE_SUBNET_STRING: ${{ secrets.EKS_VPC_PRIVATE_SUBNET_STRING }}
8787
EKS_VPC_PUBLIC_SUBNET_STRING: ${{ secrets.EKS_VPC_PUBLIC_SUBNET_STRING }}
@@ -95,9 +95,6 @@ jobs:
9595
ARM64: "true"
9696
GRAVITON_TESTING: "true"
9797
steps:
98-
- name: Set Test Cluster Name
99-
run: |
100-
echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
10198
- name: Set Test Cluster Nodes and Parallel Runs
10299
run: >-
103100
if grep -q "appframework" <<< "${{ matrix.test }}"; then
@@ -106,6 +103,17 @@ jobs:
106103
fi
107104
- name: Checkcout code
108105
uses: actions/checkout@v2
106+
- name: Set Test Cluster Name
107+
id: set-cluster-name
108+
uses: ./.github/actions/set-cluster-name
109+
with:
110+
test-type: smoke
111+
platform: arm-rhel
112+
test-name: ${{ matrix.test }}
113+
run-id: ${{ github.run_id }}
114+
- name: Export cluster name to environment
115+
run: |
116+
echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
109117
- name: Dotenv Action
110118
id: dotenv
111119
uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
@@ -181,7 +189,7 @@ jobs:
181189
sudo snap install kustomize
182190
mkdir -p ./bin
183191
cp /snap/bin/kustomize ./bin/kustomize
184-
- name: Run Integration test
192+
- name: Run smoke test
185193
run: |
186194
make int-test
187195
- name: Collect Test Logs

‎.github/workflows/arm-RHEL-int-test-workflow.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,6 @@ jobs:
9595
ARM64: "true"
9696
GRAVITON_TESTING: "true"
9797
steps:
98-
- name: Set Test Cluster Name
99-
run: |
100-
echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
10198
- name: Set Test Cluster Nodes and Parallel Runs
10299
run: >-
103100
if grep -q "appframework" <<< "${{ matrix.test }}"; then
@@ -106,6 +103,17 @@ jobs:
106103
fi
107104
- name: Checkcout code
108105
uses: actions/checkout@v2
106+
- name: Set Test Cluster Name
107+
id: set-cluster-name
108+
uses: ./.github/actions/set-cluster-name
109+
with:
110+
test-type: integration
111+
platform: arm-rhel
112+
test-name: ${{ matrix.test }}
113+
run-id: ${{ github.run_id }}
114+
- name: Export cluster name to environment
115+
run: |
116+
echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
109117
- name: Dotenv Action
110118
id: dotenv
111119
uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359

‎.github/workflows/arm-Ubuntu-build-test-push-workflow.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,19 @@ jobs:
147147
ARM64: "true"
148148
GRAVITON_TESTING: "true"
149149
steps:
150-
- name: Set Test Cluster Name
151-
run: |
152-
echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
153150
- name: Chekcout code
154151
uses: actions/checkout@v2
152+
- name: Set Test Cluster Name
153+
id: set-cluster-name
154+
uses: ./.github/actions/set-cluster-name
155+
with:
156+
test-type: smoke
157+
platform: arm-ubuntu
158+
test-name: ${{ matrix.test }}
159+
run-id: ${{ github.run_id }}
160+
- name: Export cluster name to environment
161+
run: |
162+
echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
155163
- name: Dotenv Action
156164
id: dotenv
157165
uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359

‎.github/workflows/arm-Ubuntu-int-test-workflow.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,6 @@ jobs:
9595
ARM64: "true"
9696
GRAVITON_TESTING: "true"
9797
steps:
98-
- name: Set Test Cluster Name
99-
run: |
100-
echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
10198
- name: Set Test Cluster Nodes and Parallel Runs
10299
run: >-
103100
if grep -q "appframework" <<< "${{ matrix.test }}"; then
@@ -106,6 +103,17 @@ jobs:
106103
fi
107104
- name: Checkcout code
108105
uses: actions/checkout@v2
106+
- name: Set Test Cluster Name
107+
id: set-cluster-name
108+
uses: ./.github/actions/set-cluster-name
109+
with:
110+
test-type: integration
111+
platform: arm-ubuntu
112+
test-name: ${{ matrix.test }}
113+
run-id: ${{ github.run_id }}
114+
- name: Export cluster name to environment
115+
run: |
116+
echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
109117
- name: Dotenv Action
110118
id: dotenv
111119
uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359

‎.github/workflows/automated-release-workflow.yml‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ jobs:
6262
username: ${{ secrets.DOCKERHUB_USERNAME }}
6363
password: ${{ secrets.DOCKERHUB_PUSH_TOKEN}}
6464

65+
- name: Install regctl
66+
uses: regclient/actions/regctl-installer@main
67+
6568
- name: Install Operator SDK
6669
run: |
6770
export ARCH=$(case $(uname -m) in x86_64) echo -n amd64 ;; aarch64) echo -n arm64 ;; *) echo -n $(uname -m) ;; esac)
@@ -95,19 +98,10 @@ jobs:
9598
tag: "${{ github.event.inputs.release_version }}"
9699
draft: true
97100

98-
- name: Pull RC Splunk Operator Image
99-
run: |
100-
docker pull ${{ secrets.PUBLIC_ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_RC_IMAGE_NAME }}:${{ github.event.inputs.release_version }}-RC
101-
102101
- name: Promote RC Image to Release
103102
run: |
104-
docker tag ${{ secrets.PUBLIC_ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_RC_IMAGE_NAME }}:${{ github.event.inputs.release_version }}-RC splunk/splunk-operator:${{ github.event.inputs.operator_image_tag }}
105-
docker tag splunk/splunk-operator:${{ github.event.inputs.operator_image_tag }} splunk/splunk-operator:latest
106-
107-
- name: Push Release Image
108-
run: |
109-
docker push splunk/splunk-operator:${{ github.event.inputs.operator_image_tag }}
110-
docker push splunk/splunk-operator:latest
103+
regctl image copy ${{ secrets.PUBLIC_ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_RC_IMAGE_NAME }}:${{ github.event.inputs.release_version }}-RC splunk/splunk-operator:${{ github.event.inputs.operator_image_tag }}
104+
regctl image copy ${{ secrets.PUBLIC_ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_RC_IMAGE_NAME }}:${{ github.event.inputs.release_version }}-RC splunk/splunk-operator:latest
111105
112106
- name: Sign Splunk Operator image with a key
113107
run: |
@@ -122,17 +116,9 @@ jobs:
122116
env:
123117
COSIGN_PUBLIC_KEY: ${{ secrets.COSIGN_PUBLIC_KEY }}
124118

125-
- name: Pull Distroless RC Splunk Operator Image
126-
run: |
127-
docker pull ${{ secrets.PUBLIC_ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_RC_IMAGE_NAME }}:${{ github.event.inputs.release_version }}-RC-distroless
128-
129119
- name: Promote Distroless RC Image to Release
130120
run: |
131-
docker tag ${{ secrets.PUBLIC_ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_RC_IMAGE_NAME }}:${{ github.event.inputs.release_version }}-RC-distroless splunk/splunk-operator:${{ github.event.inputs.operator_image_tag }}-distroless
132-
133-
- name: Push Distroless Release Image
134-
run: |
135-
docker push splunk/splunk-operator:${{ github.event.inputs.operator_image_tag }}-distroless
121+
regctl image copy ${{ secrets.PUBLIC_ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_RC_IMAGE_NAME }}:${{ github.event.inputs.release_version }}-RC-distroless splunk/splunk-operator:${{ github.event.inputs.operator_image_tag }}-distroless
136122
137123
- name: Sign Distroless Splunk Operator image with a key
138124
run: |

‎.github/workflows/build-test-push-workflow.yml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,18 @@ jobs:
191191
CLUSTER_WIDE: "true"
192192
DEPLOYMENT_TYPE: ""
193193
steps:
194-
- name: Set Test Cluster Name
195-
run: |
196-
echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
197194
- name: Chekcout code
198195
uses: actions/checkout@v2
196+
- name: Set Test Cluster Name
197+
id: set-cluster-name
198+
uses: ./.github/actions/set-cluster-name
199+
with:
200+
test-type: smoke
201+
test-name: ${{ matrix.test }}
202+
run-id: ${{ github.run_id }}
203+
- name: Export cluster name to environment
204+
run: |
205+
echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
199206
- name: Dotenv Action
200207
id: dotenv
201208
uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359

0 commit comments

Comments
 (0)