mirror of
https://github.com/pomerium/pomerium.git
synced 2025-08-03 16:59:22 +02:00
ci: maybe fix kubernetes integration test
This commit is contained in:
parent
ba07afc245
commit
435c119dda
2 changed files with 24 additions and 4 deletions
|
@ -41,8 +41,8 @@ services:
|
|||
- k3s-tmp:/k3s-tmp
|
||||
k3s-init:
|
||||
depends_on:
|
||||
k3s-server:
|
||||
condition: service_healthy
|
||||
k3s-server-ready:
|
||||
condition: service_completed_successfully
|
||||
entrypoint:
|
||||
- sh
|
||||
- -c
|
||||
|
@ -1074,6 +1074,17 @@ services:
|
|||
nproc: 65535
|
||||
volumes:
|
||||
- k3s-tmp:/k3s-tmp
|
||||
k3s-server-ready:
|
||||
command:
|
||||
- -wait
|
||||
- tcp://k3s-server:6443
|
||||
- -timeout
|
||||
- 10m
|
||||
image: jwilder/dockerize:0.6.1
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
- k3s-server-ready
|
||||
volumes:
|
||||
k3s-tmp:
|
||||
driver_opts:
|
||||
|
|
|
@ -74,6 +74,15 @@ function(idp, manifests) {
|
|||
'k3s-tmp:/k3s-tmp',
|
||||
],
|
||||
}) +
|
||||
utils.ComposeService('k3s-server-ready', {
|
||||
image: 'jwilder/dockerize:0.6.1',
|
||||
command: [
|
||||
'-wait',
|
||||
'tcp://k3s-server:6443',
|
||||
'-timeout',
|
||||
'10m',
|
||||
],
|
||||
}) +
|
||||
utils.ComposeService('k3s-agent', {
|
||||
image: 'rancher/k3s:${K3S_TAG:-' + k3s_tag + '}',
|
||||
entrypoint: Command() + ['agent'],
|
||||
|
@ -98,8 +107,8 @@ function(idp, manifests) {
|
|||
utils.ComposeService('k3s-init', {
|
||||
image: 'rancher/k3s:${K3S_TAG:-' + k3s_tag + '}',
|
||||
depends_on: {
|
||||
'k3s-server': {
|
||||
condition: 'service_healthy',
|
||||
'k3s-server-ready': {
|
||||
condition: 'service_completed_successfully',
|
||||
},
|
||||
},
|
||||
entrypoint: [
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue