Commit 50f2c2a3 authored by Sagar Arora's avatar Sagar Arora

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: default avatarSagar Arora <sagar.arora@openairinterface.org>
parent 10e07bc6
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.dlsim100rbtm2}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.dlsim100rbtm2 }} nodeName: {{ .Values.global.nodeName.dlsim100rbtm2 }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.dlsimbasic}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.dlsimbasic }} nodeName: {{ .Values.global.nodeName.dlsimbasic }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.ldpctest}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.ldpctest }} nodeName: {{ .Values.global.nodeName.ldpctest }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.nrdlschsim}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.nrdlschsim }} nodeName: {{ .Values.global.nodeName.nrdlschsim }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.nrdlsimbasic}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.nrdlsimbasic }} nodeName: {{ .Values.global.nodeName.nrdlsimbasic }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.nrdlsimdmrsptrs}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.nrdlsimdmrsptrs }} nodeName: {{ .Values.global.nodeName.nrdlsimdmrsptrs }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.nrdlsimmcsmimo}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.nrdlsimmcsmimo }} nodeName: {{ .Values.global.nodeName.nrdlsimmcsmimo }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.nrdlsimoffset}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.nrdlsimoffset }} nodeName: {{ .Values.global.nodeName.nrdlsimoffset }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.nrpbschsim106rb}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.nrpbschsim106rb }} nodeName: {{ .Values.global.nodeName.nrpbschsim106rb }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.nrpbchsim217rb}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.nrpbchsim217rb }} nodeName: {{ .Values.global.nodeName.nrpbchsim217rb }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.nrpbchsim273rb}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }} nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.nrpbchsim273rb}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }} nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.nrprachsim}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.nrprachsim }} nodeName: {{ .Values.global.nodeName.nrprachsim }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.nrpsbchsim}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.nrpsbchsim }} nodeName: {{ .Values.global.nodeName.nrpsbchsim }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.nrpucchsim}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.nrpucchsim }} nodeName: {{ .Values.global.nodeName.nrpucchsim }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.nrulschsim}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.nrulschsim }} nodeName: {{ .Values.global.nodeName.nrulschsim }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.nrulsim3gpp}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.nrulsim3gpp }} nodeName: {{ .Values.global.nodeName.nrulsim3gpp }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.nrulsimmimo}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.nrulsimmimo }} nodeName: {{ .Values.global.nodeName.nrulsimmimo }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.nrulsimmisc}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.nrulsimmisc }} nodeName: {{ .Values.global.nodeName.nrulsimmisc }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
ports: ports:
...@@ -39,6 +44,6 @@ spec: ...@@ -39,6 +44,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.nrulsimscfdma}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.nrulsimscfdma }} nodeName: {{ .Values.global.nodeName.nrulsimscfdma }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.polartest}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.polartest }} nodeName: {{ .Values.global.nodeName.polartest }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.smallblocktest}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.smallblocktest }} nodeName: {{ .Values.global.nodeName.smallblocktest }}
{{- end }} {{- end }}
...@@ -18,6 +18,11 @@ spec: ...@@ -18,6 +18,11 @@ spec:
- name: physim - name: physim
image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}" image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.global.resources.define}}
resources:
requests:
cpu: {{ .Values.global.resources.requests.cpu | quote }}
{{- end}}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
env: env:
...@@ -37,6 +42,6 @@ spec: ...@@ -37,6 +42,6 @@ spec:
nodeSelector: nodeSelector:
{{- toYaml .Values.global.nodeSelector | nindent 12 }} {{- toYaml .Values.global.nodeSelector | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.global.nodeName.ulsim}} {{- if .Values.global.nodeName}}
nodeName: {{ .Values.global.nodeName.ulsim }} nodeName: {{ .Values.global.nodeName.ulsim }}
{{- end }} {{- end }}
# Default values for oai-physim. # Default values for oai-physim.
# This is a YAML-formatted file. # This is a YAML-formatted file.
# Declare variables to be passed into your templates. # Declare variables to be passed into your templates.
global: global:
serviceAccountName: oai-physim-sa serviceAccountName: oai-physim-sa
namespace: "OAICICD_PROJECT" namespace: "OAICICD_PROJECT"
...@@ -12,30 +11,11 @@ global: ...@@ -12,30 +11,11 @@ global:
# pullPolicy: IfNotPresent or Never or Always # pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always pullPolicy: Always
# removing the node selector # removing the node selector
nodeSelector: {} # will place on two nodes intel 3rd gen and 5th gen with RT kernel
# 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. nodeSelector:
# 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. type: ran
nodeName: nodeName: ''
dlsim100rbtm2: acamas resources:
dlsimbasic: acamas define: false
ldpctest: acamas requests:
nrdlschsim: acamas cpu: 1.5
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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment