2020{{- printf " %s :%s " $repository $tag -}}
2121{{- end -}}
2222
23+ {{- define " dotcms.version" -}}
24+ {{- if eq .Values.tag " 1.0.0-SNAPSHOT" -}}
25+ SNAPSHOT
26+ {{- else -}}
27+ {{- .Values.tag | regexFind " ^[^_]+" -}}
28+ {{- end -}}
29+ {{- end -}}
30+
2331{{- define " dotcms.env.fullName" -}}
2432{{- printf " %s -%s -%s " .Values.app .Values.customerName .Values.environment -}}
2533{{- end -}}
@@ -237,6 +245,26 @@ resources:
237245 limits:
238246 cpu: '{{ .Values.resources.limits.cpu }}'
239247 memory: {{ .Values.resources.limits.memory }}
248+ {{- if not .IsUpgradeJob }}
249+ ports:
250+ - containerPort: 8080
251+ name: api
252+ protocol: TCP
253+ - containerPort: 8081
254+ name: web-insecure
255+ protocol: TCP
256+ - containerPort: 8082
257+ name: web-secure
258+ protocol: TCP
259+ - containerPort: 5701
260+ name: hazelcast
261+ protocol: TCP
262+ {{- if or (.Values.management.enabled | default false) (.Values.prometheus.enabled | default false) }}
263+ - name: management
264+ containerPort: {{ .Values.management.port }}
265+ protocol: TCP
266+ {{- end }}
267+ {{- end }}
240268env:
241269 - name: DOT_SHUTDOWN_ON_STARTUP
242270 value: {{ .ShutdownOnStartupValue | quote }}
@@ -257,17 +285,6 @@ volumeMounts:
257285 name: {{ include " dotcms.secret.provider.className" . }}
258286 readOnly: true
259287 {{- end }}
260- {{- if not .IsUpgradeJob }}
261- ports:
262- - containerPort: 8080
263- name: api
264- - containerPort: 8081
265- name: web-insecure
266- - containerPort: 8082
267- name: web-secure
268- - containerPort: 5701
269- name: hazelcast
270- {{- end }}
271288{{- if .EnableProbes }}
272289startupProbe:
273290 httpGet:
438455 secretKeyRef:
439456 name: {{ first $secretArgs | quote }}
440457 key: {{ $secretArgs | last | quote }}
458+ {{- else if contains " FIELD:" $evaluatedValue }}
459+ {{- $fieldPath := $evaluatedValue | replace " FIELD:" " " }}
460+ - name: {{ $key }}
461+ valueFrom:
462+ fieldRef:
463+ fieldPath: {{ $fieldPath | quote }}
441464 {{- else }}
442465- name: {{ $key }}
443466 value: {{ $evaluatedValue | quote }}
@@ -490,6 +513,17 @@ TOMCAT_REDIS_SESSION_PASSWORD: "SECRET:{{ default "" (index $redis "password") }
490513TOMCAT_REDIS_SESSION_SSL_ENABLED: {{ default false (index $redis " sslEnabled" ) | quote }}
491514TOMCAT_REDIS_SESSION_PERSISTENT_POLICIES: {{ default " DEFAULT" (index $redis " sessionPersistentPolicies" ) | quote }}
492515{{- end }}
516+ {{- if .Values.prometheus.enabled | default false }}
517+ {{/*
518+ These are currently being calculated within the app
519+ DOT_METRICS_TAG_VER: {{ include "dotcms.version" . | quote }}
520+ DOT_METRICS_TAG_FULLNAME: {{ include "dotcms.env.fullName" . | quote }}
521+ DOT_METRICS_TAG_HOSTNAME: "FIELD:metadata.name"
522+ */ }}
523+ DOT_METRICS_TAG_APP: {{ .Values.app | quote }}
524+ DOT_METRICS_TAG_ENV: {{ .Values.environment | quote }}
525+ DOT_METRICS_TAG_CUST: {{ .Values.customerName | quote }}
526+ {{- end }}
493527
494528{{- end }}
495529
0 commit comments