chore(ci): update helm charts for new openshift cluster

- remove sub-chart name from global.nodeName to allow removing
global nodeName parameter
Signed-off-by: Sagar Arora <sagar.arora@openairinterface.org>

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

charts/physims/values.yaml

 # 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