Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: support for private images, always pull on startup #22

Merged
merged 6 commits into from
May 21, 2024
Merged

feat: support for private images, always pull on startup #22

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d14a2c9
fix: "Always" pull images on startup
bodom0015 May 21, 2024
f78d996
feat: allow for imagePullSecrets
bodom0015 May 21, 2024
1dca13a
fix: syntax error when building image_pull_secrets
bodom0015 May 21, 2024
80b749d
fix: include NDSLABS_HOME variable in configmap
bodom0015 May 21, 2024
560d6df
fix: testing adding imagePullSecrets
bodom0015 May 21, 2024
23ef93c
fix: working impl for imagEPullSecrets
bodom0015 May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions pkg/kube.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,7 @@ def create_userapp(username, email, userapp, spec_map):

configmap_data['NDSLABS_STACK'] = userapp_id
configmap_data['NDSLABS_USER'] = username
configmap_data['NDSLABS_HOME'] = f'/home/{username}'
configmap_data['NDSLABS_EMAIL'] = email
configmap_data['NDSLABS_NAMESPACE'] = namespace
configmap_data['NDSLABS_SERVICE'] = stack_service['id']
Expand Down Expand Up @@ -614,7 +615,15 @@ def create_userapp(username, email, userapp, spec_map):

service_account = backend_config['userapps']['service_account_name'] if 'userapps' in backend_config and 'service_account_name' in backend_config['userapps'] else None

# Create one deployment per-stack (start with 0 replicas, aka "Stopped")
secrets = None
logger.info(f'Parsing secrets: {str(app_spec)}')
if 'image' in app_spec and 'secrets' in app_spec['image']:
secrets = []
for secret_name in app_spec['image']['secrets']:
logger.info(f'Adding secret: {secret_name}')
secrets.append({'name': secret_name})

# Create one deployment per-stack (start with 0 replicas, aka "Stopped")
create_deployment(deployment_name=resource_name,
namespace=namespace,
replicas=0,
Expand All @@ -623,6 +632,7 @@ def create_userapp(username, email, userapp, spec_map):
init_containers=init_containers,
labels=svc_labels,
containers=[container],
image_pull_secrets=secrets,
collocate=userapp_id if 'collocate' in app_spec and app_spec['collocate'] else False)

# Create one ingress per-stack
Expand All @@ -649,6 +659,15 @@ def create_userapp(username, email, userapp, spec_map):

if should_run_as_single_pod:
service_account = backend_config['userapps']['service_account_name'] if 'userapps' in backend_config and 'service_account_name' in backend_config['userapps'] else None
app_spec = spec_map.get(userapp_key, None)

secrets = None
logger.info(f'Parsing secrets: {str(app_spec)}')
if 'image' in app_spec and 'secrets' in app_spec['image']:
secrets = []
for secret_name in app_spec['image']['secrets']:
logger.info(f'Adding secret: {secret_name}')
secrets.append({ 'name': secret_name })

# No need to collocate, since all will run in single pod
# Create one deployment per-stack (start with 0 replicas, aka "Stopped")
Expand All @@ -658,6 +677,7 @@ def create_userapp(username, email, userapp, spec_map):
service_account=service_account,
username=get_username(username),
labels=labels,
image_pull_secrets=secrets,
# TODO: how to wait for deps in singlepod mode?
# init_containers=init_containers,
containers=containers)
Expand Down Expand Up @@ -951,7 +971,7 @@ def get_home_storage_class():

# Containers:
# "busybox" -> { name, configmap, image, lifecycle, ports, command }
def create_deployment(deployment_name, containers, labels, username, **kwargs):
def create_deployment(deployment_name, containers, labels, username, image_pull_secrets, **kwargs):
appv1 = client.AppsV1Api()

# TODO: Validation
Expand Down Expand Up @@ -1002,6 +1022,7 @@ def create_deployment(deployment_name, containers, labels, username, **kwargs):

# Build a podspec from given containers and other parameters
podspec = client.V1PodSpec(
image_pull_secrets=image_pull_secrets,
service_account_name=service_account_name,
volumes=shared_volumes,
init_containers=init_containers,
Expand Down Expand Up @@ -1040,6 +1061,7 @@ def create_deployment(deployment_name, containers, labels, username, **kwargs):
# TODO: support container.lifecycle?
lifecycle=container['lifecycle'] if 'lifecycle' in container else None,
image=get_image_string(container['image']),
image_pull_policy='Always',
ports=[
client.V1ContainerPort(
name='%s%s' % (port['protocol'] if 'protocol' in port else 'tcp', str(port['port'])),
Expand Down
Loading