Skip to content

Commit 9690e08

Browse files
Add vcluster images to images list so can be included when relocating bundle.
1 parent 804a148 commit 9690e08

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

carvel-package/config/images.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,7 @@ imageVersions:
3333
image: #@ image_reference("conda-environment")
3434
- name: secrets-manager
3535
image: #@ image_reference("secrets-manager")
36+
- name: rancher-k3s
37+
image: "rancher/k3s:v1.23.3-k3s1"
38+
- name: loftsh-vcluster
39+
image: "loftsh/vcluster:0.7.1"

session-manager/handlers/application_vcluster.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
from .helpers import xget
22

3-
from .operator_config import OPERATOR_API_GROUP, CLUSTER_STORAGE_GROUP
3+
from .operator_config import (
4+
OPERATOR_API_GROUP,
5+
CLUSTER_STORAGE_GROUP,
6+
RANCHER_K3S_IMAGE,
7+
LOFTSH_VCLUSTER_IMAGE,
8+
)
49

510

611
def vcluster_workshop_spec_patches(application_properties):
@@ -338,7 +343,7 @@ def vcluster_session_objects_list(application_properties):
338343
},
339344
"containers": [
340345
{
341-
"image": "rancher/k3s:v1.23.3-k3s1",
346+
"image": RANCHER_K3S_IMAGE,
342347
"name": "vcluster",
343348
"command": ["/bin/sh"],
344349
"args": [
@@ -361,7 +366,7 @@ def vcluster_session_objects_list(application_properties):
361366
},
362367
{
363368
"name": "syncer",
364-
"image": "loftsh/vcluster:0.7.1",
369+
"image": LOFTSH_VCLUSTER_IMAGE,
365370
"args": [
366371
"--name=my-vcluster",
367372
"--target-namespace=$(session_namespace)",

session-manager/handlers/operator_config.py

+3
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ def image_reference(name):
141141
TRAINING_PORTAL_IMAGE = image_reference("training-portal")
142142
DOCKER_IN_DOCKER_IMAGE = image_reference("docker-in-docker")
143143
DOCKER_REGISTRY_IMAGE = image_reference("docker-registry")
144+
144145
BASE_ENVIRONMENT_IMAGE = image_reference("base-environment")
145146
JDK8_ENVIRONMENT_IMAGE = image_reference("jdk8-environment")
146147
JDK11_ENVIRONMENT_IMAGE = image_reference("jdk11-environment")
@@ -153,6 +154,8 @@ def image_reference(name):
153154
"conda-environment:*": CONDA_ENVIRONMENT_IMAGE,
154155
}
155156

157+
RANCHER_K3S_IMAGE = image_reference("rancher-k3s")
158+
LOFTSH_VCLUSTER_IMAGE = image_reference("loftsh-vcluster")
156159

157160
def resolve_workshop_image(name):
158161
if name in workshop_images_table:

0 commit comments

Comments
 (0)