Skip to content
Snippets Groups Projects
Commit f46acbec authored by Sébastien Heurtematte's avatar Sébastien Heurtematte :speech_balloon:
Browse files

fix: volume-claim declaration

parent 232fcc46
No related branches found
No related tags found
No related merge requests found
Pipeline #7306 failed
Showing
with 313 additions and 946 deletions
......@@ -25,7 +25,7 @@ genconfig-all:
k8s : clean genconfig
./scripts/gen-k8s.sh ${INSTANCES_DIR}/$(instance)
k8s-all : clean genconfig-all
k8s-all : clean-all genconfig-all
./scripts/all.sh gen-k8s instances
deploy :
......
......@@ -4,6 +4,7 @@
Activate and configure this Persistence volume in `instances/my_project/okd-cx/config.jsonnet`
```json
nfsPersistentVolume+:{
active:true,
},
......@@ -12,18 +13,21 @@ nfsPersistentVolume+:{
Allow configuration for each runner : `config.toml` configuration
```json
runner+:{
kubernetes+:{
volumes+:{
pvc: [
{
name: $.project.prefix + '-' + $.project.shortName + '-nfs-persistent-volume-claim',
mount_path: '/var/shared'
},
],
local Kube = import '../../../templates/k8s/kube.libsonnet';
{
runner+:{
kubernetes+:{
volumes+:{
pvc: [
{
name: $.project.kubeNamespaceName + '-' + Kube.namingNfsPersistentVolumeClaim,
mount_path: '/var/shared'
},
],
},
},
},
},
}
```
Result in `config.toml`:
......
local Kube = import '../../../templates/k8s/kube.libsonnet';
{
project+: {
fullName: "eclipse.oniro-core",
......@@ -10,7 +11,7 @@
volumes+:{
pvc: [
{
name: $.project.kubeNamespaceName + '-nfs-persistent-volume-claim',
name: $.project.kubeNamespaceName + '-' + Kube.namingNfsPersistentVolumeClaim,
mount_path: '/var/shared'
},
],
......
......@@ -26,6 +26,38 @@
},
"registry": "registry.gitlab.com",
"repository": "gitlab-org/ci-cd/gitlab-runner-ubi-images",
"resources": {
"build": {
"cpuLimit": "8000m",
"cpuRequest": "1000m",
"memoryLimit": "16384Mi",
"memoryRequest": "2048Mi",
"storageLimit": "200Mi",
"storageRequest": "100Mi"
},
"helper": {
"cpuLimit": "300m",
"cpuRequest": "100m",
"memoryLimit": "512Mi",
"memoryRequest": "512Mi",
"storageLimit": "100Mi",
"storageRequest": "100Mi"
},
"runner": {
"cpuLimit": "300m",
"cpuRequest": "100m",
"memoryLimit": "256Mi",
"memoryRequest": "128Mi"
},
"service": {
"cpuLimit": "8000m",
"cpuRequest": "500m",
"memoryLimit": "16384Mi",
"memoryRequest": "1024Mi",
"storageLimit": "200Mi",
"storageRequest": "100Mi"
}
},
"runner": {
"env": {
"annotations": {
......@@ -130,9 +162,9 @@
"helperContainerSecurityContextRunAsGroup": "",
"helperContainerSecurityContextRunAsNonRoot": "",
"helperContainerSecurityContextRunAsUser": "",
"helperCpuLimit": "1500m",
"helperCpuLimit": "300m",
"helperCpuLimitOverwriteMaxAllowed": "",
"helperCpuRequest": "1000m",
"helperCpuRequest": "100m",
"helperCpuRequestOverwriteMaxAllowed": "",
"helperEphemeralStorageLimit": "100Mi",
"helperEphemeralStorageLimitOverwriteMaxAllowed": "",
......@@ -151,7 +183,7 @@
"keyFile": "",
"memoryLimit": "16384Mi",
"memoryLimitOverwriteMaxAllowed": "",
"memoryRequest": "1024Mi",
"memoryRequest": "2048Mi",
"memoryRequestOverwriteMaxAllowed": "",
"namespace": "ef-grac-eclipse-oniro-core",
"namespaceOverwriteAllowed": "",
......@@ -222,7 +254,7 @@
"executor": "kubernetes",
"gracDefaultTagList": "ef-grac,cluster:okd-c2,packType:groups,name:eclipse.oniro-core,namespace:ef-grac-eclipse-oniro-core,executor:kubernetes",
"gracExtraTagList": "",
"gracMoreInfoTagList": "concurrent:10,outputLimit:100000,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:1024Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi",
"gracMoreInfoTagList": "concurrent:10,outputLimit:100000,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:2048Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi",
"leaveRunner": "",
"limit": "",
"name": "ef-grac-groups-eclipse.oniro-core-runner",
......@@ -233,7 +265,7 @@
"preCloneScript": "",
"requestConcurrency": "",
"shell": "",
"tagList": "ef-grac,cluster:okd-c2,packType:groups,name:eclipse.oniro-core,namespace:ef-grac-eclipse-oniro-core,executor:kubernetes,concurrent:10,outputLimit:100000,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:1024Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi,"
"tagList": "ef-grac,cluster:okd-c2,packType:groups,name:eclipse.oniro-core,namespace:ef-grac-eclipse-oniro-core,executor:kubernetes,concurrent:10,outputLimit:100000,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:2048Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi,"
}
},
"global": {
......@@ -246,7 +278,7 @@
"pvc": [
{
"mount_path": "/var/shared",
"name": "ef-grac-eclipse-oniro-core-nfs-persistent-volume-claim"
"name": "ef-grac-eclipse-oniro-core-nfs-pvc"
}
]
}
......@@ -285,6 +317,38 @@
},
"registry": "registry.gitlab.com",
"repository": "gitlab-org/ci-cd/gitlab-runner-ubi-images",
"resources": {
"build": {
"cpuLimit": "8000m",
"cpuRequest": "1000m",
"memoryLimit": "16384Mi",
"memoryRequest": "2048Mi",
"storageLimit": "200Mi",
"storageRequest": "100Mi"
},
"helper": {
"cpuLimit": "300m",
"cpuRequest": "100m",
"memoryLimit": "512Mi",
"memoryRequest": "512Mi",
"storageLimit": "100Mi",
"storageRequest": "100Mi"
},
"runner": {
"cpuLimit": "300m",
"cpuRequest": "100m",
"memoryLimit": "256Mi",
"memoryRequest": "128Mi"
},
"service": {
"cpuLimit": "8000m",
"cpuRequest": "500m",
"memoryLimit": "16384Mi",
"memoryRequest": "1024Mi",
"storageLimit": "200Mi",
"storageRequest": "100Mi"
}
},
"runner": {
"env": {
"annotations": {
......@@ -389,9 +453,9 @@
"helperContainerSecurityContextRunAsGroup": "",
"helperContainerSecurityContextRunAsNonRoot": "",
"helperContainerSecurityContextRunAsUser": "",
"helperCpuLimit": "1500m",
"helperCpuLimit": "300m",
"helperCpuLimitOverwriteMaxAllowed": "",
"helperCpuRequest": "1000m",
"helperCpuRequest": "100m",
"helperCpuRequestOverwriteMaxAllowed": "",
"helperEphemeralStorageLimit": "100Mi",
"helperEphemeralStorageLimitOverwriteMaxAllowed": "",
......@@ -410,7 +474,7 @@
"keyFile": "",
"memoryLimit": "16384Mi",
"memoryLimitOverwriteMaxAllowed": "",
"memoryRequest": "1024Mi",
"memoryRequest": "2048Mi",
"memoryRequestOverwriteMaxAllowed": "",
"namespace": "ef-grac-eclipse-oniro-core",
"namespaceOverwriteAllowed": "",
......@@ -481,7 +545,7 @@
"executor": "kubernetes",
"gracDefaultTagList": "ef-grac,origin:eclipse,cluster:okd-c2,packType:groups,name:eclipse.oniro-core,namespace:ef-grac-eclipse-oniro-core,ctx:default,executor:kubernetes",
"gracExtraTagList": "",
"gracMoreInfoTagList": "concurrent:10,outputLimit:100000,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:1024Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi",
"gracMoreInfoTagList": "concurrent:10,outputLimit:100000,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:2048Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi",
"leaveRunner": "",
"limit": "",
"name": "ef-grac-groups-eclipse.oniro-core-runner",
......@@ -492,7 +556,7 @@
"preCloneScript": "",
"requestConcurrency": "",
"shell": "",
"tagList": "ef-grac,origin:eclipse,cluster:okd-c2,packType:groups,name:eclipse.oniro-core,namespace:ef-grac-eclipse-oniro-core,ctx:default,executor:kubernetes,concurrent:10,outputLimit:100000,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:1024Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi,"
"tagList": "ef-grac,origin:eclipse,cluster:okd-c2,packType:groups,name:eclipse.oniro-core,namespace:ef-grac-eclipse-oniro-core,ctx:default,executor:kubernetes,concurrent:10,outputLimit:100000,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:2048Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi,"
}
},
"global": {
......@@ -505,7 +569,7 @@
"pvc": [
{
"mount_path": "/var/shared",
"name": "ef-grac-eclipse-oniro-core-nfs-persistent-volume-claim"
"name": "ef-grac-eclipse-oniro-core-nfs-pvc"
}
]
}
......@@ -549,42 +613,13 @@
],
"fullName": "eclipse.oniro-core",
"kubeNamespaceName": "ef-grac-eclipse-oniro-core",
"limitRange": true,
"namespaceName": "eclipse.oniro-core",
"origin": "eclipse",
"prefix": "ef-grac",
"resourcePacks": 1,
"resourcesQuotas": true,
"serviceMetrics": true,
"shortName": "oniro-core"
},
"resources": {
"build": {
"cpuLimit": "8000m",
"cpuRequest": "1000m",
"memoryLimit": "16384Mi",
"memoryRequest": "1024Mi",
"storageLimit": "200Mi",
"storageRequest": "100Mi"
},
"helper": {
"cpuLimit": "1500m",
"cpuRequest": "1000m",
"memoryLimit": "512Mi",
"memoryRequest": "512Mi",
"storageLimit": "100Mi",
"storageRequest": "100Mi"
},
"runner": {
"cpuLimit": "300m",
"cpuRequest": "100m",
"memoryLimit": "256Mi",
"memoryRequest": "128Mi"
},
"service": {
"cpuLimit": "8000m",
"cpuRequest": "500m",
"memoryLimit": "16384Mi",
"memoryRequest": "1024Mi",
"storageLimit": "200Mi",
"storageRequest": "100Mi"
}
}
}
......@@ -70,7 +70,7 @@ data:
[[runners]]
[runners.kubernetes]
[[runners.kubernetes.volumes.pvc]]
name = "ef-grac-eclipse-oniro-core-nfs-persistent-volume-claim"
name = "ef-grac-eclipse-oniro-core-nfs-pvc"
mount_path = "/var/shared"
......
#*******************************************************************************
# Copyright (c) 2022 Eclipse Foundation and others.
# This program and the accompanying materials are made available
# under the terms of the Eclipse Public License 2.0
# which is available at http://www.eclipse.org/legal/epl-v20.html,
# or the MIT License which is available at https://opensource.org/licenses/MIT.
# SPDX-License-Identifier: EPL-2.0 OR MIT
#*******************************************************************************
apiVersion: v1
kind: ConfigMap
metadata:
annotations:
org.eclipse.cbi.ef-grac/project.fullname: 'eclipse.oniro-core'
org.eclipse.cbi.ef-grac/project.shortname: 'oniro-core'
org.eclipse.cbi.ef-grac/project.namespace: 'eclipse.oniro-core'
namespace: 'ef-grac-eclipse-oniro-core'
name: ef-grac-eclipse.oniro-core-configmap
data:
entrypoint: |
#!/bin/bash
set -e
[[ "$REGISTER_DEBUG" == "true" ]] && set -x
mkdir -p /home/gitlab-runner/.gitlab-runner/
cp /configmaps/config.toml /home/gitlab-runner/.gitlab-runner/
# Set up environment variables for cache
if [[ -f /secrets/accesskey && -f /secrets/secretkey ]]; then
export CACHE_S3_ACCESS_KEY=$(cat /secrets/accesskey)
export CACHE_S3_SECRET_KEY=$(cat /secrets/secretkey)
fi
if [[ -z "${REGISTRATION_TOKEN}" ]] && [[ -f /secrets/runner-registration-token ]]; then
export REGISTRATION_TOKEN=$(cat /secrets/runner-registration-token)
fi
# should use api : https://docs.gitlab.com/ee/api/runners.html#register-a-new-runner
#if [[ -z "${CI_SERVER_TOKEN}" ]] && [[ -f /secrets/runner-token ]]; then
# export CI_SERVER_TOKEN=$(cat /secrets/runner-token)
#fi
# Validate this also at runtime in case the user has set a custom secret
#if [[ ! -z "$CI_SERVER_TOKEN" && "1" -ne "1" ]]; then
# echo "Using a runner token with more than 1 replica is not supported."
# exit 1
#fi
# Register the runner
if ! sh /configmaps/register-the-runner; then
exit 1
fi
# Run pre-entrypoint-script
if ! bash /configmaps/pre-entrypoint-script; then
exit 1
fi
# Start the runner
exec /entrypoint run --user=gitlab-runner \
--working-directory=/home/gitlab-runner
config.toml: |
concurrent = 10
check_interval = 30
sentry_dsn = ""
config.template.toml: |
[[runners]]
[runners.kubernetes]
[[runners.kubernetes.volumes.pvc]]
name = "ef-grac-oniro-core-nfs-persistent-volume-claim"
mount_path = "/var/shared"
register-the-runner: |
#!/bin/bash
[[ "$REGISTER_DEBUG" == "true" ]] && set -x
MAX_REGISTER_ATTEMPTS=30
for i in $(seq 1 "${MAX_REGISTER_ATTEMPTS}"); do
echo "Registration attempt ${i} of ${MAX_REGISTER_ATTEMPTS}"
/entrypoint register
retval=$?
if [ ${retval} = 0 ]; then
break
elif [ ${i} = ${MAX_REGISTER_ATTEMPTS} ]; then
exit 1
fi
sleep 5
done
exit 0
check-live: |
#!/bin/bash
if /usr/bin/pgrep -f .*register-the-runner; then
exit 0
elif /usr/bin/pgrep gitlab.*runner; then
exit 0
else
exit 1
fi
pre-entrypoint-script: |
......@@ -103,7 +103,7 @@
},
{
"name": "RUNNER_TAG_LIST",
"value": "ef-grac,origin:eclipse,cluster:okd-c2,packType:groups,name:eclipse.oniro-core,namespace:ef-grac-eclipse-oniro-core,ctx:default,executor:kubernetes,concurrent:10,outputLimit:100000,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:1024Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi,"
"value": "ef-grac,origin:eclipse,cluster:okd-c2,packType:groups,name:eclipse.oniro-core,namespace:ef-grac-eclipse-oniro-core,ctx:default,executor:kubernetes,concurrent:10,outputLimit:100000,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:2048Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi,"
},
{
"name": "KUBERNETES_CPU_LIMIT",
......@@ -123,11 +123,11 @@
},
{
"name": "KUBERNETES_HELPER_CPU_LIMIT",
"value": "1500m"
"value": "300m"
},
{
"name": "KUBERNETES_HELPER_CPU_REQUEST",
"value": "1000m"
"value": "100m"
},
{
"name": "KUBERNETES_HELPER_EPHEMERAL_STORAGE_LIMIT",
......@@ -159,7 +159,7 @@
},
{
"name": "KUBERNETES_MEMORY_REQUEST",
"value": "1024Mi"
"value": "2048Mi"
},
{
"name": "KUBERNETES_NAMESPACE",
......@@ -342,7 +342,6 @@
"readOnlyRootFilesystem": false,
"runAsGroup": 65533,
"runAsNonRoot": true,
"runAsUser": 100,
"supplementalGroups": [
65533
]
......
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"metadata": {
"labels": {
"org.eclipse.cbi.ef-grac/project.fullname": "eclipse.oniro-core",
"org.eclipse.cbi.ef-grac/project.namespace": "eclipse.oniro-core",
"org.eclipse.cbi.ef-grac/project.shortname": "oniro-core"
},
"name": "ef-grac-oniro-core-deployment",
"namespace": "ef-grac-eclipse-oniro-core"
},
"spec": {
"replicas": 1,
"revisionHistoryLimit": 10,
"selector": {
"matchLabels": {
"org.eclipse.cbi.ef-grac/project.fullname": "eclipse.oniro-core"
}
},
"serviceName": "oniro-core",
"template": {
"metadata": {
"annotations": {
"prometheus.io/port": "9252",
"prometheus.io/scrape": "true"
},
"labels": {
"org.eclipse.cbi.ef-grac/project.fullname": "eclipse.oniro-core",
"org.eclipse.cbi.ef-grac/project.namespace": "eclipse.oniro-core",
"org.eclipse.cbi.ef-grac/project.shortname": "oniro-core"
},
"name": "oniro-core"
},
"spec": {
"containers": [
{
"command": [
"/bin/bash",
"/configmaps/entrypoint"
],
"env": [
{
"name": "LISTEN_ADDRESS",
"value": ":9252"
},
{
"name": "LOG_FORMAT",
"value": "runner"
},
{
"name": "LOG_LEVEL",
"value": "debug"
},
{
"name": "TEMPLATE_CONFIG_FILE",
"value": "/configmaps/config.template.toml"
},
{
"name": "REGISTER_ACCESS_LEVEL",
"value": "not_protected"
},
{
"name": "REGISTER_DEBUG",
"value": "false"
},
{
"name": "REGISTER_LOCKED",
"value": "true"
},
{
"name": "REGISTER_NON_INTERACTIVE",
"value": "true"
},
{
"name": "CI_SERVER_URL",
"value": "https://gitlab.eclipse.org/"
},
{
"name": "RUNNER_DEBUG",
"value": "false"
},
{
"name": "RUNNER_ENV",
"value": "CI_ONIRO_RUNNER_PERSISTENT_STORAGE=/var/shared"
},
{
"name": "RUNNER_EXECUTOR",
"value": "kubernetes"
},
{
"name": "RUNNER_NAME",
"value": "ef-grac-groups-oniro-core-runner"
},
{
"name": "RUNNER_OUTPUT_LIMIT",
"value": "100000"
},
{
"name": "RUNNER_TAG_LIST",
"value": "ef-grac,cluster:okd-c2,packType:groups,name:oniro-core,namespace:ef-grac-eclipse-oniro-core,executor:kubernetes,concurrent:10,outputLimit:100000,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:500m,memoryLimit:16384Mi,memoryRequest:1024Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi"
},
{
"name": "KUBERNETES_CPU_LIMIT",
"value": "8000m"
},
{
"name": "KUBERNETES_CPU_REQUEST",
"value": "500m"
},
{
"name": "KUBERNETES_EPHEMERAL_STORAGE_LIMIT",
"value": "200Mi"
},
{
"name": "KUBERNETES_EPHEMERAL_STORAGE_REQUEST",
"value": "100Mi"
},
{
"name": "KUBERNETES_HELPER_CPU_LIMIT",
"value": "300m"
},
{
"name": "KUBERNETES_HELPER_CPU_REQUEST",
"value": "100m"
},
{
"name": "KUBERNETES_HELPER_EPHEMERAL_STORAGE_LIMIT",
"value": "100Mi"
},
{
"name": "KUBERNETES_HELPER_EPHEMERAL_STORAGE_REQUEST",
"value": "100Mi"
},
{
"name": "KUBERNETES_HELPER_IMAGE",
"value": "registry.gitlab.com/gitlab-org/ci-cd/gitlab-runner-ubi-images/gitlab-runner-helper-ocp:x86_64-v15.2.1"
},
{
"name": "KUBERNETES_HELPER_MEMORY_LIMIT",
"value": "512Mi"
},
{
"name": "KUBERNETES_HELPER_MEMORY_REQUEST",
"value": "256Mi"
},
{
"name": "KUBERNETES_IMAGE",
"value": "ubuntu:20.04"
},
{
"name": "KUBERNETES_MEMORY_LIMIT",
"value": "16384Mi"
},
{
"name": "KUBERNETES_MEMORY_REQUEST",
"value": "1024Mi"
},
{
"name": "KUBERNETES_NAMESPACE",
"value": "ef-grac-eclipse-oniro-core"
},
{
"name": "KUBERNETES_POD_ANNOTATIONS_OVERWRITE_ALLOWED",
"value": "KUBERNETES_POD_ANNOTATIONS_*"
},
{
"name": "KUBERNETES_POD_LABELS_OVERWRITE_ALLOWED",
"value": "KUBERNETES_POD_LABELS_*"
},
{
"name": "KUBERNETES_POLL_TIMEOUT",
"value": "180"
},
{
"name": "KUBERNETES_PRIVILEGED",
"value": "false"
},
{
"name": "KUBERNETES_PULL_POLICY",
"value": "if-not-present"
},
{
"name": "KUBERNETES_SERVICE_ACCOUNT",
"value": "ef-grac-oniro-core-service-account"
},
{
"name": "KUBERNETES_SERVICE_CPU_LIMIT",
"value": "8000m"
},
{
"name": "KUBERNETES_SERVICE_CPU_REQUEST",
"value": "500m"
},
{
"name": "KUBERNETES_SERVICE_EPHEMERAL_STORAGE_LIMIT",
"value": "200Mi"
},
{
"name": "KUBERNETES_SERVICE_EPHEMERAL_STORAGE_REQUEST",
"value": "100Mi"
},
{
"name": "KUBERNETES_SERVICE_MEMORY_LIMIT",
"value": "16384Mi"
},
{
"name": "KUBERNETES_SERVICE_MEMORY_REQUEST",
"value": "1024Mi"
},
{
"name": "KUBERNETES_POD_LABELS_1",
"value": "gitlab/project_name=${CI_PROJECT_NAME}"
},
{
"name": "KUBERNETES_POD_LABELS_2",
"value": "gitlab/project_path=${CI_PROJECT_PATH_SLUG}"
},
{
"name": "KUBERNETES_POD_ANNOTATIONS_1",
"value": "gitlab/runner_version=${CI_RUNNER_VERSION}"
},
{
"name": "KUBERNETES_POD_ANNOTATIONS_10",
"value": "gitlab/pipeline_iid=${CI_PIPELINE_IID}"
},
{
"name": "KUBERNETES_POD_ANNOTATIONS_11",
"value": "gitlab/branch_name=${CI_BRANCH_NAME}"
},
{
"name": "KUBERNETES_POD_ANNOTATIONS_12",
"value": "gitlab/commit_author=${CI_COMMIT_AUTHOR}"
},
{
"name": "KUBERNETES_POD_ANNOTATIONS_13",
"value": "gitlab/job_author=${GITLAB_USER_NAME}"
},
{
"name": "KUBERNETES_POD_ANNOTATIONS_14",
"value": "gitlab/environment_name=${CI_ENVIRONMENT_NAME}"
},
{
"name": "KUBERNETES_POD_ANNOTATIONS_15",
"value": "gitlab/environment_tier=${CI_ENVIRONMENT_TIER}"
},
{
"name": "KUBERNETES_POD_ANNOTATIONS_16",
"value": "gitlab/environment_slug=${CI_ENVIRONMENT_SLUG}"
},
{
"name": "KUBERNETES_POD_ANNOTATIONS_2",
"value": "gitlab/project_name=${CI_PROJECT_NAME}"
},
{
"name": "KUBERNETES_POD_ANNOTATIONS_3",
"value": "gitlab/project_path=${CI_PROJECT_PATH_SLUG}"
},
{
"name": "KUBERNETES_POD_ANNOTATIONS_4",
"value": "gitlab/job_id=${CI_JOB_ID}"
},
{
"name": "KUBERNETES_POD_ANNOTATIONS_5",
"value": "gitlab/job_url=$CI_JOB_URL"
},
{
"name": "KUBERNETES_POD_ANNOTATIONS_6",
"value": "gitlab/job_name=${CI_JOB_NAME}"
},
{
"name": "KUBERNETES_POD_ANNOTATIONS_7",
"value": "gitlab/job_image=${CI_JOB_IMAGE}"
},
{
"name": "KUBERNETES_POD_ANNOTATIONS_8",
"value": "gitlab/stage_name=${CI_JOB_STAGE}"
},
{
"name": "KUBERNETES_POD_ANNOTATIONS_9",
"value": "gitlab/pipeline_id=${CI_PIPELINE_ID}"
}
],
"image": "registry.gitlab.com/gitlab-org/ci-cd/gitlab-runner-ubi-images/gitlab-runner-ocp:amd64-v15.2.1",
"imagePullPolicy": "IfNotPresent",
"livenessProbe": {
"exec": {
"command": [
"/bin/bash",
"/configmaps/check-live"
]
},
"failureThreshold": 5,
"initialDelaySeconds": 480,
"periodSeconds": 30,
"timeoutSeconds": 30
},
"name": "gitlab-runner",
"ports": [
{
"containerPort": 9252,
"name": "metrics",
"protocol": "TCP"
}
],
"readinessProbe": {
"exec": {
"command": [
"/usr/bin/pgrep",
"gitlab.*runner"
]
},
"failureThreshold": 5,
"initialDelaySeconds": 1,
"periodSeconds": 5,
"timeoutSeconds": 10
},
"resources": {
"limits": {
"cpu": "300m",
"memory": "256Mi"
},
"requests": {
"cpu": "100m",
"memory": "128Mi"
}
},
"securityContext": {
"allowPrivilegeEscalation": false,
"capabilities": {
"drop": [
"ALL"
]
},
"privileged": false,
"readOnlyRootFilesystem": false,
"runAsNonRoot": true
},
"volumeMounts": [
{
"mountPath": "/secrets",
"name": "projected-secrets"
},
{
"mountPath": "/home/gitlab-runner/.gitlab-runner",
"name": "etc-gitlab-runner"
},
{
"mountPath": "/configmaps",
"name": "configmaps"
}
]
}
],
"serviceAccountName": "ef-grac-oniro-core-service-account",
"terminationGracePeriodSeconds": 1200,
"volumes": [
{
"emptyDir": {
"medium": "Memory"
},
"name": "runner-secrets"
},
{
"emptyDir": {
"medium": "Memory"
},
"name": "etc-gitlab-runner"
},
{
"name": "projected-secrets",
"projected": {
"sources": [
{
"secret": {
"items": [
{
"key": "runner-registration-token",
"path": "runner-registration-token"
}
],
"name": "ef-grac-eclipse.oniro-core-secret"
}
}
]
}
},
{
"configMap": {
"name": "ef-grac-eclipse.oniro-core-configmap"
},
"name": "configmaps"
}
]
}
}
}
}
......@@ -14,7 +14,7 @@
"limits": [
{
"max": {
"cpu": "17500m",
"cpu": "16300m",
"memory": "33280Mi"
},
"min": {
......@@ -25,11 +25,11 @@
},
{
"default": {
"cpu": "1500m",
"cpu": "300m",
"memory": "512Mi"
},
"defaultRequest": {
"cpu": "1000m",
"cpu": "200m",
"memory": "512Mi"
},
"max": {
......
......@@ -12,11 +12,11 @@
},
"spec": {
"hard": {
"limits.cpu": "17800m",
"limits.cpu": "16600m",
"limits.memory": "33536Mi",
"pods": 11,
"requests.cpu": "2600m",
"requests.memory": "2688Mi"
"requests.cpu": "1700m",
"requests.memory": "3712Mi"
}
}
}
local Kube = import '../../../templates/k8s/kube.libsonnet';
{
project+: {
fullName: "eclipsefdn.it.releng.gitlab-runner-as-code",
......@@ -12,7 +13,7 @@
volumes+:{
pvc: [
{
name: $.project.prefix + '-' + $.project.shortName + '-nfs-persistent-volume-claim',
name: $.project.kubeNamespaceName + '-' + Kube.namingNfsPersistentVolumeClaim,
mount_path: '/var/shared'
},
],
......
......@@ -278,7 +278,7 @@
"pvc": [
{
"mount_path": "/var/shared",
"name": "ef-grac-gitlab-runner-as-code-nfs-persistent-volume-claim"
"name": "ef-grac-eclipsefdn-it-releng-gitlab-runner-as-code-nfs-pvc"
}
]
}
......@@ -569,7 +569,7 @@
"pvc": [
{
"mount_path": "/var/shared",
"name": "ef-grac-gitlab-runner-as-code-nfs-persistent-volume-claim"
"name": "ef-grac-eclipsefdn-it-releng-gitlab-runner-as-code-nfs-pvc"
}
]
}
......
......@@ -70,7 +70,7 @@ data:
[[runners]]
[runners.kubernetes]
[[runners.kubernetes.volumes.pvc]]
name = "ef-grac-gitlab-runner-as-code-nfs-persistent-volume-claim"
name = "ef-grac-eclipsefdn-it-releng-gitlab-runner-as-code-nfs-pvc"
mount_path = "/var/shared"
......
......@@ -342,7 +342,6 @@
"readOnlyRootFilesystem": false,
"runAsGroup": 65533,
"runAsNonRoot": true,
"runAsUser": 1000750001,
"supplementalGroups": [
65533
]
......
......@@ -26,6 +26,38 @@
},
"registry": "registry.gitlab.com",
"repository": "gitlab-org/ci-cd/gitlab-runner-ubi-images",
"resources": {
"build": {
"cpuLimit": "8000m",
"cpuRequest": "1000m",
"memoryLimit": "16384Mi",
"memoryRequest": "2048Mi",
"storageLimit": "200Mi",
"storageRequest": "100Mi"
},
"helper": {
"cpuLimit": "300m",
"cpuRequest": "100m",
"memoryLimit": "512Mi",
"memoryRequest": "512Mi",
"storageLimit": "100Mi",
"storageRequest": "100Mi"
},
"runner": {
"cpuLimit": "300m",
"cpuRequest": "100m",
"memoryLimit": "256Mi",
"memoryRequest": "128Mi"
},
"service": {
"cpuLimit": "8000m",
"cpuRequest": "500m",
"memoryLimit": "16384Mi",
"memoryRequest": "1024Mi",
"storageLimit": "200Mi",
"storageRequest": "100Mi"
}
},
"runner": {
"env": {
"annotations": {
......@@ -130,9 +162,9 @@
"helperContainerSecurityContextRunAsGroup": "",
"helperContainerSecurityContextRunAsNonRoot": "",
"helperContainerSecurityContextRunAsUser": "",
"helperCpuLimit": "1500m",
"helperCpuLimit": "300m",
"helperCpuLimitOverwriteMaxAllowed": "",
"helperCpuRequest": "1000m",
"helperCpuRequest": "100m",
"helperCpuRequestOverwriteMaxAllowed": "",
"helperEphemeralStorageLimit": "100Mi",
"helperEphemeralStorageLimitOverwriteMaxAllowed": "",
......@@ -151,7 +183,7 @@
"keyFile": "",
"memoryLimit": "16384Mi",
"memoryLimitOverwriteMaxAllowed": "",
"memoryRequest": "1024Mi",
"memoryRequest": "2048Mi",
"memoryRequestOverwriteMaxAllowed": "",
"namespace": "ef-grac-eclipsefdn-it-releng",
"namespaceOverwriteAllowed": "",
......@@ -222,7 +254,7 @@
"executor": "kubernetes",
"gracDefaultTagList": "ef-grac,cluster:okd-c2,packType:groups,name:eclipsefdn.it.releng,namespace:ef-grac-eclipsefdn-it-releng,executor:kubernetes",
"gracExtraTagList": "",
"gracMoreInfoTagList": "concurrent:10,outputLimit:4096,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:1024Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi",
"gracMoreInfoTagList": "concurrent:10,outputLimit:4096,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:2048Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi",
"leaveRunner": "",
"limit": "",
"name": "ef-grac-groups-eclipsefdn.it.releng-runner",
......@@ -233,7 +265,7 @@
"preCloneScript": "",
"requestConcurrency": "",
"shell": "",
"tagList": "ef-grac,cluster:okd-c2,packType:groups,name:eclipsefdn.it.releng,namespace:ef-grac-eclipsefdn-it-releng,executor:kubernetes,concurrent:10,outputLimit:4096,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:1024Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi,"
"tagList": "ef-grac,cluster:okd-c2,packType:groups,name:eclipsefdn.it.releng,namespace:ef-grac-eclipsefdn-it-releng,executor:kubernetes,concurrent:10,outputLimit:4096,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:2048Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi,"
}
},
"global": {
......@@ -278,6 +310,38 @@
},
"registry": "registry.gitlab.com",
"repository": "gitlab-org/ci-cd/gitlab-runner-ubi-images",
"resources": {
"build": {
"cpuLimit": "8000m",
"cpuRequest": "1000m",
"memoryLimit": "16384Mi",
"memoryRequest": "2048Mi",
"storageLimit": "200Mi",
"storageRequest": "100Mi"
},
"helper": {
"cpuLimit": "300m",
"cpuRequest": "100m",
"memoryLimit": "512Mi",
"memoryRequest": "512Mi",
"storageLimit": "100Mi",
"storageRequest": "100Mi"
},
"runner": {
"cpuLimit": "300m",
"cpuRequest": "100m",
"memoryLimit": "256Mi",
"memoryRequest": "128Mi"
},
"service": {
"cpuLimit": "8000m",
"cpuRequest": "500m",
"memoryLimit": "16384Mi",
"memoryRequest": "1024Mi",
"storageLimit": "200Mi",
"storageRequest": "100Mi"
}
},
"runner": {
"env": {
"annotations": {
......@@ -382,9 +446,9 @@
"helperContainerSecurityContextRunAsGroup": "",
"helperContainerSecurityContextRunAsNonRoot": "",
"helperContainerSecurityContextRunAsUser": "",
"helperCpuLimit": "1500m",
"helperCpuLimit": "300m",
"helperCpuLimitOverwriteMaxAllowed": "",
"helperCpuRequest": "1000m",
"helperCpuRequest": "100m",
"helperCpuRequestOverwriteMaxAllowed": "",
"helperEphemeralStorageLimit": "100Mi",
"helperEphemeralStorageLimitOverwriteMaxAllowed": "",
......@@ -403,7 +467,7 @@
"keyFile": "",
"memoryLimit": "16384Mi",
"memoryLimitOverwriteMaxAllowed": "",
"memoryRequest": "1024Mi",
"memoryRequest": "2048Mi",
"memoryRequestOverwriteMaxAllowed": "",
"namespace": "ef-grac-eclipsefdn-it-releng",
"namespaceOverwriteAllowed": "",
......@@ -474,7 +538,7 @@
"executor": "kubernetes",
"gracDefaultTagList": "ef-grac,origin:eclipse,cluster:okd-c2,packType:groups,name:eclipsefdn.it.releng,namespace:ef-grac-eclipsefdn-it-releng,ctx:default,executor:kubernetes",
"gracExtraTagList": "",
"gracMoreInfoTagList": "concurrent:10,outputLimit:4096,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:1024Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi",
"gracMoreInfoTagList": "concurrent:10,outputLimit:4096,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:2048Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi",
"leaveRunner": "",
"limit": "",
"name": "ef-grac-groups-eclipsefdn.it.releng-runner",
......@@ -485,7 +549,7 @@
"preCloneScript": "",
"requestConcurrency": "",
"shell": "",
"tagList": "ef-grac,origin:eclipse,cluster:okd-c2,packType:groups,name:eclipsefdn.it.releng,namespace:ef-grac-eclipsefdn-it-releng,ctx:default,executor:kubernetes,concurrent:10,outputLimit:4096,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:1024Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi,"
"tagList": "ef-grac,origin:eclipse,cluster:okd-c2,packType:groups,name:eclipsefdn.it.releng,namespace:ef-grac-eclipsefdn-it-releng,ctx:default,executor:kubernetes,concurrent:10,outputLimit:4096,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:2048Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi,"
}
},
"global": {
......@@ -535,42 +599,13 @@
],
"fullName": "eclipsefdn.it.releng",
"kubeNamespaceName": "ef-grac-eclipsefdn-it-releng",
"limitRange": true,
"namespaceName": "eclipsefdn.it.releng",
"origin": "eclipse",
"prefix": "ef-grac",
"resourcePacks": 1,
"resourcesQuotas": true,
"serviceMetrics": true,
"shortName": "releng"
},
"resources": {
"build": {
"cpuLimit": "8000m",
"cpuRequest": "1000m",
"memoryLimit": "16384Mi",
"memoryRequest": "1024Mi",
"storageLimit": "200Mi",
"storageRequest": "100Mi"
},
"helper": {
"cpuLimit": "1500m",
"cpuRequest": "1000m",
"memoryLimit": "512Mi",
"memoryRequest": "512Mi",
"storageLimit": "100Mi",
"storageRequest": "100Mi"
},
"runner": {
"cpuLimit": "300m",
"cpuRequest": "100m",
"memoryLimit": "256Mi",
"memoryRequest": "128Mi"
},
"service": {
"cpuLimit": "8000m",
"cpuRequest": "500m",
"memoryLimit": "16384Mi",
"memoryRequest": "1024Mi",
"storageLimit": "200Mi",
"storageRequest": "100Mi"
}
}
}
......@@ -99,7 +99,7 @@
},
{
"name": "RUNNER_TAG_LIST",
"value": "ef-grac,origin:eclipse,cluster:okd-c2,packType:groups,name:eclipsefdn.it.releng,namespace:ef-grac-eclipsefdn-it-releng,ctx:default,executor:kubernetes,concurrent:10,outputLimit:4096,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:1024Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi,"
"value": "ef-grac,origin:eclipse,cluster:okd-c2,packType:groups,name:eclipsefdn.it.releng,namespace:ef-grac-eclipsefdn-it-releng,ctx:default,executor:kubernetes,concurrent:10,outputLimit:4096,image:ubuntu:20.04,cpuLimit:8000m,cpuRequest:1000m,memoryLimit:16384Mi,memoryRequest:2048Mi,serviceCpuLimit:8000m,serviceCpuRequest:500m,serviceMemoryLimit:16384Mi,serviceMemoryRequest:1024Mi,"
},
{
"name": "KUBERNETES_CPU_LIMIT",
......@@ -119,11 +119,11 @@
},
{
"name": "KUBERNETES_HELPER_CPU_LIMIT",
"value": "1500m"
"value": "300m"
},
{
"name": "KUBERNETES_HELPER_CPU_REQUEST",
"value": "1000m"
"value": "100m"
},
{
"name": "KUBERNETES_HELPER_EPHEMERAL_STORAGE_LIMIT",
......@@ -155,7 +155,7 @@
},
{
"name": "KUBERNETES_MEMORY_REQUEST",
"value": "1024Mi"
"value": "2048Mi"
},
{
"name": "KUBERNETES_NAMESPACE",
......@@ -338,7 +338,6 @@
"readOnlyRootFilesystem": false,
"runAsGroup": 65533,
"runAsNonRoot": true,
"runAsUser": 100,
"supplementalGroups": [
65533
]
......
......@@ -14,7 +14,7 @@
"limits": [
{
"max": {
"cpu": "17500m",
"cpu": "16300m",
"memory": "33280Mi"
},
"min": {
......@@ -25,11 +25,11 @@
},
{
"default": {
"cpu": "1500m",
"cpu": "300m",
"memory": "512Mi"
},
"defaultRequest": {
"cpu": "1000m",
"cpu": "200m",
"memory": "512Mi"
},
"max": {
......
......@@ -12,11 +12,11 @@
},
"spec": {
"hard": {
"limits.cpu": "17800m",
"limits.cpu": "16600m",
"limits.memory": "33536Mi",
"pods": 11,
"requests.cpu": "2600m",
"requests.memory": "2688Mi"
"requests.cpu": "1700m",
"requests.memory": "3712Mi"
}
}
}
local Kube = import '../../../templates/k8s/kube.libsonnet';
{
project+: {
fullName: "heurtemattes.oniro",
resourcePacks: 1,
resourcesQuotas: false,
limitRange: false,
#deployment: ['default', 'kaniko'],
},
deployment+: {
......@@ -18,7 +21,7 @@
volumes+:{
pvc: [
{
name: $.project.kubeNamespaceName + '-nfs-persistent-volume-claim',
name: $.project.kubeNamespaceName + '-' + Kube.namingNfsPersistentVolumeClaim,
mount_path: '/var/shared'
},
],
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment