From 6ed3fa20bc6a89dbaecbe2140a33c65ab490091c Mon Sep 17 00:00:00 2001 From: Caleb Doxsey Date: Wed, 5 Jan 2022 12:48:35 -0700 Subject: [PATCH] integration: fix default port for verify service (#2895) --- integration/clusters/auth0-kubernetes/compose.yml | 2 +- integration/clusters/auth0-multi/compose.yml | 2 +- integration/clusters/auth0-nginx/compose.yml | 2 +- integration/clusters/auth0-single/compose.yml | 2 +- integration/clusters/auth0-traefik/compose.yml | 2 +- integration/clusters/azure-kubernetes/compose.yml | 2 +- integration/clusters/azure-multi/compose.yml | 2 +- integration/clusters/azure-nginx/compose.yml | 2 +- integration/clusters/azure-single/compose.yml | 2 +- integration/clusters/azure-traefik/compose.yml | 2 +- integration/clusters/github-kubernetes/compose.yml | 2 +- integration/clusters/github-multi/compose.yml | 2 +- integration/clusters/github-nginx/compose.yml | 2 +- integration/clusters/github-single/compose.yml | 2 +- integration/clusters/github-traefik/compose.yml | 2 +- integration/clusters/gitlab-kubernetes/compose.yml | 2 +- integration/clusters/gitlab-multi/compose.yml | 2 +- integration/clusters/gitlab-nginx/compose.yml | 2 +- integration/clusters/gitlab-single/compose.yml | 2 +- integration/clusters/gitlab-traefik/compose.yml | 2 +- integration/clusters/google-kubernetes/compose.yml | 2 +- integration/clusters/google-multi/compose.yml | 2 +- integration/clusters/google-nginx/compose.yml | 2 +- integration/clusters/google-single/compose.yml | 2 +- integration/clusters/google-traefik/compose.yml | 2 +- integration/clusters/oidc-kubernetes/compose.yml | 2 +- integration/clusters/oidc-multi/compose.yml | 2 +- integration/clusters/oidc-nginx/compose.yml | 2 +- integration/clusters/oidc-single/compose.yml | 2 +- integration/clusters/oidc-traefik/compose.yml | 2 +- integration/clusters/okta-kubernetes/compose.yml | 2 +- integration/clusters/okta-multi/compose.yml | 2 +- integration/clusters/okta-nginx/compose.yml | 2 +- integration/clusters/okta-single/compose.yml | 2 +- integration/clusters/okta-traefik/compose.yml | 2 +- integration/clusters/onelogin-kubernetes/compose.yml | 2 +- integration/clusters/onelogin-multi/compose.yml | 2 +- integration/clusters/onelogin-nginx/compose.yml | 2 +- integration/clusters/onelogin-single/compose.yml | 2 +- integration/clusters/onelogin-traefik/compose.yml | 2 +- integration/clusters/ping-kubernetes/compose.yml | 2 +- integration/clusters/ping-multi/compose.yml | 2 +- integration/clusters/ping-nginx/compose.yml | 2 +- integration/clusters/ping-single/compose.yml | 2 +- integration/clusters/ping-traefik/compose.yml | 2 +- integration/tpl/backends/verify.libsonnet | 4 ++-- 46 files changed, 47 insertions(+), 47 deletions(-) diff --git a/integration/clusters/auth0-kubernetes/compose.yml b/integration/clusters/auth0-kubernetes/compose.yml index fc7c00bd0..e12730aa4 100644 --- a/integration/clusters/auth0-kubernetes/compose.yml +++ b/integration/clusters/auth0-kubernetes/compose.yml @@ -545,7 +545,7 @@ services: "name": "verify", "ports": [ { - "containerPort": 80, + "containerPort": 8000, "name": "http" } ] diff --git a/integration/clusters/auth0-multi/compose.yml b/integration/clusters/auth0-multi/compose.yml index a808dfc94..9ddad7f8b 100644 --- a/integration/clusters/auth0-multi/compose.yml +++ b/integration/clusters/auth0-multi/compose.yml @@ -848,7 +848,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/auth0-nginx/compose.yml b/integration/clusters/auth0-nginx/compose.yml index 680920216..3809b2a9a 100644 --- a/integration/clusters/auth0-nginx/compose.yml +++ b/integration/clusters/auth0-nginx/compose.yml @@ -922,7 +922,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/auth0-single/compose.yml b/integration/clusters/auth0-single/compose.yml index 1d22fb16e..8a7aa0dbe 100644 --- a/integration/clusters/auth0-single/compose.yml +++ b/integration/clusters/auth0-single/compose.yml @@ -666,7 +666,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/auth0-traefik/compose.yml b/integration/clusters/auth0-traefik/compose.yml index a9f4696a6..3d716c0dd 100644 --- a/integration/clusters/auth0-traefik/compose.yml +++ b/integration/clusters/auth0-traefik/compose.yml @@ -1450,7 +1450,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/azure-kubernetes/compose.yml b/integration/clusters/azure-kubernetes/compose.yml index f65ea609d..a7dcecea9 100644 --- a/integration/clusters/azure-kubernetes/compose.yml +++ b/integration/clusters/azure-kubernetes/compose.yml @@ -545,7 +545,7 @@ services: "name": "verify", "ports": [ { - "containerPort": 80, + "containerPort": 8000, "name": "http" } ] diff --git a/integration/clusters/azure-multi/compose.yml b/integration/clusters/azure-multi/compose.yml index 055d7fb0c..1d1d33727 100644 --- a/integration/clusters/azure-multi/compose.yml +++ b/integration/clusters/azure-multi/compose.yml @@ -848,7 +848,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/azure-nginx/compose.yml b/integration/clusters/azure-nginx/compose.yml index b19e0b89e..03b5c4176 100644 --- a/integration/clusters/azure-nginx/compose.yml +++ b/integration/clusters/azure-nginx/compose.yml @@ -922,7 +922,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/azure-single/compose.yml b/integration/clusters/azure-single/compose.yml index 6b45d0b87..fa1b8de35 100644 --- a/integration/clusters/azure-single/compose.yml +++ b/integration/clusters/azure-single/compose.yml @@ -666,7 +666,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/azure-traefik/compose.yml b/integration/clusters/azure-traefik/compose.yml index 5675cd838..217d18884 100644 --- a/integration/clusters/azure-traefik/compose.yml +++ b/integration/clusters/azure-traefik/compose.yml @@ -1450,7 +1450,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/github-kubernetes/compose.yml b/integration/clusters/github-kubernetes/compose.yml index c94f33e07..178e6c100 100644 --- a/integration/clusters/github-kubernetes/compose.yml +++ b/integration/clusters/github-kubernetes/compose.yml @@ -545,7 +545,7 @@ services: "name": "verify", "ports": [ { - "containerPort": 80, + "containerPort": 8000, "name": "http" } ] diff --git a/integration/clusters/github-multi/compose.yml b/integration/clusters/github-multi/compose.yml index ed115973c..4f2221ac7 100644 --- a/integration/clusters/github-multi/compose.yml +++ b/integration/clusters/github-multi/compose.yml @@ -848,7 +848,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/github-nginx/compose.yml b/integration/clusters/github-nginx/compose.yml index 53f2f4fd3..dde9edfd6 100644 --- a/integration/clusters/github-nginx/compose.yml +++ b/integration/clusters/github-nginx/compose.yml @@ -922,7 +922,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/github-single/compose.yml b/integration/clusters/github-single/compose.yml index 2be79c689..91f2aaf91 100644 --- a/integration/clusters/github-single/compose.yml +++ b/integration/clusters/github-single/compose.yml @@ -666,7 +666,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/github-traefik/compose.yml b/integration/clusters/github-traefik/compose.yml index adc351eaf..efaeaf4cb 100644 --- a/integration/clusters/github-traefik/compose.yml +++ b/integration/clusters/github-traefik/compose.yml @@ -1450,7 +1450,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/gitlab-kubernetes/compose.yml b/integration/clusters/gitlab-kubernetes/compose.yml index b54e6dc46..87b7e7525 100644 --- a/integration/clusters/gitlab-kubernetes/compose.yml +++ b/integration/clusters/gitlab-kubernetes/compose.yml @@ -545,7 +545,7 @@ services: "name": "verify", "ports": [ { - "containerPort": 80, + "containerPort": 8000, "name": "http" } ] diff --git a/integration/clusters/gitlab-multi/compose.yml b/integration/clusters/gitlab-multi/compose.yml index a3212e838..ebb785f85 100644 --- a/integration/clusters/gitlab-multi/compose.yml +++ b/integration/clusters/gitlab-multi/compose.yml @@ -848,7 +848,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/gitlab-nginx/compose.yml b/integration/clusters/gitlab-nginx/compose.yml index 044c2a68b..fe6931fe2 100644 --- a/integration/clusters/gitlab-nginx/compose.yml +++ b/integration/clusters/gitlab-nginx/compose.yml @@ -922,7 +922,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/gitlab-single/compose.yml b/integration/clusters/gitlab-single/compose.yml index 588566433..2e343bc9d 100644 --- a/integration/clusters/gitlab-single/compose.yml +++ b/integration/clusters/gitlab-single/compose.yml @@ -666,7 +666,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/gitlab-traefik/compose.yml b/integration/clusters/gitlab-traefik/compose.yml index ff5994e67..2bc1736a3 100644 --- a/integration/clusters/gitlab-traefik/compose.yml +++ b/integration/clusters/gitlab-traefik/compose.yml @@ -1450,7 +1450,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/google-kubernetes/compose.yml b/integration/clusters/google-kubernetes/compose.yml index 246b524ca..eb7b9ba70 100644 --- a/integration/clusters/google-kubernetes/compose.yml +++ b/integration/clusters/google-kubernetes/compose.yml @@ -545,7 +545,7 @@ services: "name": "verify", "ports": [ { - "containerPort": 80, + "containerPort": 8000, "name": "http" } ] diff --git a/integration/clusters/google-multi/compose.yml b/integration/clusters/google-multi/compose.yml index fc743d163..0bffcbc06 100644 --- a/integration/clusters/google-multi/compose.yml +++ b/integration/clusters/google-multi/compose.yml @@ -848,7 +848,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/google-nginx/compose.yml b/integration/clusters/google-nginx/compose.yml index ce8de452f..312f13090 100644 --- a/integration/clusters/google-nginx/compose.yml +++ b/integration/clusters/google-nginx/compose.yml @@ -922,7 +922,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/google-single/compose.yml b/integration/clusters/google-single/compose.yml index 32e788cea..b9c7ee445 100644 --- a/integration/clusters/google-single/compose.yml +++ b/integration/clusters/google-single/compose.yml @@ -666,7 +666,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/google-traefik/compose.yml b/integration/clusters/google-traefik/compose.yml index 383dc8380..c66d55c0c 100644 --- a/integration/clusters/google-traefik/compose.yml +++ b/integration/clusters/google-traefik/compose.yml @@ -1450,7 +1450,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/oidc-kubernetes/compose.yml b/integration/clusters/oidc-kubernetes/compose.yml index 1acc04db0..4b79f9ed4 100644 --- a/integration/clusters/oidc-kubernetes/compose.yml +++ b/integration/clusters/oidc-kubernetes/compose.yml @@ -545,7 +545,7 @@ services: "name": "verify", "ports": [ { - "containerPort": 80, + "containerPort": 8000, "name": "http" } ] diff --git a/integration/clusters/oidc-multi/compose.yml b/integration/clusters/oidc-multi/compose.yml index 64b162349..43168d79b 100644 --- a/integration/clusters/oidc-multi/compose.yml +++ b/integration/clusters/oidc-multi/compose.yml @@ -848,7 +848,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/oidc-nginx/compose.yml b/integration/clusters/oidc-nginx/compose.yml index 1d8b88c9d..31d50f054 100644 --- a/integration/clusters/oidc-nginx/compose.yml +++ b/integration/clusters/oidc-nginx/compose.yml @@ -922,7 +922,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/oidc-single/compose.yml b/integration/clusters/oidc-single/compose.yml index d9af8fcea..8263c3b08 100644 --- a/integration/clusters/oidc-single/compose.yml +++ b/integration/clusters/oidc-single/compose.yml @@ -666,7 +666,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/oidc-traefik/compose.yml b/integration/clusters/oidc-traefik/compose.yml index 22b006f6b..e7f396f52 100644 --- a/integration/clusters/oidc-traefik/compose.yml +++ b/integration/clusters/oidc-traefik/compose.yml @@ -1450,7 +1450,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/okta-kubernetes/compose.yml b/integration/clusters/okta-kubernetes/compose.yml index 48d757be9..2b6ad3f30 100644 --- a/integration/clusters/okta-kubernetes/compose.yml +++ b/integration/clusters/okta-kubernetes/compose.yml @@ -545,7 +545,7 @@ services: "name": "verify", "ports": [ { - "containerPort": 80, + "containerPort": 8000, "name": "http" } ] diff --git a/integration/clusters/okta-multi/compose.yml b/integration/clusters/okta-multi/compose.yml index ca8da821d..fbfad100a 100644 --- a/integration/clusters/okta-multi/compose.yml +++ b/integration/clusters/okta-multi/compose.yml @@ -848,7 +848,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/okta-nginx/compose.yml b/integration/clusters/okta-nginx/compose.yml index 68c3df221..20aa3ab3a 100644 --- a/integration/clusters/okta-nginx/compose.yml +++ b/integration/clusters/okta-nginx/compose.yml @@ -922,7 +922,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/okta-single/compose.yml b/integration/clusters/okta-single/compose.yml index d91ce4049..f53e7fe33 100644 --- a/integration/clusters/okta-single/compose.yml +++ b/integration/clusters/okta-single/compose.yml @@ -666,7 +666,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/okta-traefik/compose.yml b/integration/clusters/okta-traefik/compose.yml index 3c4043916..ec9891934 100644 --- a/integration/clusters/okta-traefik/compose.yml +++ b/integration/clusters/okta-traefik/compose.yml @@ -1450,7 +1450,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/onelogin-kubernetes/compose.yml b/integration/clusters/onelogin-kubernetes/compose.yml index 6b1d19fcc..cb75b9e57 100644 --- a/integration/clusters/onelogin-kubernetes/compose.yml +++ b/integration/clusters/onelogin-kubernetes/compose.yml @@ -545,7 +545,7 @@ services: "name": "verify", "ports": [ { - "containerPort": 80, + "containerPort": 8000, "name": "http" } ] diff --git a/integration/clusters/onelogin-multi/compose.yml b/integration/clusters/onelogin-multi/compose.yml index 6b6ad9641..e91c254fc 100644 --- a/integration/clusters/onelogin-multi/compose.yml +++ b/integration/clusters/onelogin-multi/compose.yml @@ -848,7 +848,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/onelogin-nginx/compose.yml b/integration/clusters/onelogin-nginx/compose.yml index 36d48db17..e8283010a 100644 --- a/integration/clusters/onelogin-nginx/compose.yml +++ b/integration/clusters/onelogin-nginx/compose.yml @@ -922,7 +922,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/onelogin-single/compose.yml b/integration/clusters/onelogin-single/compose.yml index 63afb2861..c0dec83a3 100644 --- a/integration/clusters/onelogin-single/compose.yml +++ b/integration/clusters/onelogin-single/compose.yml @@ -666,7 +666,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/onelogin-traefik/compose.yml b/integration/clusters/onelogin-traefik/compose.yml index b6da9a811..61bcfb70c 100644 --- a/integration/clusters/onelogin-traefik/compose.yml +++ b/integration/clusters/onelogin-traefik/compose.yml @@ -1450,7 +1450,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/ping-kubernetes/compose.yml b/integration/clusters/ping-kubernetes/compose.yml index 589e50981..216882167 100644 --- a/integration/clusters/ping-kubernetes/compose.yml +++ b/integration/clusters/ping-kubernetes/compose.yml @@ -545,7 +545,7 @@ services: "name": "verify", "ports": [ { - "containerPort": 80, + "containerPort": 8000, "name": "http" } ] diff --git a/integration/clusters/ping-multi/compose.yml b/integration/clusters/ping-multi/compose.yml index bb68d4268..f153c14fb 100644 --- a/integration/clusters/ping-multi/compose.yml +++ b/integration/clusters/ping-multi/compose.yml @@ -848,7 +848,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/ping-nginx/compose.yml b/integration/clusters/ping-nginx/compose.yml index 323b07795..8fc9d8b08 100644 --- a/integration/clusters/ping-nginx/compose.yml +++ b/integration/clusters/ping-nginx/compose.yml @@ -922,7 +922,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/ping-single/compose.yml b/integration/clusters/ping-single/compose.yml index aea1756ac..af16ee325 100644 --- a/integration/clusters/ping-single/compose.yml +++ b/integration/clusters/ping-single/compose.yml @@ -666,7 +666,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/clusters/ping-traefik/compose.yml b/integration/clusters/ping-traefik/compose.yml index a7410dcfc..027a8c248 100644 --- a/integration/clusters/ping-traefik/compose.yml +++ b/integration/clusters/ping-traefik/compose.yml @@ -1450,7 +1450,7 @@ services: verify-ready: command: - -wait - - http://verify:80/ + - http://verify:8000/ - -timeout - 10m image: jwilder/dockerize:0.6.1 diff --git a/integration/tpl/backends/verify.libsonnet b/integration/tpl/backends/verify.libsonnet index b446bb5d6..cde6d29d3 100644 --- a/integration/tpl/backends/verify.libsonnet +++ b/integration/tpl/backends/verify.libsonnet @@ -35,7 +35,7 @@ function(mode) { image: 'jwilder/dockerize:0.6.1', command: [ '-wait', - 'http://' + name + ':80/', + 'http://' + name + ':8000/', '-timeout', '10m', ], @@ -49,7 +49,7 @@ function(mode) { { name: 'http', port: 80, targetPort: 'http' }, ]), utils.KubernetesDeployment(name, image, null, [ - { name: 'http', containerPort: 80 }, + { name: 'http', containerPort: 8000 }, ]), ], }