3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-06-11 15:22:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

integration: use specific version of k3s (#3475)

Browse source
This commit is contained in:
Caleb Doxsey 2022-07-12 13:37:59 -06:00 • committed by GitHub
parent 2dd12ce9c3
commit 302299d202
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
integration/clusters/auth0-kubernetes/compose.yml
View file

@ -22,7 +22,7 @@ services:
environment: environment:
K3S_TOKEN: TOKEN K3S_TOKEN: TOKEN
K3S_URL: https://k3s-server:6443 K3S_URL: https://k3s-server:6443
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:
@ -999,7 +999,7 @@ services:
END_OF_MANIFEST END_OF_MANIFEST
kubectl apply -f /tmp/manifest.json kubectl apply -f /tmp/manifest.json
sleep 30 sleep 30
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:
@ -1052,7 +1052,7 @@ services:
- CMD - CMD
- kubectl - kubectl
- cluster-info - cluster-info
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:

6
integration/clusters/azure-kubernetes/compose.yml
View file

@ -22,7 +22,7 @@ services:
environment: environment:
K3S_TOKEN: TOKEN K3S_TOKEN: TOKEN
K3S_URL: https://k3s-server:6443 K3S_URL: https://k3s-server:6443
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:
@ -999,7 +999,7 @@ services:
END_OF_MANIFEST END_OF_MANIFEST
kubectl apply -f /tmp/manifest.json kubectl apply -f /tmp/manifest.json
sleep 30 sleep 30
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:
@ -1052,7 +1052,7 @@ services:
- CMD - CMD
- kubectl - kubectl
- cluster-info - cluster-info
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:

6
integration/clusters/github-kubernetes/compose.yml
View file

@ -22,7 +22,7 @@ services:
environment: environment:
K3S_TOKEN: TOKEN K3S_TOKEN: TOKEN
K3S_URL: https://k3s-server:6443 K3S_URL: https://k3s-server:6443
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:
@ -999,7 +999,7 @@ services:
END_OF_MANIFEST END_OF_MANIFEST
kubectl apply -f /tmp/manifest.json kubectl apply -f /tmp/manifest.json
sleep 30 sleep 30
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:
@ -1052,7 +1052,7 @@ services:
- CMD - CMD
- kubectl - kubectl
- cluster-info - cluster-info
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:

6
integration/clusters/gitlab-kubernetes/compose.yml
View file

@ -22,7 +22,7 @@ services:
environment: environment:
K3S_TOKEN: TOKEN K3S_TOKEN: TOKEN
K3S_URL: https://k3s-server:6443 K3S_URL: https://k3s-server:6443
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:
@ -999,7 +999,7 @@ services:
END_OF_MANIFEST END_OF_MANIFEST
kubectl apply -f /tmp/manifest.json kubectl apply -f /tmp/manifest.json
sleep 30 sleep 30
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:
@ -1052,7 +1052,7 @@ services:
- CMD - CMD
- kubectl - kubectl
- cluster-info - cluster-info
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:

6
integration/clusters/google-kubernetes/compose.yml
View file

@ -22,7 +22,7 @@ services:
environment: environment:
K3S_TOKEN: TOKEN K3S_TOKEN: TOKEN
K3S_URL: https://k3s-server:6443 K3S_URL: https://k3s-server:6443
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:
@ -999,7 +999,7 @@ services:
END_OF_MANIFEST END_OF_MANIFEST
kubectl apply -f /tmp/manifest.json kubectl apply -f /tmp/manifest.json
sleep 30 sleep 30
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:
@ -1052,7 +1052,7 @@ services:
- CMD - CMD
- kubectl - kubectl
- cluster-info - cluster-info
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:

6
integration/clusters/oidc-kubernetes/compose.yml
View file

@ -22,7 +22,7 @@ services:
environment: environment:
K3S_TOKEN: TOKEN K3S_TOKEN: TOKEN
K3S_URL: https://k3s-server:6443 K3S_URL: https://k3s-server:6443
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:
@ -999,7 +999,7 @@ services:
END_OF_MANIFEST END_OF_MANIFEST
kubectl apply -f /tmp/manifest.json kubectl apply -f /tmp/manifest.json
sleep 30 sleep 30
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:
@ -1052,7 +1052,7 @@ services:
- CMD - CMD
- kubectl - kubectl
- cluster-info - cluster-info
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:

6
integration/clusters/okta-kubernetes/compose.yml
View file

@ -22,7 +22,7 @@ services:
environment: environment:
K3S_TOKEN: TOKEN K3S_TOKEN: TOKEN
K3S_URL: https://k3s-server:6443 K3S_URL: https://k3s-server:6443
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:
@ -999,7 +999,7 @@ services:
END_OF_MANIFEST END_OF_MANIFEST
kubectl apply -f /tmp/manifest.json kubectl apply -f /tmp/manifest.json
sleep 30 sleep 30
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:
@ -1052,7 +1052,7 @@ services:
- CMD - CMD
- kubectl - kubectl
- cluster-info - cluster-info
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:

6
integration/clusters/onelogin-kubernetes/compose.yml
View file

@ -22,7 +22,7 @@ services:
environment: environment:
K3S_TOKEN: TOKEN K3S_TOKEN: TOKEN
K3S_URL: https://k3s-server:6443 K3S_URL: https://k3s-server:6443
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:
@ -999,7 +999,7 @@ services:
END_OF_MANIFEST END_OF_MANIFEST
kubectl apply -f /tmp/manifest.json kubectl apply -f /tmp/manifest.json
sleep 30 sleep 30
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:
@ -1052,7 +1052,7 @@ services:
- CMD - CMD
- kubectl - kubectl
- cluster-info - cluster-info
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:

6
integration/clusters/ping-kubernetes/compose.yml
View file

@ -22,7 +22,7 @@ services:
environment: environment:
K3S_TOKEN: TOKEN K3S_TOKEN: TOKEN
K3S_URL: https://k3s-server:6443 K3S_URL: https://k3s-server:6443
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:
@ -999,7 +999,7 @@ services:
END_OF_MANIFEST END_OF_MANIFEST
kubectl apply -f /tmp/manifest.json kubectl apply -f /tmp/manifest.json
sleep 30 sleep 30
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:
@ -1052,7 +1052,7 @@ services:
- CMD - CMD
- kubectl - kubectl
- cluster-info - cluster-info
image: rancher/k3s:${K3S_TAG:-latest} image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
networks: networks:
main: main:
aliases: aliases:

8
integration/tpl/backends/k3s.libsonnet
View file

@ -30,11 +30,13 @@ local InstallManifest(manifest) =
'kubectl wait --for=condition=available deployment/' + manifest.metadata.name, 'kubectl wait --for=condition=available deployment/' + manifest.metadata.name,
] else []); ] else []);
local k3s_tag = 'v1.21.14-k3s1';
function(idp, manifests) { function(idp, manifests) {
compose: { compose: {
services: services:
utils.ComposeService('k3s-server', { utils.ComposeService('k3s-server', {
image: 'rancher/k3s:${K3S_TAG:-latest}', image: 'rancher/k3s:${K3S_TAG:-' + k3s_tag + '}',
entrypoint: Command() + [ entrypoint: Command() + [
'server', 'server',
'--disable', '--disable',
@ -73,7 +75,7 @@ function(idp, manifests) {
], ],
}) + }) +
utils.ComposeService('k3s-agent', { utils.ComposeService('k3s-agent', {
image: 'rancher/k3s:${K3S_TAG:-latest}', image: 'rancher/k3s:${K3S_TAG:-' + k3s_tag + '}',
entrypoint: Command() + ['agent'], entrypoint: Command() + ['agent'],
tmpfs: ['/run', '/var/run'], tmpfs: ['/run', '/var/run'],
ulimits: { ulimits: {
@ -94,7 +96,7 @@ function(idp, manifests) {
], ],
}) + }) +
utils.ComposeService('k3s-init', { utils.ComposeService('k3s-init', {
image: 'rancher/k3s:${K3S_TAG:-latest}', image: 'rancher/k3s:${K3S_TAG:-' + k3s_tag + '}',
depends_on: { depends_on: {
'k3s-server': { 'k3s-server': {
condition: 'service_healthy', condition: 'service_healthy',