Skip to content

Commit 8abb526

Browse files
authored
[chore] update test cluster (#2397)
* [chore] update test cluster * mask acct id * update eks values * fix eks tests
1 parent b0dfb8d commit 8abb526

3 files changed

Lines changed: 25 additions & 4 deletions

File tree

.github/workflows/functional_test_v2.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ jobs:
131131
aws-access-key-id: ${{ secrets.AWS_KEY }}
132132
aws-secret-access-key: ${{ secrets.AWS_SECRET }}
133133
aws-region: us-west-1
134+
mask-aws-account-id: true
134135
- name: Install kubeconfig
135136
run: |
136137
aws eks update-kubeconfig --name rotel-eks --region us-west-1
@@ -170,6 +171,7 @@ jobs:
170171
aws-access-key-id: ${{ secrets.AWS_KEY }}
171172
aws-secret-access-key: ${{ secrets.AWS_SECRET }}
172173
aws-region: us-west-1
174+
mask-aws-account-id: true
173175
- name: Install kubeconfig
174176
run: |
175177
aws eks update-kubeconfig --name rotel-eks --region us-west-1
@@ -179,7 +181,7 @@ jobs:
179181
- name: run functional tests
180182
env:
181183
HOST_ENDPOINT: 0.0.0.0
182-
UPGRADE_FROM_VALUES: aws_upgrade_from_previous_release_values.yaml
184+
UPGRADE_FROM_VALUES: eks_upgrade_from_previous_release_values.yaml
183185
UPGRADE_FROM_CHART_DIR: base/splunk-otel-collector
184186
run: |
185187
TEARDOWN_BEFORE_SETUP=true SUITE=functional make functionaltest
@@ -396,9 +398,10 @@ jobs:
396398
aws-access-key-id: ${{ secrets.AWS_KEY }}
397399
aws-secret-access-key: ${{ secrets.AWS_SECRET }}
398400
aws-region: us-west-2
401+
mask-aws-account-id: true
399402
- name: Install kubeconfig
400403
run: |
401-
aws eks update-kubeconfig --name github-gdi-fargate --region us-west-2
404+
aws eks update-kubeconfig --name gdi-github-eks-fargate --region us-west-2
402405
- name: Update dependencies
403406
run: |
404407
make dep-update
@@ -436,9 +439,10 @@ jobs:
436439
aws-access-key-id: ${{ secrets.AWS_KEY }}
437440
aws-secret-access-key: ${{ secrets.AWS_SECRET }}
438441
aws-region: us-west-2
442+
mask-aws-account-id: true
439443
- name: Install kubeconfig
440444
run: |
441-
aws eks update-kubeconfig --name github-gdi-fargate --region us-west-2
445+
aws eks update-kubeconfig --name gdi-github-eks-fargate --region us-west-2
442446
- name: Update dependencies
443447
run: |
444448
make dep-update
@@ -472,6 +476,7 @@ jobs:
472476
aws-access-key-id: ${{ secrets.AWS_KEY }}
473477
aws-secret-access-key: ${{ secrets.AWS_SECRET }}
474478
aws-region: us-west-2
479+
mask-aws-account-id: true
475480
- name: Install kubeconfig
476481
run: |
477482
aws eks update-kubeconfig --name rotel-eks-autotest --region us-west-2
@@ -511,6 +516,7 @@ jobs:
511516
aws-access-key-id: ${{ secrets.AWS_KEY }}
512517
aws-secret-access-key: ${{ secrets.AWS_SECRET }}
513518
aws-region: us-west-2
519+
mask-aws-account-id: true
514520
- name: Install kubeconfig
515521
run: |
516522
aws eks update-kubeconfig --name rotel-eks-autotest --region us-west-2

functional_tests/functional/testdata/values/eks_test_values.yaml.tmpl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,18 @@ logsCollection:
1919
useHostJournalctl: true
2020
enabled: true
2121
directory: /var/log/journal
22+
# EKS nodes run Amazon Linux 2023, where a required shared library for journalctl
23+
# lives under /usr/lib64. The chart's default mnts only mount /lib64, /lib and
24+
# /usr/lib, so journalctl fails to start unless /usr/lib64 is mounted as well.
25+
mnts:
26+
- name: host-lib64
27+
path: /lib64
28+
- name: host-lib
29+
path: /lib
30+
- name: host-usr-lib
31+
path: /usr/lib
32+
- name: host-usr-lib64
33+
path: /usr/lib64
2234
units:
2335
- name: kubelet
2436
priority: info
@@ -47,6 +59,7 @@ agent:
4759
exporters:
4860
- otlp_grpc
4961
clusterReceiver:
62+
hostNetwork: true
5063
eventsEnabled: true
5164
config:
5265
exporters:

functional_tests/functional/testdata/values/aws_upgrade_from_previous_release_values.yaml renamed to functional_tests/functional/testdata/values/eks_upgrade_from_previous_release_values.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
cloudProvider: aws
2-
distribution: eks
32
environment: dev
43
splunkObservability:
54
realm: us0
65
accessToken: xxxxx
6+
distribution: eks
7+
clusterReceiver:
8+
hostNetwork: true
79
operatorcrds:
810
install: true
911
operator:

0 commit comments

Comments
 (0)