Merge pull request #103 from Cray-HPE/CASMTRIAGE-6368

CASMTRIAGE-6368/6292 - include ims-sshd fix for sftp, increase default mem requirements/limits.
Cray-HPE · Nov 30, 2023 · 2a7229d · 2a7229d
2 parents 1115adf + 2c7c849
commit 2a7229d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.11.0] - 2023-10-05
+### Changed
+- CASMTRIAGE-6368 - include ims-sshd fix for sftp access to customize jobs.
+- CASMTRIAGE-6292 - increase default mem request/limits yet again.
+
 ## [3.10.1] - 2023-10-05
 ### Changed
 - CASMCMS-8828 - increase the default mem requests and limits on jobs.

diff --git a/kubernetes/cray-ims/templates/configmap.yaml b/kubernetes/cray-ims/templates/configmap.yaml
@@ -33,7 +33,7 @@ data:
  CA_CERT: "/mnt/ca-vol/certificate_authority.crt"
  DEFAULT_IMS_IMAGE_SIZE: "15"
  DEFAULT_IMS_JOB_NAMESPACE: "{{ .Values.ims_config.cray_ims_job_namespace }}"
- DEFAULT_IMS_JOB_MEM_SIZE: "5"
+ DEFAULT_IMS_JOB_MEM_SIZE: "8"
 
  JOB_CUSTOMER_ACCESS_NETWORK_DOMAIN: "{{ .Values.customer_access.shasta_domain }}"
  JOB_CUSTOMER_ACCESS_SUBNET_NAME: "{{ .Values.customer_access.subnet_name }}"

diff --git a/src/server/v2/resources/jobs.py b/src/server/v2/resources/jobs.py
@@ -699,7 +699,7 @@ def post(self):
  "limit_gb": str(int(new_job.build_env_size) * 3) + "Gi",
  "pvc_gb": str(int(new_job.build_env_size) * 5) + "Gi",
  "job_mem_size": str(new_job.job_mem_size) + "Gi",
- "job_mem_limit": str(int(new_job.job_mem_size) * 3) + "Gi",
+ "job_mem_limit": str(int(new_job.job_mem_size) * 5) + "Gi",
  "download_url": artifact_info["url"], # pylint: disable=unsubscriptable-object
  "download_md5sum": artifact_info["md5sum"], # pylint: disable=unsubscriptable-object
  "public_key": public_key_data,

diff --git a/src/server/v3/resources/jobs.py b/src/server/v3/resources/jobs.py
@@ -705,7 +705,7 @@ def post(self):
  "limit_gb": str(int(new_job.build_env_size) * 3) + "Gi",
  "pvc_gb": str(int(new_job.build_env_size) * 5) + "Gi",
  "job_mem_size": str(new_job.job_mem_size) + "Gi",
- "job_mem_limit": str(int(new_job.job_mem_size) * 3) + "Gi",
+ "job_mem_limit": str(int(new_job.job_mem_size) * 5) + "Gi",
  "download_url": artifact_info["url"], # pylint: disable=unsubscriptable-object
  "download_md5sum": artifact_info["md5sum"], # pylint: disable=unsubscriptable-object
  "public_key": public_key_data,

diff --git a/update_external_versions.conf b/update_external_versions.conf
@@ -8,4 +8,4 @@ image: cray-ims-kiwi-ng-opensuse-x86_64-builder
 
 image: cray-ims-sshd
  major: 1
- minor: 8
+ minor: 9