428cda6e33
This change updates the ceph.conf update job as follows: * renames it to "ceph-ns-client-ceph-config" * consolidates some Roles and RoleBindings This change also moves the logic of figuring out the mon_host addresses from the kubernetes endpoint object to a snippet, which is used by the various bash scripts that need it. In particular, this logic is added to the rbd-pool job, so that it does not depend on the ceph-ns-client-ceph-config job. Note that the ceph.conf update job has a race with several other jobs and pods that mount ceph.conf from the ceph-client-etc configmap while it is being modified. Depending on the restartPolicy, pods (such as the one created for the ceph-rbd-pool job) may linger in StartError state. This is not addressed here. Change-Id: Id4fdbfa9cdfb448eb7bc6b71ac4c67010f34fc2c
69 lines
2.1 KiB
Smarty
69 lines
2.1 KiB
Smarty
{{- define "ceph-client.snippets.mon_host_from_k8s_ep" -}}
|
|
{{/*
|
|
|
|
Inserts a bash function definition mon_host_from_k8s_ep() which can be used
|
|
to construct a mon_hosts value from the given namespaced endpoint.
|
|
|
|
Usage (e.g. in _script.sh.tpl):
|
|
#!/bin/bash
|
|
|
|
: "${NS:=ceph}"
|
|
: "${EP:=ceph-mon-discovery}"
|
|
|
|
{{ include "ceph-client.snippets.mon_host_from_k8s_ep" . }}
|
|
|
|
MON_HOST=$(mon_host_from_k8s_ep "$NS" "$EP")
|
|
|
|
if [ -z "$MON_HOST" ]; then
|
|
# deal with failure
|
|
else
|
|
sed -i -e "s/^mon_host = /mon_host = $MON_HOST/" /etc/ceph/ceph.conf
|
|
fi
|
|
*/}}
|
|
{{`
|
|
# Construct a mon_hosts value from the given namespaced endpoint
|
|
# IP x.x.x.x with port p named "mon-msgr2" will appear as [v2:x.x.x.x/p/0]
|
|
# IP x.x.x.x with port q named "mon" will appear as [v1:x.x.x.x/q/0]
|
|
# IP x.x.x.x with ports p and q will appear as [v2:x.x.x.x/p/0,v1:x.x.x.x/q/0]
|
|
# The entries for all IPs will be joined with commas
|
|
mon_host_from_k8s_ep() {
|
|
local ns=$1
|
|
local ep=$2
|
|
|
|
if [ -z "$ns" ] || [ -z "$ep" ]; then
|
|
return 1
|
|
fi
|
|
|
|
# We don't want shell expansion for the go-template expression
|
|
# shellcheck disable=SC2016
|
|
kubectl get endpoints -n "$ns" "$ep" -o go-template='
|
|
{{- $sep := "" }}
|
|
{{- range $_,$s := .subsets }}
|
|
{{- $v2port := 0 }}
|
|
{{- $v1port := 0 }}
|
|
{{- range $_,$port := index $s "ports" }}
|
|
{{- if (eq $port.name "mon-msgr2") }}
|
|
{{- $v2port = $port.port }}
|
|
{{- else if (eq $port.name "mon") }}
|
|
{{- $v1port = $port.port }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- range $_,$address := index $s "addresses" }}
|
|
{{- $v2endpoint := printf "v2:%s:%d/0" $address.ip $v2port }}
|
|
{{- $v1endpoint := printf "v1:%s:%d/0" $address.ip $v1port }}
|
|
{{- if (and $v2port $v1port) }}
|
|
{{- printf "%s[%s,%s]" $sep $v2endpoint $v1endpoint }}
|
|
{{- $sep = "," }}
|
|
{{- else if $v2port }}
|
|
{{- printf "%s[%s]" $sep $v2endpoint }}
|
|
{{- $sep = "," }}
|
|
{{- else if $v1port }}
|
|
{{- printf "%s[%s]" $sep $v1endpoint }}
|
|
{{- $sep = "," }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end }}'
|
|
}
|
|
`}}
|
|
{{- end -}}
|