diff --git a/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml b/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml index fdd12deb8f..4fbac5304d 100644 --- a/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml +++ b/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.dlsim100rbtm2}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.dlsim100rbtm2 }} {{- end }} diff --git a/charts/physims/charts/dlsim.basic/templates/job.yaml b/charts/physims/charts/dlsim.basic/templates/job.yaml index 3c6d726217..fac60059f2 100644 --- a/charts/physims/charts/dlsim.basic/templates/job.yaml +++ b/charts/physims/charts/dlsim.basic/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.dlsimbasic}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.dlsimbasic }} {{- end }} diff --git a/charts/physims/charts/ldpctest/templates/job.yaml b/charts/physims/charts/ldpctest/templates/job.yaml index 8a1060599f..4386d12a3e 100644 --- a/charts/physims/charts/ldpctest/templates/job.yaml +++ b/charts/physims/charts/ldpctest/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.ldpctest}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.ldpctest }} {{- end }} diff --git a/charts/physims/charts/nr-dlschsim/templates/job.yaml b/charts/physims/charts/nr-dlschsim/templates/job.yaml index e6d3b79f4a..6d1a798cb8 100644 --- a/charts/physims/charts/nr-dlschsim/templates/job.yaml +++ b/charts/physims/charts/nr-dlschsim/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.nrdlschsim}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.nrdlschsim }} {{- end }} diff --git a/charts/physims/charts/nr-dlsim.basic/templates/job.yaml b/charts/physims/charts/nr-dlsim.basic/templates/job.yaml index 2bf2a337c2..cbe1a9cbbc 100644 --- a/charts/physims/charts/nr-dlsim.basic/templates/job.yaml +++ b/charts/physims/charts/nr-dlsim.basic/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.nrdlsimbasic}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.nrdlsimbasic }} {{- end }} 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 bbf2ff30de..77f8dd061d 100644 --- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml +++ b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.nrdlsimdmrsptrs}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.nrdlsimdmrsptrs }} {{- end }} 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 55a0345da6..4625667c2b 100644 --- a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml +++ b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.nrdlsimmcsmimo}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.nrdlsimmcsmimo }} {{- end }} diff --git a/charts/physims/charts/nr-dlsim.offset/templates/job.yaml b/charts/physims/charts/nr-dlsim.offset/templates/job.yaml index 6dd3efb4cf..dabe3749e6 100644 --- a/charts/physims/charts/nr-dlsim.offset/templates/job.yaml +++ b/charts/physims/charts/nr-dlsim.offset/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.nrdlsimoffset}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.nrdlsimoffset }} {{- end }} diff --git a/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml index 44b795c764..c477116131 100644 --- a/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml +++ b/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.nrpbschsim106rb}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.nrpbschsim106rb }} {{- end }} diff --git a/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml index bc5eef2db0..70eeec8eda 100644 --- a/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml +++ b/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.nrpbchsim217rb}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.nrpbchsim217rb }} {{- end }} diff --git a/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml b/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml index a1c2afaa27..ab002fe664 100644 --- a/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml +++ b/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.nrpbchsim273rb}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }} {{- end }} diff --git a/charts/physims/charts/nr-pbchsim.scs/templates/job.yaml b/charts/physims/charts/nr-pbchsim.scs/templates/job.yaml index a8087a108a..74077c2dfb 100644 --- a/charts/physims/charts/nr-pbchsim.scs/templates/job.yaml +++ b/charts/physims/charts/nr-pbchsim.scs/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.nrpbchsim273rb}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }} {{- end }} diff --git a/charts/physims/charts/nr-prachsim/templates/job.yaml b/charts/physims/charts/nr-prachsim/templates/job.yaml index fa9b8952a0..050ee2f3bc 100644 --- a/charts/physims/charts/nr-prachsim/templates/job.yaml +++ b/charts/physims/charts/nr-prachsim/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.nrprachsim}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.nrprachsim }} {{- end }} diff --git a/charts/physims/charts/nr-psbchsim/templates/job.yaml b/charts/physims/charts/nr-psbchsim/templates/job.yaml index a302630d3b..04c6a410cb 100644 --- a/charts/physims/charts/nr-psbchsim/templates/job.yaml +++ b/charts/physims/charts/nr-psbchsim/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.nrpsbchsim}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.nrpsbchsim }} {{- end }} diff --git a/charts/physims/charts/nr-pucchsim/templates/job.yaml b/charts/physims/charts/nr-pucchsim/templates/job.yaml index 21f5e9a36a..d9081bb926 100644 --- a/charts/physims/charts/nr-pucchsim/templates/job.yaml +++ b/charts/physims/charts/nr-pucchsim/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.nrpucchsim}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.nrpucchsim }} {{- end }} diff --git a/charts/physims/charts/nr-ulschsim/templates/job.yaml b/charts/physims/charts/nr-ulschsim/templates/job.yaml index 57d19d41c6..b75963898b 100644 --- a/charts/physims/charts/nr-ulschsim/templates/job.yaml +++ b/charts/physims/charts/nr-ulschsim/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.nrulschsim}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.nrulschsim }} {{- end }} diff --git a/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml b/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml index a0cf170d8d..6b9d4a1a39 100644 --- a/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml +++ b/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.nrulsim3gpp}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.nrulsim3gpp }} {{- end }} diff --git a/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml b/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml index e37691a938..337329a6fe 100644 --- a/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml +++ b/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.nrulsimmimo}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.nrulsimmimo }} {{- end }} diff --git a/charts/physims/charts/nr-ulsim.misc/templates/job.yaml b/charts/physims/charts/nr-ulsim.misc/templates/job.yaml index ec59b4a3b3..8a2feff183 100644 --- a/charts/physims/charts/nr-ulsim.misc/templates/job.yaml +++ b/charts/physims/charts/nr-ulsim.misc/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.nrulsimmisc}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.nrulsimmisc }} {{- end }} 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 d3b84cb369..6915790c2c 100644 --- a/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml +++ b/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} ports: @@ -39,6 +44,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.nrulsimscfdma}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.nrulsimscfdma }} {{- end }} diff --git a/charts/physims/charts/polartest/templates/job.yaml b/charts/physims/charts/polartest/templates/job.yaml index 1b1d7d608e..e3850514d7 100644 --- a/charts/physims/charts/polartest/templates/job.yaml +++ b/charts/physims/charts/polartest/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.polartest}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.polartest }} {{- end }} diff --git a/charts/physims/charts/smallblocktest/templates/job.yaml b/charts/physims/charts/smallblocktest/templates/job.yaml index 70d9bd653f..1b695fe670 100644 --- a/charts/physims/charts/smallblocktest/templates/job.yaml +++ b/charts/physims/charts/smallblocktest/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.smallblocktest}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.smallblocktest }} {{- end }} diff --git a/charts/physims/charts/ulsim/templates/job.yaml b/charts/physims/charts/ulsim/templates/job.yaml index 1ce4cf21f4..ca6c1be16c 100644 --- a/charts/physims/charts/ulsim/templates/job.yaml +++ b/charts/physims/charts/ulsim/templates/job.yaml @@ -18,6 +18,11 @@ spec: - name: physim image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.global.resources.define}} + resources: + requests: + cpu: {{ .Values.global.resources.requests.cpu | quote }} + {{- end}} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} env: @@ -37,6 +42,6 @@ spec: nodeSelector: {{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- end }} - {{- if .Values.global.nodeName.ulsim}} + {{- if .Values.global.nodeName}} nodeName: {{ .Values.global.nodeName.ulsim }} {{- end }} diff --git a/charts/physims/values.yaml b/charts/physims/values.yaml index a4e0ffecd4..60a685179c 100644 --- a/charts/physims/values.yaml +++ b/charts/physims/values.yaml @@ -1,41 +1,21 @@ # Default values for oai-physim. # This is a YAML-formatted file. # Declare variables to be passed into your templates. - global: serviceAccountName: oai-physim-sa namespace: "OAICICD_PROJECT" - image: + image: registry: local repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran/oai-physim version: TAG # pullPolicy: IfNotPresent or Never or Always pullPolicy: Always # removing the node selector - nodeSelector: {} - # It is not a good way of assigning pods to the nodes: this way we bypass the scheduler. At the moment we don't provide the resource information of these pods. - # Therefore, Openshift assigns the pods to the same node because it thinks the pods don't consume much resources. This isn't the case, they consume a lot of resources. - nodeName: - dlsim100rbtm2: acamas - dlsimbasic: acamas - ldpctest: acamas - nrdlschsim: acamas - nrdlsimbasic: acamas - nrdlsimdmrsptrs: acamas - nrdlsimmcsmimo: acamas - nrdlsimoffset: dedale - nrpbschsim106rb: dedale - nrpbchsim217rb: dedale - nrpbchsim273rb: dedale - nrpbchsimscs: dedale - nrpsbchsim: dedale - nrprachsim: dedale - nrpucchsim: dedale - nrulschsim: demophon - nrulsim3gpp: demophon - nrulsimmimo: demophon - nrulsimmisc: demophon - nrulsimscfdma: demophon - polartest: demophon - smallblocktest: demophon - ulsim: demophon + # will place on two nodes intel 3rd gen and 5th gen with RT kernel + nodeSelector: + type: ran + nodeName: '' + resources: + define: false + requests: + cpu: 1.5 diff --git a/ci-scripts/ci_infra.yaml b/ci-scripts/ci_infra.yaml index d651f2723c..0a4e78e4b5 100644 --- a/ci-scripts/ci_infra.yaml +++ b/ci-scripts/ci_infra.yaml @@ -64,21 +64,21 @@ adb_ue_2: oc-cn5g: Host: avra Namespace: "oaicicd-core-for-ci-ran" - CNPath: "/opt/oai-cn5g-fed-develop-2024-april-00102" + CNPath: "/opt/oai-cn5g-fed-develop-2025-jan" NetworkScript: echo "inet 172.21.6.102" RunIperf3Server: False oc-cn5g-20897: Host: cacofonix Namespace: "oaicicd-core-for-fhi72" - CNPath: "/opt/oai-cn5g-fed-develop-2024-april-20897" + CNPath: "/opt/oai-cn5g-fed-develop-2025-jan" NetworkScript: echo "inet 172.21.6.105" RunIperf3Server: False oc-cn5g-20897-aerial2: Host: aerial2 - Namespace: "oaicicd-core-for-fhi72" - CNPath: "/opt/oai-cn5g-fed-develop-2024-april-20897" + Namespace: "oaicicd-core-for-nvidia-aerial" + CNPath: "/opt/oai-cn5g-fed-develop-2025-jan" NetworkScript: echo "inet 172.21.6.105" RunIperf3Server: False diff --git a/ci-scripts/cls_cluster.py b/ci-scripts/cls_cluster.py index 77ec791af2..d69e3177b6 100644 --- a/ci-scripts/cls_cluster.py +++ b/ci-scripts/cls_cluster.py @@ -129,19 +129,9 @@ class Cluster: def _recreate_entitlements(self): # recreating entitlements, don't care if deletion fails - self.cmd.run('oc delete secret etc-pki-entitlement') - ret = self.cmd.run('ls /etc/pki/entitlement/???????????????????.pem | tail -1', silent=True) - regres1 = re.search(r"/etc/pki/entitlement/[0-9]+.pem", ret.stdout) - ret = self.cmd.run('ls /etc/pki/entitlement/???????????????????-key.pem | tail -1', silent=True) - regres2 = re.search(r"/etc/pki/entitlement/[0-9]+-key.pem", ret.stdout) - if regres1 is None or regres2 is None: - logging.error("could not find entitlements") - return False - file1 = regres1.group(0) - file2 = regres2.group(0) - ret = self.cmd.run(f'oc create secret generic etc-pki-entitlement --from-file {file1} --from-file {file2}') - regres = re.search(r"secret/etc-pki-entitlement created", ret.stdout) - if ret.returncode != 0 or regres is None: + self.cmd.run(f'oc delete secret etc-pki-entitlement') + ret = self.cmd.run(f"oc get secret etc-pki-entitlement -n openshift-config-managed -o json | jq 'del(.metadata.resourceVersion)' | jq 'del(.metadata.creationTimestamp)' | jq 'del(.metadata.uid)' | jq 'del(.metadata.namespace)' | oc create -f -", silent=True) + if ret.returncode != 0: logging.error("could not create secret/etc-pki-entitlement") return False return True diff --git a/ci-scripts/cls_physim1.py b/ci-scripts/cls_physim1.py index 5e803b27e7..97aa9d6dff 100644 --- a/ci-scripts/cls_physim1.py +++ b/ci-scripts/cls_physim1.py @@ -137,9 +137,7 @@ class PhySim: logging.debug(f'\u001B[1m Now using project {ocProjectName}\u001B[0m') # Using helm charts deployment - mySSH.command(f'grep -rl OAICICD_PROJECT ./charts/ | xargs sed -i -e "s#OAICICD_PROJECT#{ocProjectName}#"', '\$', 30) - mySSH.command(f'sed -i -e "s#TAG#{imageTag}#g" ./charts/physims/values.yaml', '\$', 6) - mySSH.command('helm install physim ./charts/physims/ --wait 2>&1 | tee -a cmake_targets/log/physim_helm_summary.txt', '\$', 30) + mySSH.command(f'helm install physim ./charts/physims/ --set global.image.version={imageTag} --wait 2>&1 | tee -a cmake_targets/log/physim_helm_summary.txt', '\$', 30) if mySSH.getBefore().count('STATUS: deployed') == 0: logging.error('\u001B[1m Deploying PhySim Failed using helm chart on OC Cluster\u001B[0m') mySSH.command('helm uninstall physim | tee -a cmake_targets/log/physim_helm_summary.txt 2>&1', '\$', 30) diff --git a/ci-scripts/xml_files/container_sa_fhi72_metanoia_up2_2x2.xml b/ci-scripts/xml_files/container_sa_fhi72_metanoia_up2_2x2.xml index d75aa25120..197a75e6b2 100644 --- a/ci-scripts/xml_files/container_sa_fhi72_metanoia_up2_2x2.xml +++ b/ci-scripts/xml_files/container_sa_fhi72_metanoia_up2_2x2.xml @@ -53,11 +53,10 @@ - Pull_Cluster_Image - Pull Images from Cluster - oaicicd-ran + Pull_Local_Registry + Pull Images from Local Registry + 0 oai-gnb-fhi72 - cacofonix diff --git a/openshift/README.md b/openshift/README.md index e5a2b00bdd..07470a38df 100644 --- a/openshift/README.md +++ b/openshift/README.md @@ -49,11 +49,11 @@ will need `etc-pki-entitlement` inside the container image. To import `etc-pki-entitlement` in your project follow this [guide](https://docs.openshift.com/container-platform/4.14/cicd/builds/running-entitled-builds.html#builds-source-secrets-entitlements_running-entitled-builds) -In case you have difficulties in following it then you can copy the -certificates from an RHEL9 host +You can do it as a kubeadmin/system admin user or you should have the rights +to read secrets from `openshift-config-managed` project ```bash -oc create secret generic etc-pki-entitlement --from-file /etc/pki/entitlement/{NUMBER_ON_YOUR_COMPUTER}.pem --from-file /etc/pki/entitlement/{NUMBER_ON_YOUR_COMPUTER}-key.pem +oc get secret etc-pki-entitlement -n openshift-config-managed -o json | jq 'del(.metadata.resourceVersion)' | jq 'del(.metadata.creationTimestamp)' | jq 'del(.metadata.uid)' | jq 'del(.metadata.namespace)' | oc create -f - ``` # 2. Build of `base` shared image diff --git a/openshift/oai-clang-bc.yaml b/openshift/oai-clang-bc.yaml index ee7a760fcc..aff54929c5 100644 --- a/openshift/oai-clang-bc.yaml +++ b/openshift/oai-clang-bc.yaml @@ -19,15 +19,16 @@ # * contact@openairinterface.org # */ #--------------------------------------------------------------------- - +## Resource consumption 3Gi, 5CPU kind: BuildConfig apiVersion: build.openshift.io/v1 metadata: name: "oai-clang" + namespace: "oaicicd-ran" spec: - runPolicy: "Serial" nodeSelector: - kubernetes.io/hostname: demophon + node-role.kubernetes.io/fhi72-intel3: "" + runPolicy: "Serial" source: type: "Binary" strategy: diff --git a/openshift/oai-enb-bc.yaml b/openshift/oai-enb-bc.yaml index 215faf675e..11f20c4da6 100644 --- a/openshift/oai-enb-bc.yaml +++ b/openshift/oai-enb-bc.yaml @@ -25,6 +25,15 @@ apiVersion: build.openshift.io/v1 metadata: name: "oai-enb" spec: + resources: + limits: + cpu: 2 + memory: 2Gi + requests: + cpu: 0.5 + memory: 1Gi + nodeSelector: + node-role.kubernetes.io/ran-build: "" runPolicy: "Serial" source: type: "Binary" diff --git a/openshift/oai-gnb-aw2s-bc.yaml b/openshift/oai-gnb-aw2s-bc.yaml index 2edbd73f87..520b442982 100644 --- a/openshift/oai-gnb-aw2s-bc.yaml +++ b/openshift/oai-gnb-aw2s-bc.yaml @@ -24,7 +24,17 @@ kind: BuildConfig apiVersion: build.openshift.io/v1 metadata: name: "oai-gnb-aw2s" + namespace: "oaicicd-ran" spec: + resources: + limits: + cpu: 2 + memory: 2Gi + requests: + cpu: 0.5 + memory: 1Gi + nodeSelector: + node-role.kubernetes.io/fhi72: "" runPolicy: "Serial" source: type: "Binary" diff --git a/openshift/oai-gnb-bc.yaml b/openshift/oai-gnb-bc.yaml index 693cbfd784..29314f2b50 100644 --- a/openshift/oai-gnb-bc.yaml +++ b/openshift/oai-gnb-bc.yaml @@ -24,7 +24,17 @@ kind: BuildConfig apiVersion: build.openshift.io/v1 metadata: name: "oai-gnb" + namespace: "oaicicd-ran" spec: + resources: + limits: + cpu: 2 + memory: 2Gi + requests: + cpu: 0.5 + memory: 1Gi + nodeSelector: + node-role.kubernetes.io/ran-build: "" runPolicy: "Serial" source: type: "Binary" diff --git a/openshift/oai-gnb-fhi72-bc.yaml b/openshift/oai-gnb-fhi72-bc.yaml index 0e453ae379..14b9e7fbbe 100644 --- a/openshift/oai-gnb-fhi72-bc.yaml +++ b/openshift/oai-gnb-fhi72-bc.yaml @@ -24,7 +24,17 @@ kind: BuildConfig apiVersion: build.openshift.io/v1 metadata: name: "oai-gnb-fhi72" + namespace: "oaicicd-ran" spec: + resources: + limits: + cpu: 2 + memory: 2Gi + requests: + cpu: 0.5 + memory: 1Gi + nodeSelector: + node-role.kubernetes.io/fhi72: "" runPolicy: "Serial" source: type: "Binary" diff --git a/openshift/oai-lte-ue-bc.yaml b/openshift/oai-lte-ue-bc.yaml index 7bb41456c6..b2db0b5085 100644 --- a/openshift/oai-lte-ue-bc.yaml +++ b/openshift/oai-lte-ue-bc.yaml @@ -24,7 +24,17 @@ kind: BuildConfig apiVersion: build.openshift.io/v1 metadata: name: "oai-lte-ue" + namespace: "oaicicd-ran" spec: + resources: + limits: + cpu: 2 + memory: 2Gi + requests: + cpu: 0.5 + memory: 1Gi + nodeSelector: + node-role.kubernetes.io/ran-base: "" runPolicy: "Serial" source: type: "Binary" diff --git a/openshift/oai-nr-cuup-bc.yaml b/openshift/oai-nr-cuup-bc.yaml index eceff70348..fec59b1d5a 100644 --- a/openshift/oai-nr-cuup-bc.yaml +++ b/openshift/oai-nr-cuup-bc.yaml @@ -25,6 +25,15 @@ apiVersion: build.openshift.io/v1 metadata: name: "oai-nr-cuup" spec: + resources: + limits: + cpu: 1 + memory: 2Gi + requests: + cpu: 0.5 + memory: 1Gi + nodeSelector: + node-role.kubernetes.io/ran-build: "" runPolicy: "Serial" source: type: "Binary" diff --git a/openshift/oai-nr-ue-bc.yaml b/openshift/oai-nr-ue-bc.yaml index 4c4bf3f9c6..0a04fbb7c8 100644 --- a/openshift/oai-nr-ue-bc.yaml +++ b/openshift/oai-nr-ue-bc.yaml @@ -24,7 +24,17 @@ kind: BuildConfig apiVersion: build.openshift.io/v1 metadata: name: "oai-nr-ue" + namespace: "oaicicd-ran" spec: + resources: + limits: + cpu: 2 + memory: 2Gi + requests: + cpu: 0.5 + memory: 1Gi + nodeSelector: + node-role.kubernetes.io/fhi72-intel3: "" runPolicy: "Serial" source: type: "Binary" diff --git a/openshift/oai-physim-bc.yaml b/openshift/oai-physim-bc.yaml index 74be4013c2..f564c1905a 100644 --- a/openshift/oai-physim-bc.yaml +++ b/openshift/oai-physim-bc.yaml @@ -19,15 +19,17 @@ # * contact@openairinterface.org # */ #--------------------------------------------------------------------- +### Resource consumption 12Gi, 19CPU (SMT ENABLED) kind: BuildConfig apiVersion: build.openshift.io/v1 metadata: name: "oai-physim" + namespace: "oaicicd-ran" spec: runPolicy: "Serial" nodeSelector: - kubernetes.io/hostname: demophon + node-role.kubernetes.io/ran-base: "" source: type: "Binary" strategy: diff --git a/openshift/ran-base-bc.yaml b/openshift/ran-base-bc.yaml index 5707e64abb..77b6238c60 100644 --- a/openshift/ran-base-bc.yaml +++ b/openshift/ran-base-bc.yaml @@ -20,14 +20,16 @@ # */ #--------------------------------------------------------------------- # +### Resource consumption 16Gi, 10CPU kind: BuildConfig apiVersion: build.openshift.io/v1 metadata: name: "ran-base" + namespace: "oaicicd-ran" spec: runPolicy: "Serial" nodeSelector: - kubernetes.io/hostname: acamas + node-role.kubernetes.io/ran-base: "" source: type: "Binary" secrets: diff --git a/openshift/ran-build-bc.yaml b/openshift/ran-build-bc.yaml index 93479a59f6..210ae2dbde 100644 --- a/openshift/ran-build-bc.yaml +++ b/openshift/ran-build-bc.yaml @@ -20,14 +20,16 @@ # */ #--------------------------------------------------------------------- # +### Resource consumption 2.5Gi, 17CPU (SMT ENABLED) kind: BuildConfig apiVersion: build.openshift.io/v1 metadata: name: "ran-build" + namespace: "oaicicd-ran" spec: runPolicy: "Serial" nodeSelector: - kubernetes.io/hostname: acamas + node-role.kubernetes.io/ran-build: "" source: type: "Binary" strategy: diff --git a/openshift/ran-build-fhi72-bc.yaml b/openshift/ran-build-fhi72-bc.yaml index 35a7bd55b0..be75b4ebb2 100644 --- a/openshift/ran-build-fhi72-bc.yaml +++ b/openshift/ran-build-fhi72-bc.yaml @@ -20,14 +20,16 @@ # */ #--------------------------------------------------------------------- # +### Resource consumption 5Gi, 9CPU kind: BuildConfig apiVersion: build.openshift.io/v1 metadata: name: "ran-build-fhi72" + namespace: "oaicicd-ran" spec: runPolicy: "Serial" nodeSelector: - kubernetes.io/hostname: demophon + node-role.kubernetes.io/fhi72: "" source: type: "Binary" strategy: