Skip to content

Commit e6cb0ab

Browse files
authored
feat(helm): Simplify k8s-tests.yml (#13379)
1 parent 1419211 commit e6cb0ab

1 file changed

Lines changed: 5 additions & 20 deletions

File tree

.github/workflows/k8s-tests.yml

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@ on:
55

66
env:
77
DD_HOSTNAME: defectdojo.default.minikube.local
8-
HELM_REDIS_BROKER_SETTINGS: " \
9-
--set redis.enabled=true \
10-
--set celery.broker=redis \
11-
--set createRedisSecret=true \
12-
"
13-
HELM_PG_DATABASE_SETTINGS: " \
14-
--set postgresql.enabled=true \
15-
--set createPostgresqlSecret=true \
16-
"
178
jobs:
189
setting_minikube_cluster:
1910
name: Kubernetes Deployment
@@ -25,9 +16,7 @@ jobs:
2516
# databases, broker and k8s are independent, so we don't need to test each combination
2617
# lastest k8s version (https://kubernetes.io/releases/) and oldest supported version from aws
2718
# are tested (https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html#available-versions)
28-
- databases: pgsql
29-
brokers: redis
30-
k8s: 'v1.34.0'
19+
- k8s: 'v1.34.0'
3120
os: debian
3221
steps:
3322
- name: Checkout
@@ -68,12 +57,6 @@ jobs:
6857
helm dependency list ./helm/defectdojo
6958
helm dependency update ./helm/defectdojo
7059
71-
- name: Set confings into Outputs
72-
id: set
73-
run: |-
74-
echo "pgsql=${{ env.HELM_PG_DATABASE_SETTINGS }}" >> $GITHUB_ENV
75-
echo "redis=${{ env.HELM_REDIS_BROKER_SETTINGS }}" >> $GITHUB_ENV
76-
7760
- name: Deploying Django application with ${{ matrix.databases }} ${{ matrix.brokers }}
7861
timeout-minutes: 15
7962
run: |-
@@ -86,8 +69,10 @@ jobs:
8669
--set django.ingress.enabled=true \
8770
--set imagePullPolicy=Never \
8871
--set initializer.keepSeconds="-1" \
89-
${{ env[matrix.databases] }} \
90-
${{ env[matrix.brokers] }} \
72+
--set redis.enabled=true \
73+
--set createRedisSecret=true \
74+
--set postgresql.enabled=true \
75+
--set createPostgresqlSecret=true \
9176
--set createSecret=true
9277
9378
- name: Check deployment status

0 commit comments

Comments
 (0)