From f44a210d8a097b3ad1c10197eef880484bfe7c27 Mon Sep 17 00:00:00 2001
From: Sagar Arora <sagar.arora@eurecom.fr>
Date: Thu, 17 Nov 2022 14:26:46 +0100
Subject: [PATCH] Clean the helm-charts and fix cls_physim
- added right pod selector in cls_physim
---
.../charts/dlsim.100rb+tm2/templates/job.yaml | 3 ++
.../charts/dlsim.100rb+tm2/values.yaml | 12 ------
.../charts/dlsim.basic/templates/job.yaml | 14 +++---
charts/physims/charts/dlsim.basic/values.yaml | 30 ++++---------
.../charts/ldpctest/templates/job.yaml | 3 ++
charts/physims/charts/ldpctest/values.yaml | 12 ------
.../charts/nr-dlschsim/templates/job.yaml | 3 ++
charts/physims/charts/nr-dlschsim/values.yaml | 12 ------
.../charts/nr-dlsim.basic/templates/job.yaml | 3 ++
.../physims/charts/nr-dlsim.basic/values.yaml | 12 ------
.../nr-dlsim.dmrs+ptrs/templates/job.yaml | 3 ++
.../charts/nr-dlsim.dmrs+ptrs/values.yaml | 12 ------
.../nr-dlsim.mcs+mimo/templates/job.yaml | 3 ++
.../charts/nr-dlsim.mcs+mimo/values.yaml | 12 ------
.../charts/nr-dlsim.offset/templates/job.yaml | 3 ++
.../charts/nr-dlsim.offset/values.yaml | 12 ------
.../nr-pbchsim.106rb/templates/job.yaml | 2 +-
.../charts/nr-pbchsim.106rb/values.yaml | 12 ------
.../nr-pbchsim.217rb/templates/job.yaml | 3 ++
.../charts/nr-pbchsim.217rb/values.yaml | 12 ------
.../nr-pbchsim.273rb/templates/job.yaml | 3 ++
.../charts/nr-pbchsim.273rb/values.yaml | 12 ------
.../charts/nr-prachsim/templates/job.yaml | 3 ++
charts/physims/charts/nr-prachsim/values.yaml | 12 ------
.../charts/nr-pucchsim/templates/job.yaml | 3 ++
charts/physims/charts/nr-pucchsim/values.yaml | 8 ----
.../charts/nr-ulschsim/templates/job.yaml | 3 ++
charts/physims/charts/nr-ulschsim/values.yaml | 12 ------
.../charts/nr-ulsim.3gpp/templates/job.yaml | 3 ++
.../physims/charts/nr-ulsim.3gpp/values.yaml | 12 ------
.../charts/nr-ulsim.mimo/templates/job.yaml | 3 ++
.../physims/charts/nr-ulsim.mimo/values.yaml | 12 ------
.../charts/nr-ulsim.misc/templates/job.yaml | 3 ++
.../physims/charts/nr-ulsim.misc/values.yaml | 12 ------
.../nr-ulsim.sc-fdma/templates/job.yaml | 3 ++
.../charts/nr-ulsim.sc-fdma/values.yaml | 12 ------
.../charts/polartest/templates/job.yaml | 3 ++
charts/physims/charts/polartest/values.yaml | 12 ------
.../charts/smallblocktest/templates/job.yaml | 3 ++
.../physims/charts/smallblocktest/values.yaml | 12 ------
.../physims/charts/ulsim/templates/job.yaml | 3 ++
charts/physims/charts/ulsim/values.yaml | 12 ------
charts/physims/values.yaml | 43 -------------------
ci-scripts/cls_physim1.py | 9 ++--
44 files changed, 77 insertions(+), 314 deletions(-)
diff --git a/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml b/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
index 03a0813d79..28d34037e6 100644
--- a/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
+++ b/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/dlsim.100rb+tm2/values.yaml b/charts/physims/charts/dlsim.100rb+tm2/values.yaml
index 35614bc844..aae621bd84 100644
--- a/charts/physims/charts/dlsim.100rb+tm2/values.yaml
+++ b/charts/physims/charts/dlsim.100rb+tm2/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/dlsim.basic/templates/job.yaml b/charts/physims/charts/dlsim.basic/templates/job.yaml
index 4edd9a5f2f..405f20e7ff 100644
--- a/charts/physims/charts/dlsim.basic/templates/job.yaml
+++ b/charts/physims/charts/dlsim.basic/templates/job.yaml
@@ -1,9 +1,12 @@
apiVersion: batch/v1
kind: Job
metadata:
- name: {{ .Chart.Name }}
+ name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -15,13 +18,6 @@ spec:
- name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
-# resources:
-# requests:
-# memory: "4096Mi"
-# cpu: "4000m"
-# limits:
-# memory: "4096Mi"
-# cpu: "4000m"
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
env:
@@ -35,5 +31,5 @@ spec:
dnsPolicy: ClusterFirst
restartPolicy: Never
schedulerName: default-scheduler
- serviceAccountName: oai-physim-sa
+ serviceAccountName: {{ .Values.global.serviceAccountName }}
terminationGracePeriodSeconds: 30
diff --git a/charts/physims/charts/dlsim.basic/values.yaml b/charts/physims/charts/dlsim.basic/values.yaml
index 91b9eed407..2150e27daf 100644
--- a/charts/physims/charts/dlsim.basic/values.yaml
+++ b/charts/physims/charts/dlsim.basic/values.yaml
@@ -20,7 +20,7 @@ serviceAccount:
annotations: {}
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
- name: "oai-physim-sa" #"oai-dlsim-basic"
+ name: "oai-dlsim-basic"
podSecurityContext:
runAsUser: 0
@@ -28,26 +28,14 @@ podSecurityContext:
securityContext:
privileged: false
- #capabilities:
- # add:
- # - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
-
-resources:
- limits:
- cpu: 100m
- memory: 128Mi
- requests:
- cpu: 100m
- memory: 128Mi
+
+resources: {}
+ # limits:
+ # cpu: 100m
+ # memory: 128Mi
+ # requests:
+ # cpu: 100m
+ # memory: 128Mi
nodeSelector: {}
diff --git a/charts/physims/charts/ldpctest/templates/job.yaml b/charts/physims/charts/ldpctest/templates/job.yaml
index 1d1dc2c886..0bb60fd2ce 100644
--- a/charts/physims/charts/ldpctest/templates/job.yaml
+++ b/charts/physims/charts/ldpctest/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/ldpctest/values.yaml b/charts/physims/charts/ldpctest/values.yaml
index 964878baad..0ff1153a2c 100644
--- a/charts/physims/charts/ldpctest/values.yaml
+++ b/charts/physims/charts/ldpctest/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-dlschsim/templates/job.yaml b/charts/physims/charts/nr-dlschsim/templates/job.yaml
index 9141c93644..47d152193e 100644
--- a/charts/physims/charts/nr-dlschsim/templates/job.yaml
+++ b/charts/physims/charts/nr-dlschsim/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-dlschsim/values.yaml b/charts/physims/charts/nr-dlschsim/values.yaml
index 05b775444a..a75437a0d6 100644
--- a/charts/physims/charts/nr-dlschsim/values.yaml
+++ b/charts/physims/charts/nr-dlschsim/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-dlsim.basic/templates/job.yaml b/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
index b998f6f184..0688c27864 100644
--- a/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-dlsim.basic/values.yaml b/charts/physims/charts/nr-dlsim.basic/values.yaml
index 4bd0f82294..88e5a2caaa 100644
--- a/charts/physims/charts/nr-dlsim.basic/values.yaml
+++ b/charts/physims/charts/nr-dlsim.basic/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
index 4e4948c7c9..edc248eb24 100644
--- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml b/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
index dffc443398..357e6c2861 100644
--- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
+++ b/charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
index ff8ec59352..9a70a2d3ce 100644
--- a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml b/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
index 8c56f219b4..5ef75a1672 100644
--- a/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
+++ b/charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-dlsim.offset/templates/job.yaml b/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
index 71a5f88542..e5c0d65703 100644
--- a/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-dlsim.offset/values.yaml b/charts/physims/charts/nr-dlsim.offset/values.yaml
index 8de40ffcaa..efef89ce4a 100644
--- a/charts/physims/charts/nr-dlsim.offset/values.yaml
+++ b/charts/physims/charts/nr-dlsim.offset/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
index 6b560eded2..9f974cc0f0 100644
--- a/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
@@ -6,7 +6,7 @@ spec:
template:
metadata:
labels:
- {{- include "oai-nr-pbchsim-106rb.selectorLabels" . | nindent 8 }}
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-pbchsim.106rb/values.yaml b/charts/physims/charts/nr-pbchsim.106rb/values.yaml
index fdeacbc96e..8f8104146a 100644
--- a/charts/physims/charts/nr-pbchsim.106rb/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.106rb/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
index 7f6c11dd43..bc3770e70f 100644
--- a/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-pbchsim.217rb/values.yaml b/charts/physims/charts/nr-pbchsim.217rb/values.yaml
index 325703f53d..96b3f860df 100644
--- a/charts/physims/charts/nr-pbchsim.217rb/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.217rb/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
index 5f16b06c1d..e4e8dddcd0 100644
--- a/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-pbchsim.273rb/values.yaml b/charts/physims/charts/nr-pbchsim.273rb/values.yaml
index 529cedd5dc..36b62e0146 100644
--- a/charts/physims/charts/nr-pbchsim.273rb/values.yaml
+++ b/charts/physims/charts/nr-pbchsim.273rb/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-prachsim/templates/job.yaml b/charts/physims/charts/nr-prachsim/templates/job.yaml
index 2b366e3655..bfd5024ca6 100644
--- a/charts/physims/charts/nr-prachsim/templates/job.yaml
+++ b/charts/physims/charts/nr-prachsim/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-prachsim/values.yaml b/charts/physims/charts/nr-prachsim/values.yaml
index 99b4f70f28..8404ea4192 100644
--- a/charts/physims/charts/nr-prachsim/values.yaml
+++ b/charts/physims/charts/nr-prachsim/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-pucchsim/templates/job.yaml b/charts/physims/charts/nr-pucchsim/templates/job.yaml
index 2b1d7b016b..849aa1fe46 100644
--- a/charts/physims/charts/nr-pucchsim/templates/job.yaml
+++ b/charts/physims/charts/nr-pucchsim/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-pucchsim/values.yaml b/charts/physims/charts/nr-pucchsim/values.yaml
index 4d7a4b8750..1c2c822088 100644
--- a/charts/physims/charts/nr-pucchsim/values.yaml
+++ b/charts/physims/charts/nr-pucchsim/values.yaml
@@ -28,14 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
service:
type: ClusterIP
diff --git a/charts/physims/charts/nr-ulschsim/templates/job.yaml b/charts/physims/charts/nr-ulschsim/templates/job.yaml
index e54f2095a6..8096181405 100644
--- a/charts/physims/charts/nr-ulschsim/templates/job.yaml
+++ b/charts/physims/charts/nr-ulschsim/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-ulschsim/values.yaml b/charts/physims/charts/nr-ulschsim/values.yaml
index 083f4b43f1..770cb43bb1 100644
--- a/charts/physims/charts/nr-ulschsim/values.yaml
+++ b/charts/physims/charts/nr-ulschsim/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml b/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
index 2c92769c4d..740c5818da 100644
--- a/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-ulsim.3gpp/values.yaml b/charts/physims/charts/nr-ulsim.3gpp/values.yaml
index adbe124197..b2aedcba03 100644
--- a/charts/physims/charts/nr-ulsim.3gpp/values.yaml
+++ b/charts/physims/charts/nr-ulsim.3gpp/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml b/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
index 9d6c284b91..74200d4614 100644
--- a/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-ulsim.mimo/values.yaml b/charts/physims/charts/nr-ulsim.mimo/values.yaml
index 1b527ee5fa..b2dd42d3be 100644
--- a/charts/physims/charts/nr-ulsim.mimo/values.yaml
+++ b/charts/physims/charts/nr-ulsim.mimo/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-ulsim.misc/templates/job.yaml b/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
index 72ca08712b..19c4b7f42b 100644
--- a/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-ulsim.misc/values.yaml b/charts/physims/charts/nr-ulsim.misc/values.yaml
index c3e265bf69..8d15fca39e 100644
--- a/charts/physims/charts/nr-ulsim.misc/values.yaml
+++ b/charts/physims/charts/nr-ulsim.misc/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml b/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
index 05dccbf705..c487d44598 100644
--- a/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml b/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
index 05a952a1ac..c617eeafec 100644
--- a/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
+++ b/charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/polartest/templates/job.yaml b/charts/physims/charts/polartest/templates/job.yaml
index 8f0998d9f3..9abb161e24 100644
--- a/charts/physims/charts/polartest/templates/job.yaml
+++ b/charts/physims/charts/polartest/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/polartest/values.yaml b/charts/physims/charts/polartest/values.yaml
index c91ee2bf5b..12386f02bc 100644
--- a/charts/physims/charts/polartest/values.yaml
+++ b/charts/physims/charts/polartest/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/smallblocktest/templates/job.yaml b/charts/physims/charts/smallblocktest/templates/job.yaml
index d136a1fcf3..365e1215d9 100644
--- a/charts/physims/charts/smallblocktest/templates/job.yaml
+++ b/charts/physims/charts/smallblocktest/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/smallblocktest/values.yaml b/charts/physims/charts/smallblocktest/values.yaml
index f4d8a31fd9..7f116091ac 100644
--- a/charts/physims/charts/smallblocktest/values.yaml
+++ b/charts/physims/charts/smallblocktest/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/charts/ulsim/templates/job.yaml b/charts/physims/charts/ulsim/templates/job.yaml
index f2e904edb8..d7a820f0ca 100644
--- a/charts/physims/charts/ulsim/templates/job.yaml
+++ b/charts/physims/charts/ulsim/templates/job.yaml
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
+ metadata:
+ labels:
+ app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/physims/charts/ulsim/values.yaml b/charts/physims/charts/ulsim/values.yaml
index 7ed2c6bed0..94038fa6df 100644
--- a/charts/physims/charts/ulsim/values.yaml
+++ b/charts/physims/charts/ulsim/values.yaml
@@ -28,18 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
-# capabilities:
-# add:
-# - SYS_CAP_PTRACE
- # drop:
- # - ALL
- # readOnlyRootFilesystem: true
- # runAsNonRoot: true
- # runAsUser: 1000
-
-service:
- type: ClusterIP
- port: 80
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/charts/physims/values.yaml b/charts/physims/values.yaml
index 53190daff7..e333ad1fa3 100644
--- a/charts/physims/values.yaml
+++ b/charts/physims/values.yaml
@@ -12,46 +12,3 @@ global:
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
-## Declaring values specific to coressponding physim to overwrite (At the moment unused)
-
-dlsim.basic:
-
-dlsim.100rb+tm2:
-
-ulsim:
-
-ldpctest:
-
-polartest:
-
-nr-pbchsim.106rb:
-
-nr-pbchsim.217rb:
-
-nr-pbchsim.273rb:
-
-nr-dlsim.basic:
-
-nr-dlsim.dmrs+ptrs:
-
-nr-dlsim.mcs+mimo:
-
-nr-dlsim.offset:
-
-nr-dlschsim:
-
-smallblocktest:
-
-nr-ulschsim:
-
-nr-pucchsim:
-
-nr-ulsim.3gpp:
-
-nr-ulsim.mimo:
-
-nr-ulsim.misc:
-
-nr-ulsim.sc-fdma:
-
-nr-prachsim:
diff --git a/ci-scripts/cls_physim1.py b/ci-scripts/cls_physim1.py
index 1cef2270c3..9be0293cfc 100644
--- a/ci-scripts/cls_physim1.py
+++ b/ci-scripts/cls_physim1.py
@@ -158,9 +158,10 @@ class PhySim:
logging.debug('\u001B[1m Deployed PhySim Successfully using helm chart\u001B[0m')
isRunning = False
count = 0
+ # Below while sections means there is 2 mins for pods to be in running if not they will be removed
while(count < 2 and isRunning == False):
time.sleep(60)
- mySSH.command('oc get pods -o wide -l app.kubernetes.io/instance=physim | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 30, resync=True)
+ mySSH.command('oc get pods -o wide -l app=physim | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 30, resync=True)
if mySSH.getBefore().count('Running') == 21:
logging.debug('\u001B[1m Running the physim test Scenarios\u001B[0m')
isRunning = True
@@ -168,14 +169,14 @@ class PhySim:
count +=1
if isRunning == False:
logging.error('\u001B[1m Some PODS Running FAILED \u001B[0m')
- mySSH.command('oc get pods -l app.kubernetes.io/instance=physim 2>&1 | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 6)
+ mySSH.command('oc get pods -l app=physim 2>&1 | tee -a cmake_targets/log/physim_pods_summary.txt', '\$', 6)
mySSH.command('for pod in $(oc get pods | tail -n +2 | awk \'{print $1}\'); do oc describe pod $pod >> cmake_targets/log/physim_pods_summary.txt; done', '\$', 10)
mySSH.command('helm uninstall physim 2>&1 >> cmake_targets/log/physim_helm_summary.txt', '\$', 6)
self.AnalyzeLogFile_phySim()
isFinished1 = False
while(isFinished1 == False):
time.sleep(20)
- mySSH.command('oc get pods -l app.kubernetes.io/instance=physim', '\$', 6, resync=True)
+ mySSH.command('oc get pods -l app=physim', '\$', 6, resync=True)
if re.search('No resources found', mySSH.getBefore()):
isFinished1 = True
mySSH.command('oc logout', '\$', 30)
@@ -188,7 +189,7 @@ class PhySim:
isFinished = False
# doing a deep copy!
tmpPodNames = podNames.copy()
- while(count < 15 and isFinished == False):
+ while(count < 9 and isFinished == False):
time.sleep(60)
for podName in tmpPodNames:
mySSH.command2(f'oc logs --tail=1 {podName} 2>&1', 6, silent=True)
--
2.26.2