fix redis hostname for k8s files and only append tasks with a desired state of running for autoconf/swarm

This commit is contained in:
bunkerity 2023-04-03 15:32:44 +02:00
parent c843be074c
commit 9b8606d40e
8 changed files with 37 additions and 15 deletions

View File

@ -124,13 +124,13 @@ jobs:
category: "/language:${{matrix.language}}"
# Create infrastructures
create-infra-docker:
needs: [code-security, build-bw, build-scheduler]
uses: ./.github/workflows/staging-create-infra.yml
with:
TYPE: docker
secrets:
CICD_SECRETS: ${{ secrets.CICD_SECRETS }}
# create-infra-docker:
# needs: [code-security, build-bw, build-scheduler]
# uses: ./.github/workflows/staging-create-infra.yml
# with:
# TYPE: docker
# secrets:
# CICD_SECRETS: ${{ secrets.CICD_SECRETS }}
# create-infra-autoconf:
# needs: [code-security, build-bw, build-scheduler, build-autoconf]
# uses: ./.github/workflows/staging-create-infra.yml
@ -170,13 +170,13 @@ jobs:
# CICD_SECRETS: ${{ secrets.CICD_SECRETS }}
# Perform tests
tests-docker:
needs: [create-infra-docker]
uses: ./.github/workflows/staging-tests.yml
with:
TYPE: docker
RUNS_ON: "['self-hosted', 'bw-docker']"
secrets: inherit
# tests-docker:
# needs: [create-infra-docker]
# uses: ./.github/workflows/staging-tests.yml
# with:
# TYPE: docker
# RUNS_ON: "['self-hosted', 'bw-docker']"
# secrets: inherit
# tests-autoconf:
# needs: [create-infra-autoconf]
# uses: ./.github/workflows/staging-tests.yml

View File

@ -77,6 +77,10 @@ spec:
value: ""
- name: MULTISITE
value: "yes"
- name: USE_REDIS
value: "yes"
- name: REDIS_HOST
value: "svc-bunkerweb-redis.default.svc.cluster.local"
livenessProbe:
exec:
command:

View File

@ -80,7 +80,7 @@ spec:
- name: USE_REDIS
value: "yes"
- name: REDIS_HOST
value: "svc-bunkerweb-redis"
value: "svc-bunkerweb-redis.default.svc.cluster.local"
livenessProbe:
exec:
command:

View File

@ -77,6 +77,10 @@ spec:
value: ""
- name: MULTISITE
value: "yes"
- name: USE_REDIS
value: "yes"
- name: REDIS_HOST
value: "svc-bunkerweb-redis.default.svc.cluster.local"
livenessProbe:
exec:
command:

View File

@ -77,6 +77,10 @@ spec:
value: ""
- name: MULTISITE
value: "yes"
- name: USE_REDIS
value: "yes"
- name: REDIS_HOST
value: "svc-bunkerweb-redis.default.svc.cluster.local"
livenessProbe:
exec:
command:

View File

@ -77,6 +77,10 @@ spec:
value: ""
- name: MULTISITE
value: "yes"
- name: USE_REDIS
value: "yes"
- name: REDIS_HOST
value: "svc-bunkerweb-redis.default.svc.cluster.local"
livenessProbe:
exec:
command:

View File

@ -77,6 +77,10 @@ spec:
value: ""
- name: MULTISITE
value: "yes"
- name: USE_REDIS
value: "yes"
- name: REDIS_HOST
value: "svc-bunkerweb-redis.default.svc.cluster.local"
livenessProbe:
exec:
command:

View File

@ -35,6 +35,8 @@ class SwarmController(Controller, ConfigCaller):
instance_env[variable] = value
for task in controller_instance.tasks():
if task["DesiredState"] != "running" :
continue
instances.append(
{
"name": task["ID"],