Add whitelist of packages to bypass verification
Change-Id: I459f4a241496cf98bd0bb00f3843f2b58bb397c1 Signed-off-by: Ruslan Aliev <raliev@mirantis.com>
This commit is contained in:
parent
234248c272
commit
9ef6046f33
divingbell/templates
@ -282,9 +282,15 @@ while read -r name version; do
|
|||||||
fi
|
fi
|
||||||
done < <(apt-cache madison "${!package_info[@]}" | awk '!a[$1]++ {print $1 " " $3}')
|
done < <(apt-cache madison "${!package_info[@]}" | awk '!a[$1]++ {print $1 " " $3}')
|
||||||
|
|
||||||
|
{{- if hasKey .Values.conf.apt "whitelistpkgs" }}
|
||||||
|
whitelist=({{ join " " .Values.conf.apt.whitelistpkgs }})
|
||||||
|
{{- else }}
|
||||||
|
whitelist=()
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
for pkg in "${!package_info[@]}"; do
|
for pkg in "${!package_info[@]}"; do
|
||||||
read -r before after available < <(echo "${package_info[$pkg]}")
|
read -r before after available < <(echo "${package_info[$pkg]}")
|
||||||
if [[ "$after" != "N/A" && "$after" != "$available" ]]; then
|
if [[ "$after" != "N/A" && "$after" != "$available" && ! ${whitelist[*]} =~ "$pkg" ]]; then
|
||||||
log.ERROR "Package $pkg was not properly installed/upgraded, installed version $after, available version $available"
|
log.ERROR "Package $pkg was not properly installed/upgraded, installed version $after, available version $available"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
*/}}
|
*/}}
|
||||||
|
|
||||||
{{- define "readinessProbeTemplate" }}
|
{{- define "readinessProbeExecTemplate" }}
|
||||||
exec:
|
exec:
|
||||||
command:
|
command:
|
||||||
- cat
|
- cat
|
||||||
@ -58,7 +58,7 @@ spec:
|
|||||||
imagePullPolicy: {{ .Values.images.pull_policy }}
|
imagePullPolicy: {{ .Values.images.pull_policy }}
|
||||||
{{ tuple $envAll $envAll.Values.pod.resources.exec | include "helm-toolkit.snippets.kubernetes_resources" | indent 8 }}
|
{{ tuple $envAll $envAll.Values.pod.resources.exec | include "helm-toolkit.snippets.kubernetes_resources" | indent 8 }}
|
||||||
{{ dict "envAll" $envAll "application" "divingbell" "container" "exec" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 8 }}
|
{{ dict "envAll" $envAll "application" "divingbell" "container" "exec" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 8 }}
|
||||||
{{ dict "envAll" $envAll "component" "divingbell" "container" "exec" "type" "readiness" "probeTemplate" (include "readinessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 8 }}
|
{{ dict "envAll" $envAll "component" "divingbell" "container" "exec" "type" "readiness" "probeTemplate" (include "readinessProbeExecTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 8 }}
|
||||||
command:
|
command:
|
||||||
- /tmp/{{ $daemonset }}.sh
|
- /tmp/{{ $daemonset }}.sh
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
Loading…
Reference in New Issue
Block a user