maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean the helm-charts and fix cls_physim

Browse Source 
- added right pod selector in cls_physim
This commit is contained in:
Sagar Arora
2022-11-17 14:26:46 +01:00
parent ff738b7bf9
commit f44a210d8a
44 changed files with 76 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/dlsim.100rb+tm2/values.yaml
-12
View File
@@ -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
charts/physims/charts/dlsim.basic/templates/job.yaml
+5 -9
View File
@@ -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
charts/physims/charts/dlsim.basic/values.yaml
+8 -20
View File
@@ -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: {}
charts/physims/charts/ldpctest/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/ldpctest/values.yaml
-12
View File
@@ -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
charts/physims/charts/nr-dlschsim/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/nr-dlschsim/values.yaml
-12
View File
@@ -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
charts/physims/charts/nr-dlsim.basic/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/nr-dlsim.basic/values.yaml
-12
View File
@@ -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
charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/nr-dlsim.dmrs+ptrs/values.yaml
-12
View File
@@ -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
charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/nr-dlsim.mcs+mimo/values.yaml
-12
View File
@@ -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
charts/physims/charts/nr-dlsim.offset/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/nr-dlsim.offset/values.yaml
-12
View File
@@ -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
charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
+1 -1
View File
@@ -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 }}
charts/physims/charts/nr-pbchsim.106rb/values.yaml
-12
View File
@@ -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
charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/nr-pbchsim.217rb/values.yaml
-12
View File
@@ -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
charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/nr-pbchsim.273rb/values.yaml
-12
View File
@@ -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
charts/physims/charts/nr-prachsim/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/nr-prachsim/values.yaml
-12
View File
@@ -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
charts/physims/charts/nr-pucchsim/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/nr-pucchsim/values.yaml
-8
View File
@@ -28,14 +28,6 @@ podSecurityContext:
securityContext:
privileged: false
# capabilities:
# add:
# - SYS_CAP_PTRACE
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000
service:
type: ClusterIP
charts/physims/charts/nr-ulschsim/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/nr-ulschsim/values.yaml
-12
View File
@@ -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
charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/nr-ulsim.3gpp/values.yaml
-12
View File
@@ -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
charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/nr-ulsim.mimo/values.yaml
-12
View File
@@ -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
charts/physims/charts/nr-ulsim.misc/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/nr-ulsim.misc/values.yaml
-12
View File
@@ -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
charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/nr-ulsim.sc-fdma/values.yaml
-12
View File
@@ -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
charts/physims/charts/polartest/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/polartest/values.yaml
-12
View File
@@ -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
charts/physims/charts/smallblocktest/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/smallblocktest/values.yaml
-12
View File
@@ -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
charts/physims/charts/ulsim/templates/job.yaml
+3
View File
@@ -4,6 +4,9 @@ metadata:
name: {{ .Chart.Name }}
spec:
template:
metadata:
labels:
app: physim
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
charts/physims/charts/ulsim/values.yaml
-12
View File
@@ -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
charts/physims/values.yaml
-43
View File
@@ -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:
ci-scripts/cls_physim1.py
+5 -4
View File
@@ -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)