Compare commits
8 Commits
31a853afb2
...
e233adfec2
Author | SHA256 | Date | |
---|---|---|---|
e233adfec2
|
|||
8617c36789
|
|||
aa56c231d4
|
|||
29dd8dda17
|
|||
6012f480b0
|
|||
110a7b1f7c
|
|||
343fcd24b7
|
|||
03d7a39ead
|
@@ -6,6 +6,7 @@ metadata:
|
||||
control-plane: controller-manager
|
||||
name: {{ include "baremetal-operator.fullname" . }}-controller-manager-metrics-service
|
||||
spec:
|
||||
ipFamilyPolicy: PreferDualStack
|
||||
ports:
|
||||
- name: https
|
||||
port: 8443
|
||||
|
@@ -5,6 +5,7 @@ metadata:
|
||||
{{- include "baremetal-operator.labels" . | nindent 4 }}
|
||||
name: {{ include "baremetal-operator.fullname" . }}-webhook-service
|
||||
spec:
|
||||
ipFamilyPolicy: PreferDualStack
|
||||
ports:
|
||||
- port: 443
|
||||
targetPort: 9443
|
||||
|
@@ -97,6 +97,20 @@ Get the formatted "External" hostname or IP address
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
Get the command to use for Liveness and Readiness probes
|
||||
*/}}
|
||||
{{- define "ironic.probeCommand" }}
|
||||
{{- $host := "127.0.0.1" }}
|
||||
{{- if eq .Values.listenOnAll false }}
|
||||
{{- $host = coalesce .Values.global.ironicIP .Values.global.provisioningIP .Values.global.provisioningHostname }}
|
||||
{{- if regexMatch ".*:.*" $host }}
|
||||
{{- $host = print "[" $host "]" }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- print "curl -sSfk https://" $host ":6385" }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
Create the subjectAltNames section to be set on the Certificate
|
||||
*/}}
|
||||
|
@@ -27,7 +27,7 @@ data:
|
||||
{{- $protocol = "http" }}
|
||||
{{- end }}
|
||||
{{- if .Values.global.externalHttpHost }}
|
||||
IRONIC_EXTERNAL_HTTP_URL: {{ $protocol }}://{{ (include "ironic.externalHttpHost" .) }}:6385
|
||||
IRONIC_EXTERNAL_HTTP_URL: {{ $protocol }}://{{ include "ironic.externalHttpHost" . }}:6385
|
||||
{{- end }}
|
||||
DEPLOY_ARCHITECTURE: {{ $deployArch }}
|
||||
ENABLE_PXE_BOOT: "{{ .Values.global.enable_pxe_boot }}"
|
||||
|
@@ -42,7 +42,7 @@ spec:
|
||||
name: ironic
|
||||
livenessProbe:
|
||||
exec:
|
||||
command: ["sh", "-c", "curl -sSfk https://127.0.0.1:6385"]
|
||||
command: ["sh", "-c", "{{ include "ironic.probeCommand" . }}"]
|
||||
failureThreshold: 10
|
||||
initialDelaySeconds: 30
|
||||
periodSeconds: 30
|
||||
@@ -60,7 +60,7 @@ spec:
|
||||
{{- end }}
|
||||
readinessProbe:
|
||||
exec:
|
||||
command: ["sh", "-c", "curl -sSfk https://127.0.0.1:6385"]
|
||||
command: ["sh", "-c", "{{ include "ironic.probeCommand" . }}"]
|
||||
failureThreshold: 10
|
||||
initialDelaySeconds: 30
|
||||
periodSeconds: 30
|
||||
|
@@ -10,6 +10,7 @@ metadata:
|
||||
{{- end }}
|
||||
spec:
|
||||
type: {{ .Values.service.type }}
|
||||
ipFamilyPolicy: PreferDualStack
|
||||
ports:
|
||||
{{- $enableTLS := .Values.global.enable_tls }}
|
||||
{{- $enableVMediaTLS := .Values.global.enable_vmedia_tls }}
|
||||
|
@@ -58,7 +58,7 @@ global:
|
||||
|
||||
replicaCount: 1
|
||||
|
||||
listenOnAll: "true"
|
||||
listenOnAll: true
|
||||
|
||||
images:
|
||||
ironic:
|
||||
|
@@ -5,10 +5,11 @@ metadata:
|
||||
labels:
|
||||
{{- include "mariadb.labels" . | nindent 4 }}
|
||||
spec:
|
||||
ipFamilyPolicy: PreferDualStack
|
||||
type: {{ .Values.service.type }}
|
||||
selector:
|
||||
{{- include "mariadb.selectorLabels" . | nindent 4 }}
|
||||
ports:
|
||||
{{- with .Values.service.ports }}
|
||||
{{- toYaml . | nindent 2 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
@@ -5,6 +5,7 @@ metadata:
|
||||
labels:
|
||||
{{- include "media.labels" . | nindent 4 }}
|
||||
spec:
|
||||
ipFamilyPolicy: PreferDualStack
|
||||
type: {{ .Values.service.type }}
|
||||
ports:
|
||||
- port: {{ .Values.service.port }}
|
||||
|
Reference in New Issue
Block a user