From: Todd Malsbary Date: Fri, 13 May 2022 00:25:02 +0000 (-0700) Subject: Enable iSCSI in nodes for OpenEBS X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=icn.git;a=commitdiff_plain;h=508cc8809eb2fcf52e95af58b9d041657f6d361d Enable iSCSI in nodes for OpenEBS Signed-off-by: Todd Malsbary Change-Id: Ie57d0a5e54d46d5288117f65c62c674e11fe20a3 --- diff --git a/deploy/cluster/resources/enable_iscsi.sh b/deploy/cluster/resources/enable_iscsi.sh new file mode 100644 index 0000000..8be2763 --- /dev/null +++ b/deploy/cluster/resources/enable_iscsi.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -eux -o pipefail + +systemctl enable --now iscsid diff --git a/deploy/cluster/templates/kubeadmconfigtemplate.yaml b/deploy/cluster/templates/kubeadmconfigtemplate.yaml index 9250cc5..d9e2488 100644 --- a/deploy/cluster/templates/kubeadmconfigtemplate.yaml +++ b/deploy/cluster/templates/kubeadmconfigtemplate.yaml @@ -33,6 +33,8 @@ spec: # This must be done after kubeadm as the cabpk provider relies # on files in /var/run, which won't persist after a reboot - /usr/local/bin/set_kernel_cmdline.sh + # Required for OpenEBS support + - /usr/local/bin/enable_iscsi.sh files: {{ include "cluster.containerRuntime" .Values | indent 6 }} - path: /etc/systemd/system/containerd.service.d/override.conf @@ -46,6 +48,10 @@ spec: permissions: '0777' content: | {{ $.Files.Get "resources/set_kernel_cmdline.sh" | indent 10 }} + - path: /usr/local/bin/enable_iscsi.sh + permissions: '0777' + content: | +{{ $.Files.Get "resources/enable_iscsi.sh" | indent 10 }} {{- if eq .Values.cni "calico" }} - path: /etc/NetworkManager/conf.d/calico.conf content: | diff --git a/deploy/cluster/templates/kubeadmcontrolplane.yaml b/deploy/cluster/templates/kubeadmcontrolplane.yaml index 60134a4..f49f7a1 100644 --- a/deploy/cluster/templates/kubeadmcontrolplane.yaml +++ b/deploy/cluster/templates/kubeadmcontrolplane.yaml @@ -63,6 +63,8 @@ spec: # This must be done after kubeadm as the cabpk provider relies on # files in /var/run, which won't persist after a reboot - /usr/local/bin/set_kernel_cmdline.sh + # Required for OpenEBS support + - /usr/local/bin/enable_iscsi.sh files: {{ include "cluster.keepalived" .Values | indent 4 }} {{ include "cluster.containerRuntime" .Values | indent 4 }} @@ -81,6 +83,10 @@ spec: permissions: '0777' content: | {{ $.Files.Get "resources/set_kernel_cmdline.sh" | indent 8 }} + - path: /usr/local/bin/enable_iscsi.sh + permissions: '0777' + content: | +{{ $.Files.Get "resources/enable_iscsi.sh" | indent 8 }} {{- if eq .Values.cni "calico" }} - path: /etc/NetworkManager/conf.d/calico.conf content: |