From f4f1bb80546a866a43d53401689a2512342df846 Mon Sep 17 00:00:00 2001 From: Alexey Kostarev Date: Thu, 24 Oct 2024 17:21:55 +0500 Subject: [PATCH] Added support for latest tags in /latest catalog. --- fromNativeToPlatform.sh | 3 +++ fromNativeToRegistry.sh | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/fromNativeToPlatform.sh b/fromNativeToPlatform.sh index 584b83e..329dcb1 100755 --- a/fromNativeToPlatform.sh +++ b/fromNativeToPlatform.sh @@ -8,3 +8,6 @@ do mkdir -p ../$platform/$dir ../fromNativeToRegistry.sh registry.altlinux.org $platform $f > ../$platform/$dir/kube-flannel.yml done +mkdir -p ../$platform/latest +../fromNativeToRegistry.sh registry.altlinux.org $platform $f latest > ../$platform/latest/kube-flannel.yml + diff --git a/fromNativeToRegistry.sh b/fromNativeToRegistry.sh index 89c4b85..22ee069 100755 --- a/fromNativeToRegistry.sh +++ b/fromNativeToRegistry.sh @@ -2,11 +2,16 @@ function FlannelNameToAlt() { image=$1 + tag=$2 ifs=$IFS IFS=: set -- $image image=$1 - tag=$2 + if [ -z "$tag" ] + then + tag=$2 + fi + if [[ $1 =~ "flannel-cni-plugin" ]] then echo "$U7S_PLATFORM/flannel-cni-plugin:$tag" @@ -18,6 +23,7 @@ function FlannelNameToAlt() { function kubeflannelYMLToALT() { registry=$1 kubeFlannelFile=$2 + tag=$3 initCount=$(cat $kubeFlannelFile | yq -y 'select(.kind=="DaemonSet").spec.template.spec.initContainers' | yq 'length') @@ -27,14 +33,14 @@ function kubeflannelYMLToALT() { image=$(cat $kubeFlannelFile | yq -y 'select(.kind=="DaemonSet").spec.template.spec.initContainers['$i']' | yq -r '.image') - altImage="$registry/$(FlannelNameToAlt $image)" + altImage="$registry/$(FlannelNameToAlt $image $tag)" q+='| select(.kind=="DaemonSet").spec.template.spec.initContainers['$i'].image="'$altImage'"' let i=$i+1 done image=$(cat $kubeFlannelFile | yq -y 'select(.kind=="DaemonSet").spec.template.spec.containers[0]' | yq -r '.image') - altImage="$registry/$(FlannelNameToAlt $image)" + altImage="$registry/$(FlannelNameToAlt $image $tag)" q+='| select(.kind=="DaemonSet").spec.template.spec.containers[0].image="'$altImage'"' yq -y "$q" $kubeFlannelFile } @@ -43,4 +49,5 @@ function kubeflannelYMLToALT() { registry=$1 export U7S_PLATFORM="k8s-$2" file=$3 -kubeflannelYMLToALT $registry $file +tag=$4 +kubeflannelYMLToALT $registry $file $tag