Merge branch 'release/v9.9.1-6'

CHANGELOG.md

@@ -7,9 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v9.9.1-6] - 2023-06-27
+### Added
+- [#92] Configuration options for resource requirements
+- [#92] Defaults for CPU and memory requests
+
 ## [v9.9.1-5] - 2023-06-12
 ### Fixed
-- Fixed elasticearch bootstrap error where `vm.max_map_count` is too low.
+- Fixed elasticsearch bootstrap error where `vm.max_map_count` is too low (#90)
   - Set `node.store.allow_mmap` to `false` and restrict the usage of `mmap` in k8s environments to avoid elasticsearch bootstrap error. This option is used to avoid usage of privileged containers.
 
 ## [v9.9.1-4] - 2023-06-05

Dockerfile

@@ -27,7 +27,7 @@ RUN echo "${CAS_PLUGIN_JAR_SHA256} *${BUILDER_HOME}/sonar-cas-plugin-${CAS_PLUGI
 FROM base
 
 LABEL NAME="official/sonar" \
-    VERSION="9.9.1-5" \
+    VERSION="9.9.1-6" \
     maintainer="hello@cloudogu.com"
 
 RUN set -eux \

Makefile

@@ -1,4 +1,4 @@
-MAKEFILES_VERSION=7.5.0
+MAKEFILES_VERSION=7.6.0
 .DEFAULT_GOAL:=dogu-release
 
 WORKSPACE=/workspace

build/make/version-sha.mk

@@ -0,0 +1,18 @@
+##@ Version
+
+# This makefile is used to get the sha256sum of a specific github tag-src.tar.gz or .zip.
+# You may set any of the following variables before your make call to change the hash url.
+
+SHA_SUM_ORGANISATION?="cloudogu"
+SHA_SUM_REPOSITORY?="ecosystem"
+SHA_SUM_FILE_TYPE?="tar.gz"
+SHA_SUM_VERSION?="v20.04.4-2"
+SHA_SUM_URL?="https://github.com/${SHA_SUM_ORGANISATION}/${SHA_SUM_REPOSITORY}/archive/refs/tags/${SHA_SUM_VERSION}.${SHA_SUM_FILE_TYPE}"
+
+.PHONY: sha-sum
+sha-sum: ## Print out the version
+	@echo "Downloading from: ${SHA_SUM_URL}"
+	@wget -O - -o /dev/null "${SHA_SUM_URL}" > .download.for.hash \
+     || (echo "Could not be downloaded" && exit 1) \
+     && cat .download.for.hash | sha256sum
+	@rm -f .download.for.hash

dogu.json

@@ -1,6 +1,6 @@
 {
   "Name": "official/sonar",
-  "Version": "9.9.1-5",
+  "Version": "9.9.1-6",
   "DisplayName": "SonarQube",
   "Description": "SonarQube is an open source quality management platform, dedicated to continuously analyze and measure source code quality",
   "Category": "Development Apps",
@@ -151,6 +151,58 @@
           "TRACE"
         ]
       }
+    },
+    {
+      "Name": "container_config/memory_limit",
+      "Description": "Limits the container's memory usage. Use a positive integer value followed by one of these units [b,k,m,g] (byte, kibibyte, mebibyte, gibibyte).",
+      "Optional": true,
+      "Validation": {
+        "Type": "BINARY_MEASUREMENT"
+      }
+    },
+    {
+      "Name": "container_config/memory_request",
+      "Description": "Requests the container's minimal memory requirement. Use a positive integer value followed by one of these units [b,k,m,g] (byte, kibibyte, mebibyte, gibibyte).",
+      "Optional": true,
+      "Validation": {
+        "Type": "BINARY_MEASUREMENT"
+      },
+      "Default": "1300m"
+    },
+    {
+      "Name": "container_config/swap_limit",
+      "Description": "Limits the container's swap memory usage. Use zero or a positive integer value followed by one of these units [b,k,m,g] (byte, kibibyte, mebibyte, gibibyte). 0 will disable swapping.",
+      "Optional": true,
+      "Validation": {
+        "Type": "BINARY_MEASUREMENT"
+      }
+    },
+    {
+      "Name": "container_config/cpu_core_limit",
+      "Description": "Limits the container's CPU core usage. Use a positive floating value describing a fraction of 1 CPU core. When you define a value of '0.5', you are requesting half as much CPU time compared to if you asked for '1.0' CPU.",
+      "Optional": true
+    },
+    {
+      "Name": "container_config/cpu_core_request",
+      "Description": "Requests the container's minimal CPU core requirement. Use a positive floating value describing a fraction of 1 CPU core. When you define a value of '0.5', you are requesting half as much CPU time compared to if you asked for '1.0' CPU.",
+      "Optional": true,
+      "Default": "1.0"
+    },
+    {
+      "Name": "container_config/storage_limit",
+      "Description": "Limits the container's ephemeral storage usage. Use a positive integer value followed by one of these units [b,k,m,g] (byte, kibibyte, mebibyte, gibibyte).",
+      "Optional": true,
+      "Validation": {
+        "Type": "BINARY_MEASUREMENT"
+      }
+    },
+    {
+      "Name": "container_config/storage_request",
+      "Description": "Requests the container's minimal ephemeral storage requirement. Use a positive integer value followed by one of these units [b,k,m,g] (byte, kibibyte, mebibyte, gibibyte).",
+      "Optional": true,
+      "Validation": {
+        "Type": "BINARY_MEASUREMENT"
+      }
     }
   ],
   "HealthChecks": [