mirror of
https://github.com/pomerium/pomerium.git
synced 2025-06-01 02:12:50 +02:00
integration: use specific version of k3s (#3475)
This commit is contained in:
parent
2dd12ce9c3
commit
302299d202
10 changed files with 32 additions and 30 deletions
|
@ -22,7 +22,7 @@ services:
|
|||
environment:
|
||||
K3S_TOKEN: TOKEN
|
||||
K3S_URL: https://k3s-server:6443
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
@ -999,7 +999,7 @@ services:
|
|||
END_OF_MANIFEST
|
||||
kubectl apply -f /tmp/manifest.json
|
||||
sleep 30
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
@ -1052,7 +1052,7 @@ services:
|
|||
- CMD
|
||||
- kubectl
|
||||
- cluster-info
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
|
|
@ -22,7 +22,7 @@ services:
|
|||
environment:
|
||||
K3S_TOKEN: TOKEN
|
||||
K3S_URL: https://k3s-server:6443
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
@ -999,7 +999,7 @@ services:
|
|||
END_OF_MANIFEST
|
||||
kubectl apply -f /tmp/manifest.json
|
||||
sleep 30
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
@ -1052,7 +1052,7 @@ services:
|
|||
- CMD
|
||||
- kubectl
|
||||
- cluster-info
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
|
|
@ -22,7 +22,7 @@ services:
|
|||
environment:
|
||||
K3S_TOKEN: TOKEN
|
||||
K3S_URL: https://k3s-server:6443
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
@ -999,7 +999,7 @@ services:
|
|||
END_OF_MANIFEST
|
||||
kubectl apply -f /tmp/manifest.json
|
||||
sleep 30
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
@ -1052,7 +1052,7 @@ services:
|
|||
- CMD
|
||||
- kubectl
|
||||
- cluster-info
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
|
|
@ -22,7 +22,7 @@ services:
|
|||
environment:
|
||||
K3S_TOKEN: TOKEN
|
||||
K3S_URL: https://k3s-server:6443
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
@ -999,7 +999,7 @@ services:
|
|||
END_OF_MANIFEST
|
||||
kubectl apply -f /tmp/manifest.json
|
||||
sleep 30
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
@ -1052,7 +1052,7 @@ services:
|
|||
- CMD
|
||||
- kubectl
|
||||
- cluster-info
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
|
|
@ -22,7 +22,7 @@ services:
|
|||
environment:
|
||||
K3S_TOKEN: TOKEN
|
||||
K3S_URL: https://k3s-server:6443
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
@ -999,7 +999,7 @@ services:
|
|||
END_OF_MANIFEST
|
||||
kubectl apply -f /tmp/manifest.json
|
||||
sleep 30
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
@ -1052,7 +1052,7 @@ services:
|
|||
- CMD
|
||||
- kubectl
|
||||
- cluster-info
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
|
|
@ -22,7 +22,7 @@ services:
|
|||
environment:
|
||||
K3S_TOKEN: TOKEN
|
||||
K3S_URL: https://k3s-server:6443
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
@ -999,7 +999,7 @@ services:
|
|||
END_OF_MANIFEST
|
||||
kubectl apply -f /tmp/manifest.json
|
||||
sleep 30
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
@ -1052,7 +1052,7 @@ services:
|
|||
- CMD
|
||||
- kubectl
|
||||
- cluster-info
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
|
|
@ -22,7 +22,7 @@ services:
|
|||
environment:
|
||||
K3S_TOKEN: TOKEN
|
||||
K3S_URL: https://k3s-server:6443
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
@ -999,7 +999,7 @@ services:
|
|||
END_OF_MANIFEST
|
||||
kubectl apply -f /tmp/manifest.json
|
||||
sleep 30
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
@ -1052,7 +1052,7 @@ services:
|
|||
- CMD
|
||||
- kubectl
|
||||
- cluster-info
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
|
|
@ -22,7 +22,7 @@ services:
|
|||
environment:
|
||||
K3S_TOKEN: TOKEN
|
||||
K3S_URL: https://k3s-server:6443
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
@ -999,7 +999,7 @@ services:
|
|||
END_OF_MANIFEST
|
||||
kubectl apply -f /tmp/manifest.json
|
||||
sleep 30
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
@ -1052,7 +1052,7 @@ services:
|
|||
- CMD
|
||||
- kubectl
|
||||
- cluster-info
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
|
|
@ -22,7 +22,7 @@ services:
|
|||
environment:
|
||||
K3S_TOKEN: TOKEN
|
||||
K3S_URL: https://k3s-server:6443
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
@ -999,7 +999,7 @@ services:
|
|||
END_OF_MANIFEST
|
||||
kubectl apply -f /tmp/manifest.json
|
||||
sleep 30
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
@ -1052,7 +1052,7 @@ services:
|
|||
- CMD
|
||||
- kubectl
|
||||
- cluster-info
|
||||
image: rancher/k3s:${K3S_TAG:-latest}
|
||||
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
|
||||
networks:
|
||||
main:
|
||||
aliases:
|
||||
|
|
|
@ -30,11 +30,13 @@ local InstallManifest(manifest) =
|
|||
'kubectl wait --for=condition=available deployment/' + manifest.metadata.name,
|
||||
] else []);
|
||||
|
||||
local k3s_tag = 'v1.21.14-k3s1';
|
||||
|
||||
function(idp, manifests) {
|
||||
compose: {
|
||||
services:
|
||||
utils.ComposeService('k3s-server', {
|
||||
image: 'rancher/k3s:${K3S_TAG:-latest}',
|
||||
image: 'rancher/k3s:${K3S_TAG:-' + k3s_tag + '}',
|
||||
entrypoint: Command() + [
|
||||
'server',
|
||||
'--disable',
|
||||
|
@ -73,7 +75,7 @@ function(idp, manifests) {
|
|||
],
|
||||
}) +
|
||||
utils.ComposeService('k3s-agent', {
|
||||
image: 'rancher/k3s:${K3S_TAG:-latest}',
|
||||
image: 'rancher/k3s:${K3S_TAG:-' + k3s_tag + '}',
|
||||
entrypoint: Command() + ['agent'],
|
||||
tmpfs: ['/run', '/var/run'],
|
||||
ulimits: {
|
||||
|
@ -94,7 +96,7 @@ function(idp, manifests) {
|
|||
],
|
||||
}) +
|
||||
utils.ComposeService('k3s-init', {
|
||||
image: 'rancher/k3s:${K3S_TAG:-latest}',
|
||||
image: 'rancher/k3s:${K3S_TAG:-' + k3s_tag + '}',
|
||||
depends_on: {
|
||||
'k3s-server': {
|
||||
condition: 'service_healthy',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue