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.

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

CASMTRIAGE-7252: Increase DEFAULT_IMS_IMAGE_SIZE from 30 to 60 #143

Merged
merged 1 commit into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed
- CASMTRIAGE-7252: Increase DEFAULT_IMS_IMAGE_SIZE from 30 to 60.

## [3.17.2] - 2024-09-13
### Added
- CASMTRIAGE-6953: Added comment to `src/server/app.py` noting dependency of IMS import tool in `docs-csm`
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/cray-ims/templates/configmap.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{/*
MIT License

(C) Copyright 2021-2023 Hewlett Packard Enterprise Development LP
(C) Copyright 2021-2024 Hewlett Packard Enterprise Development LP

Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
Expand Down Expand Up @@ -31,7 +31,7 @@ metadata:
data:
API_GATEWAY_HOSTNAME: "{{ .Values.api_gw.api_gw_service_name }}.{{ .Values.api_gw.api_gw_service_namespace }}.svc.cluster.local"
CA_CERT: "/mnt/ca-vol/certificate_authority.crt"
DEFAULT_IMS_IMAGE_SIZE: "30"
DEFAULT_IMS_IMAGE_SIZE: "60"
DEFAULT_IMS_JOB_NAMESPACE: "{{ .Values.ims_config.cray_ims_job_namespace }}"
DEFAULT_IMS_JOB_MEM_SIZE: "8"

Expand Down
9 changes: 4 additions & 5 deletions src/server/models/jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,9 @@
ARCH_X86_64: KERNEL_FILE_NAME_X86
})


DEFAULT_INITRD_FILE_NAME = 'initrd'
DEFAULT_IMAGE_SIZE = os.environ.get("DEFAULT_IMS_IMAGE_SIZE", 15)
DEFAULT_JOB_MEM_SIZE = os.environ.get("DEFAULT_IMS_JOB_MEM_SIZE", 1)
DEFAULT_IMAGE_SIZE = os.environ.get("DEFAULT_IMS_IMAGE_SIZE", "60")
DEFAULT_JOB_MEM_SIZE = os.environ.get("DEFAULT_IMS_JOB_MEM_SIZE", "8")
DEFAULT_KERNEL_PARAMETERS_FILE_NAME = 'kernel-parameters'

# pylint: disable=R0902
Expand Down Expand Up @@ -146,7 +145,7 @@ class V2JobRecordInputSchema(Schema):
validate=Length(min=1, error="image_root_archive_name field must not be blank"))
enable_debug = fields.Boolean(load_default=False,dump_default=False,
metadata={"metadata": {"description": "Whether to enable debugging of the job"}})
build_env_size = fields.Integer(load_default=15,dump_default=15,
build_env_size = fields.Integer(load_default=60,dump_default=60,
metadata={"metadata": {"description": "Approximate disk size in GiB to reserve for the image build environment (usually 2x final image size)"}},
validate=Range(min=1, error="build_env_size must be greater than or equal to 1"))
kernel_file_name = fields.Str(metadata={"metadata": {"description": "Name of the kernel file to extract and upload"}})
Expand All @@ -167,7 +166,7 @@ class V2JobRecordInputSchema(Schema):
metadata={"metadata": {"description": "Job requires the use of dkms"}})

# v2.2
job_mem_size = fields.Integer(dump_default=1, required=False,
job_mem_size = fields.Integer(dump_default=8, required=False,
validate=Range(min=1, error="build_env_size must be greater than or equal to 1"),
metadata={"metadata": {"description": "Approximate working memory in GiB to reserve for the build job "
"environment (loosely proportional to the final image size)"}})
Expand Down
Loading