update

image-build

@@ -117,9 +117,12 @@ function api_get_source_package_version_from_task() {
 	echo "$version"
 }
 
+function string_count() {
+	local substring="$1"
+	awk -F"$substring" '{ print NF-1 }'
+}
 
 case "$image" in
-	'coredns' | \
 	'etcd' | \
 	'flannel' | \
 	'flannel-cni-plugin' | \
@@ -145,28 +148,29 @@ case "$image" in
 
 			additional_options+="--tasks $tasks_file "
 		else
-			# temporary, why does rdb return 'not found'?
+			version="$(api_get_source_package_version "$branch" "$package")"
-			case "$image" in
+			[ "$?" -eq 0 ] || handle_error "error getting remote rpm package version: $package, branch: $branch"
-				'k8s/pause')
-					version='3.9'
-					;;
-				*)
-					version="$(api_get_source_package_version "$branch" "$package")"
-					[ "$?" -eq 0 ] || handle_error "error getting remote rpm package version: $package, branch: $branch"
-					;;
-			esac
 		fi
 
 		tags_file="/tmp/k8s-tags.toml"
 		case "$image" in
 			'k8s/flannel-cni-plugin')
-				# up to the last number in version
+				num_dots="$(echo "$version" | string_count '.')"
-				flannel_version="${version%.*}"
+				if [ "$num_dots" -eq 2 ]; then
-				# the last number in version
+					jq --null-input --arg image "$image" --arg branch "$branch" --arg version "v$version-flannel1" '{
-				flannel_release="${version##*.}"
+						$image: {$branch: [$version]},
-				jq --null-input --arg image "$image" --arg branch "$branch" --arg version "v$flannel_version-flannel$flannel_release" '{
+					}' | dasel -r json -w toml > "$tags_file"
-					$image: {$branch: [$version]},
+				elif [ "$num_dots" -eq 3 ]; then
-				}' | dasel -r json -w toml > "$tags_file"
+					# up to the last number in version
+					flannel_version="${version%.*}"
+					# the last number in version
+					flannel_release="${version##*.}"
+					jq --null-input --arg image "$image" --arg branch "$branch" --arg version "v$flannel_version-flannel$flannel_release" '{
+						$image: {$branch: [$version]},
+					}' | dasel -r json -w toml > "$tags_file"
+				else
+					handle_error "wrong version for package $package: $version"
+				fi
 				;;
 			'k8s/etcd')
 				jq --null-input --arg image "$image" --arg branch "$branch" --arg version "$version-0" '{
@@ -207,6 +211,63 @@ case "$image" in
 			--tags "$tags_file" \
 			$additional_options
 		;;
+	'coredns')
+		image="k8s/$image"
+
+		version=
+		additional_options=
+
+		if [ -n "$task_id" ]; then
+			version="$(api_get_source_package_version_from_task "$task_id" "$package")"
+			[ "$?" -eq 0 ] || handle_error "error getting remote rpm package version: $package, task: $task_id"
+
+			tasks_file='/tmp/k8s-tasks.toml'
+			jq --null-input --arg branch "$branch" --arg task_id "$task_id" --arg image "$image" '{
+				$branch: {$task_id: [$image]},
+			}' | dasel -r json -w toml > "$tasks_file"
+
+			additional_options+="--tasks $tasks_file "
+		else
+			version="$(api_get_source_package_version "$branch" "$package")"
+			[ "$?" -eq 0 ] || handle_error "error getting remote rpm package version: $package, branch: $branch"
+		fi
+
+		# if binary package
+		#version_str="$(echo "$package" | sed -E 's/kubernetes(.+)-.+/\1/')"
+		#[ "$?" -eq 0 ] || handle_error "error getting specified rpm package version: $package"
+
+		# if source package
+		version_str="$(echo "$package" | sed -E 's/coredns(.+)/\1/')"
+		[ "$?" -eq 0 ] || handle_error "error getting specified rpm package version: $package"
+
+		tags_file="/tmp/k8s-tags.toml"
+		jq --null-input --arg image "$image" --arg branch "$branch" --arg version "v$version" '{
+			$image: {$branch: [$version]},
+		}' | dasel -r json -w toml > "$tags_file"
+
+		if [ -n "$latest" ]; then
+			additional_options+="--latest $branch "
+		fi
+
+		if [ -z "$push" ]; then
+			additional_options+="--skip-stages push "
+		elif [ -n "$skip_build" ]; then
+			additional_options+="--stages push "
+		fi
+
+		if [ -n "$dry_run" ]; then
+			additional_options+="--dry-run "
+		fi
+
+		./build.py \
+			--branch "$branch" \
+			--registry "$registry" \
+			--overwrite-organization "$prefix" \
+			--images "$image" \
+			--tags "$tags_file" \
+			--package-version "$version_str" \
+			$additional_options
+		;;
 	'kube-apiserver' | 'kube-controller-manager' | 'kube-scheduler' | 'kube-proxy')
 		image="k8s/$image"
 

org/k8s/coredns/Dockerfile.template

@@ -8,6 +8,8 @@ LABEL org.opencontainers.image.source="https://github.com/coredns/coredns"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.vendor="ALT Linux Team"
 
-{{ install_packages("coredns") }}
+ARG PKG_VERSION
+
+{{ install_packages("coredns${PKG_VERSION}") }}
 
 ENTRYPOINT ["/usr/bin/coredns"]

scripts/build-k8s-c10f2.sh

@@ -0,0 +1,46 @@
+#!/bin/sh
+
+set -eu
+
+registry='registry.altlinux.org'
+#registry='10.4.4.52:5000'
+task_id=
+
+additional_options=
+if [ -n "$task_id" ]; then
+	additional_options="-t $task_id"
+fi
+
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-apiserver kubernetes1.28
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-controller-manager kubernetes1.28
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-scheduler kubernetes1.28
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-proxy kubernetes1.28
+
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-apiserver kubernetes1.29
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-controller-manager kubernetes1.29
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-scheduler kubernetes1.29
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-proxy kubernetes1.29
+
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-apiserver kubernetes1.30
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-controller-manager kubernetes1.30
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-scheduler kubernetes1.30
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-proxy kubernetes1.30
+
+./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-apiserver kubernetes1.31
+./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-controller-manager kubernetes1.31
+./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-scheduler kubernetes1.31
+./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 kube-proxy kubernetes1.31
+
+./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 etcd etcd
+./image-build -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 coredns coredns1.11.1
+./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 coredns coredns1.11.3
+./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 pause kubernetes-pause
+
+#./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 flannel flannel
+#./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 flannel-cni-plugin cni-plugin-flannel
+
+#./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 cert-manager-startupapicheck cert-manager
+#./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 cert-manager-acmesolver cert-manager
+#./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 cert-manager-cainjector cert-manager
+#./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 cert-manager-controller cert-manager
+#./image-build --latest -b c10f2 -r "$registry" $additional_options --prefix=k8s-c10f2 cert-manager-webhook cert-manager

scripts/build-k8s-sisyphus.sh

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+set -eu
+
+registry='registry.altlinux.org'
+#registry='10.4.4.52:5000'
+task_id=
+
+additional_options=
+if [ -n "$task_id" ]; then
+	additional_options="-t $task_id"
+fi
+
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-apiserver kubernetes1.28
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-controller-manager kubernetes1.28
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-scheduler kubernetes1.28
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-proxy kubernetes1.28
+
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-apiserver kubernetes1.29
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-controller-manager kubernetes1.29
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-scheduler kubernetes1.29
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-proxy kubernetes1.29
+
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-apiserver kubernetes1.30
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-controller-manager kubernetes1.30
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-scheduler kubernetes1.30
+./image-build -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-proxy kubernetes1.30
+
+./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-apiserver kubernetes1.31
+./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-controller-manager kubernetes1.31
+./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-scheduler kubernetes1.31
+./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus kube-proxy kubernetes1.31
+
+./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus etcd etcd
+./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus coredns coredns1.11.3
+./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus pause kubernetes-pause
+#./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus flannel flannel
+#./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus flannel-cni-plugin cni-plugin-flannel
+
+#./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus cert-manager-startupapicheck cert-manager
+#./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus cert-manager-acmesolver cert-manager
+#./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus cert-manager-cainjector cert-manager
+#./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus cert-manager-controller cert-manager
+#./image-build --latest -b sisyphus -r "$registry" $additional_options --prefix=k8s-sisyphus cert-manager-webhook cert-manager

scripts/notify.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -xeuo pipefail
+
+command="$1"
+
+function at_err() {
+	mpv -really-quiet /usr/share/sounds/freedesktop/stereo/dialog-error.oga &
+	notify-send -a "$command" "Failed to execute '$command'!"
+}
+
+trap at_err ERR
+
+$command
+
+mpv -really-quiet /usr/share/sounds/freedesktop/stereo/complete.oga &
+notify-send -a "$command" "Done executing '$command'!"