starlingx/update
Code Issues Proposed changes

Update scripts that build k8s upgrade patches

Browse Source 
Updating scripts used to build k8s upgrade patches to include
additional required package (playbookconfig) and to handle
current kubernetes version (1.18.1).

Change-Id: I768466098842fa8d489bf91318ef2c29963ef446
Story: 2006781
Task: 38479
Signed-off-by: Bart Wensley <barton.wensley@windriver.com>
This commit is contained in:
Bart Wensley 2020-04-16 07:11:31 -05:00
parent 723838109b
commit df3aea5756
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
patch-scripts/kube-upgrade/make_kube_patch.sh
View File

@ -6,31 +6,36 @@
# #
# This builds 3 patches: # This builds 3 patches:
# SYSINV.1 contains sysinv components # PLATFORM_PATCH_1 contains sysinv and playbookconfig components
# KUBE.1 contains kubeadm # KUBE_PATCH_1 contains kubeadm
# KUBE.2 contains the remainder (node, client, master, etc..) # KUBE_PATCH_2 contains the remainder (node, client, master, etc..)
PATH=$MY_REPO/stx/stx-update/extras/scripts:$PATH PATH=$MY_REPO/stx/update/extras/scripts:$PATH
SYSINV_PATCH_1=SYSINV.1
KUBE_PATCH_1=KUBE.1
KUBE_PATCH_2=KUBE.2
SEMANTIC_PATH=`dirname "$0"` SEMANTIC_PATH=`dirname "$0"`
DIR=${MY_WORKSPACE}/std/rpmbuild/RPMS DIR=${MY_WORKSPACE}/std/rpmbuild/RPMS
SYSINV_SUFFIX=1.0-342.tis.x86_64.rpm
KUBE_SUFFIX=1.16.2-1.tis.1.x86_64.rpm
# Patch names
PLATFORM_PATCH_1=PLATFORM.1
KUBE_PATCH_1=KUBE.1
KUBE_PATCH_2=KUBE.2
# Add the following options to include restart scripts for sysinv:
# --controller ${DIR}/EXAMPLE_SYSINV-1.0-*.x86_64.rpm \
# --controller-worker ${DIR}/EXAMPLE_SYSINV-1.0-*.x86_64.rpm \
# --controller-worker-lowlatency ${DIR}/EXAMPLE_SYSINV-1.0-*.x86_64.rpm \
patch_build.sh \ patch_build.sh \
--id ${SYSINV_PATCH_1} \ --id ${PLATFORM_PATCH_1} \
--reboot-required=N \ --reboot-required=N \
${DIR}/sysinv-${SYSINV_SUFFIX} ${DIR}/sysinv-1.0-*.tis.x86_64.rpm \
${DIR}/playbookconfig-1.0-*.tis.x86_64.rpm
patch_build.sh \ patch_build.sh \
--id ${KUBE_PATCH_1} \ --id ${KUBE_PATCH_1} \
--reboot-required=N \ --reboot-required=N \
--pre-apply ${SEMANTIC_PATH}/KUBE.1.preapply \ --pre-apply ${SEMANTIC_PATH}/KUBE.1.preapply \
--pre-remove ${SEMANTIC_PATH}/KUBE.1.preremove \ --pre-remove ${SEMANTIC_PATH}/KUBE.1.preremove \
--req ${SYSINV_PATCH_1} \ --req ${PLATFORM_PATCH_1} \
${DIR}/kubernetes-kubeadm-${KUBE_SUFFIX} ${DIR}/kubernetes-kubeadm-1.18.1_upgrade-1.tis.*.x86_64.rpm
patch_build.sh \ patch_build.sh \
--id ${KUBE_PATCH_2} \ --id ${KUBE_PATCH_2} \
@ -38,7 +43,7 @@ patch_build.sh \
--pre-apply ${SEMANTIC_PATH}/KUBE.2.preapply \ --pre-apply ${SEMANTIC_PATH}/KUBE.2.preapply \
--pre-remove ${SEMANTIC_PATH}/KUBE.2.preremove \ --pre-remove ${SEMANTIC_PATH}/KUBE.2.preremove \
--req ${KUBE_PATCH_1} \ --req ${KUBE_PATCH_1} \
${DIR}/kubernetes-node-${KUBE_SUFFIX} \ ${DIR}/kubernetes-node-1.18.1_upgrade-1.tis.*.x86_64.rpm \
${DIR}/kubernetes-client-${KUBE_SUFFIX} \ ${DIR}/kubernetes-client-1.18.1_upgrade-1.tis.*.x86_64.rpm \
${DIR}/kubernetes-${KUBE_SUFFIX} \ ${DIR}/kubernetes-1.18.1_upgrade-1.tis.*.x86_64.rpm \
${DIR}/kubernetes-master-${KUBE_SUFFIX} ${DIR}/kubernetes-master-1.18.1_upgrade-1.tis.*.x86_64.rpm