Skip to content

Commit 6a6016f

Browse files
Copilotjuliusvonkohout
Copilot
and
juliusvonkohout
committed
Revert accidental restore-to-master script overwrite
Co-authored-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com>
1 parent d72e900 commit 6a6016f

16 files changed

Lines changed: 88 additions & 415 deletions

‎scripts/library.sh‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,76 @@
11
#!/usr/bin/env bash
22
# Common functions for Kubeflow manifest synchronization scripts
3-
43
setup_error_handling() {
54
set -euxo pipefail
65
IFS=$'\n\t'
76
}
8-
97
# Check if the git repository has uncommitted changes
108
check_uncommitted_changes() {
119
if [ -n "$(git status --porcelain)" ]; then
1210
echo "WARNING: You have uncommitted changes"
1311
fi
1412
}
15-
1613
# Create a new git branch if it doesn't exist
1714
create_branch() {
1815
local branch="$1"
19-
2016
check_uncommitted_changes
21-
2217
if [ $(git branch --list "$branch") ]; then
2318
echo "WARNING: Branch $branch already exists."
2419
fi
25-
2620
if ! git show-ref --verify --quiet refs/heads/$branch; then
2721
git checkout -b "$branch"
2822
else
2923
echo "Branch $branch already exists."
3024
fi
3125
}
32-
3326
clone_and_checkout() {
3427
local source_directory="$1"
3528
local repository_url="$2"
3629
local repository_directory="$3"
3730
local commit="$4"
38-
39-
echo "Checking out in $source_directory to $commit..."
40-
4131
mkdir -p "$source_directory"
4232
cd "$source_directory"
43-
4433
# Clone repository if it doesn't exist
4534
if [ ! -d "$repository_directory/.git" ]; then
4635
git clone "$repository_url" "$repository_directory"
4736
fi
48-
4937
# Checkout to specific commit
5038
cd "$source_directory/$repository_directory"
5139
if ! git rev-parse --verify --quiet "$commit"; then
5240
git checkout -b "$commit"
5341
else
5442
git checkout "$commit"
5543
fi
56-
5744
check_uncommitted_changes
5845
}
59-
6046
# Copy manifests from source to destination
6147
copy_manifests() {
6248
local source="$1"
6349
local destination="$2"
64-
65-
echo "Copying manifests..."
66-
6750
if [ -d "$destination" ]; then
6851
rm -r "$destination"
6952
fi
70-
7153
cp "$source" "$destination" -r
72-
echo "Successfully copied all manifests."
7354
}
74-
7555
# Update README with new commit reference
7656
update_readme() {
7757
local manifests_directory="$1"
7858
local source_text="$2"
7959
local destination_text="$3"
80-
8160
if [[ "$OSTYPE" == "darwin"* ]]; then
8261
sed -i "" "s|$source_text|$destination_text|g" "${manifests_directory}/README.md" # BSD sed of Mac OSX
8362
else
8463
sed -i "s|$source_text|$destination_text|g" "${manifests_directory}/README.md" # GNU sed of Linux
8564
fi
8665
}
87-
8866
# Commit changes to git repository
8967
commit_changes() {
9068
local manifests_directory="$1"
9169
local commit_message="$2"
9270
local paths_to_add=("${@:3}")
93-
9471
cd "$manifests_directory"
95-
9672
for path in "${paths_to_add[@]}"; do
9773
git add "$path"
9874
done
99-
10075
git commit -s -m "$commit_message"
101-
}
76+
}

‎scripts/synchronize-cert-manager-manifests.sh‎

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,20 @@
11
#!/usr/bin/env bash
22
# This script helps to create a PR to update cert-manager manifests.
3-
43
SCRIPT_DIRECTORY=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
54
source "${SCRIPT_DIRECTORY}/library.sh"
6-
75
setup_error_handling
8-
96
COMPONENT_NAME="cert-manager"
10-
CERT_MANAGER_RELEASE="v1.19.4" # Must be a release tag in cert-manager/cert-manager
11-
BRANCH_NAME=${BRANCH_NAME:=synchronize-${COMPONENT_NAME}-manifests-${CERT_MANAGER_RELEASE?}}
12-
7+
REPOSITORY_NAME="cert-manager/cert-manager"
8+
COMMIT="v1.19.4"
9+
BRANCH_NAME=${BRANCH_NAME:=synchronize-${COMPONENT_NAME}-manifests-${COMMIT?}}
1310
MANIFESTS_DIRECTORY=$(dirname $SCRIPT_DIRECTORY)
1411
DESTINATION_DIRECTORY=$MANIFESTS_DIRECTORY/common/${COMPONENT_NAME}
1512
DESTINATION_FILE="$DESTINATION_DIRECTORY/base/upstream/cert-manager.yaml"
16-
1713
create_branch "$BRANCH_NAME"
18-
check_uncommitted_changes
19-
20-
echo "Downloading cert-manager manifest ${CERT_MANAGER_RELEASE}..."
2114
wget -O "$DESTINATION_FILE" \
22-
"https://github.com/cert-manager/cert-manager/releases/download/${CERT_MANAGER_RELEASE}/cert-manager.yaml"
23-
24-
# Update top-level component version table.
25-
if [[ "$OSTYPE" == "darwin"* ]]; then
26-
sed -i "" '/| Cert Manager | common\/cert-manager |/s|\[.*\](https://github.com/cert-manager/cert-manager/releases/tag/v.*)|['"${CERT_MANAGER_RELEASE#v}"'](https://github.com/cert-manager/cert-manager/releases/tag/'"${CERT_MANAGER_RELEASE}"')|' \
27-
"${MANIFESTS_DIRECTORY}/README.md"
28-
else
29-
sed -i '/| Cert Manager | common\/cert-manager |/s|\[.*\](https://github.com/cert-manager/cert-manager/releases/tag/v.*)|['"${CERT_MANAGER_RELEASE#v}"'](https://github.com/cert-manager/cert-manager/releases/tag/'"${CERT_MANAGER_RELEASE}"')|' \
30-
"${MANIFESTS_DIRECTORY}/README.md"
31-
fi
32-
33-
commit_changes "$MANIFESTS_DIRECTORY" "Update common/cert-manager manifests to ${CERT_MANAGER_RELEASE}" \
34-
"$DESTINATION_DIRECTORY" \
35-
"README.md"
36-
15+
"https://github.com/${REPOSITORY_NAME}/releases/download/${COMMIT}/cert-manager.yaml"
16+
SOURCE_TEXT="\[.*\](https://github.com/${REPOSITORY_NAME}/releases/tag/v.*)"
17+
DESTINATION_TEXT="\[${COMMIT#v}\](https://github.com/${REPOSITORY_NAME}/releases/tag/${COMMIT})"
18+
update_readme "$MANIFESTS_DIRECTORY" "$SOURCE_TEXT" "$DESTINATION_TEXT"
19+
commit_changes "$MANIFESTS_DIRECTORY" "Update ${REPOSITORY_NAME} manifests from ${COMMIT}" "$MANIFESTS_DIRECTORY"
3720
echo "Synchronization completed successfully."

‎scripts/synchronize-dex-manifests.sh‎

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,24 @@
11
#!/usr/bin/env bash
22
# This script helps to create a PR to update the Dex manifests
3-
43
SCRIPT_DIRECTORY=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
54
source "${SCRIPT_DIRECTORY}/library.sh"
6-
75
setup_error_handling
8-
96
COMPONENT_NAME="dex"
10-
DEX_RELEASE="v2.43.1" # Must be a release
11-
BRANCH_NAME=${BRANCH_NAME:=synchronize-${COMPONENT_NAME}-manifests-${DEX_RELEASE?}}
12-
7+
REPOSITORY_NAME="dexidp/dex"
8+
COMMIT="v2.43.1"
9+
BRANCH_NAME=${BRANCH_NAME:=synchronize-${COMPONENT_NAME}-manifests-${COMMIT?}}
1310
MANIFESTS_DIRECTORY=$(dirname $SCRIPT_DIRECTORY)
1411
DESTINATION_DIRECTORY=$MANIFESTS_DIRECTORY/common/${COMPONENT_NAME}
15-
1612
create_branch "$BRANCH_NAME"
17-
18-
check_uncommitted_changes
19-
20-
echo "Updating Dex image tag to ${DEX_RELEASE}..."
21-
2213
if [[ "$OSTYPE" == "darwin"* ]]; then
23-
sed -i "" "s|ghcr.io/dexidp/dex:v[0-9.]*|ghcr.io/dexidp/dex:${DEX_RELEASE}|g" \
14+
sed -i "" "s|ghcr.io/dexidp/dex:v[0-9.]*|ghcr.io/dexidp/dex:${COMMIT}|g" \
2415
$DESTINATION_DIRECTORY/base/deployment.yaml
2516
else
26-
sed -i "s|ghcr.io/dexidp/dex:v[0-9.]*|ghcr.io/dexidp/dex:${DEX_RELEASE}|g" \
17+
sed -i "s|ghcr.io/dexidp/dex:v[0-9.]*|ghcr.io/dexidp/dex:${COMMIT}|g" \
2718
$DESTINATION_DIRECTORY/base/deployment.yaml
2819
fi
29-
30-
if [[ "$OSTYPE" == "darwin"* ]]; then
31-
sed -i "" '/| Dex | common\/dex |/s|\[.*\](https://github.com/dexidp/dex/releases/tag/v.*)|['"${DEX_RELEASE#v}"'](https://github.com/dexidp/dex/releases/tag/'"${DEX_RELEASE}"')|' \
32-
${MANIFESTS_DIRECTORY}/README.md
33-
else
34-
sed -i '/| Dex | common\/dex |/s|\[.*\](https://github.com/dexidp/dex/releases/tag/v.*)|['"${DEX_RELEASE#v}"'](https://github.com/dexidp/dex/releases/tag/'"${DEX_RELEASE}"')|' \
35-
${MANIFESTS_DIRECTORY}/README.md
36-
fi
37-
38-
commit_changes "$MANIFESTS_DIRECTORY" "Update common/dex manifests to ${DEX_RELEASE}" \
39-
"$DESTINATION_DIRECTORY" \
40-
"README.md"
41-
42-
echo "Synchronization completed successfully."
20+
SOURCE_TEXT="\[.*\](https://github.com/${REPOSITORY_NAME}/releases/tag/v.*)"
21+
DESTINATION_TEXT="\[${COMMIT#v}\](https://github.com/${REPOSITORY_NAME}/releases/tag/${COMMIT})"
22+
update_readme "$MANIFESTS_DIRECTORY" "$SOURCE_TEXT" "$DESTINATION_TEXT"
23+
commit_changes "$MANIFESTS_DIRECTORY" "Update ${REPOSITORY_NAME} manifests from ${COMMIT}" "$MANIFESTS_DIRECTORY"
24+
echo "Synchronization completed successfully."

‎scripts/synchronize-istio-manifests.sh‎

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,24 @@
11
#!/usr/bin/env bash
22
# This script helps to create a PR to update the unified Istio manifests
3-
43
SCRIPT_DIRECTORY=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
54
source "${SCRIPT_DIRECTORY}/library.sh"
6-
75
setup_error_handling
8-
96
COMPONENT_NAME="istio"
10-
COMMIT="1.29.0" # Update this for new versions
11-
SOURCE_DIRECTORY=${SOURCE_DIRECTORY:=/tmp/${COMPONENT_NAME}}
12-
BRANCH_NAME=${BRANCH_NAME:=${COMPONENT_NAME}-${COMMIT?}}
13-
14-
# Path configurations
7+
REPOSITORY_NAME="istio/istio"
8+
COMMIT="1.29.0"
9+
SOURCE_DIRECTORY=${SOURCE_DIRECTORY:=/tmp/kubeflow-${COMPONENT_NAME}}
10+
BRANCH_NAME=${BRANCH_NAME:=synchronize-${COMPONENT_NAME}-manifests-${COMMIT?}}
1511
MANIFESTS_DIRECTORY=$(dirname $SCRIPT_DIRECTORY)
1612
ISTIO_DIRECTORY=$MANIFESTS_DIRECTORY/common/${COMPONENT_NAME}
17-
1813
create_branch "$BRANCH_NAME"
19-
20-
echo "Checking out in $SOURCE_DIRECTORY to $COMMIT..."
21-
mkdir -p $SOURCE_DIRECTORY
22-
cd $SOURCE_DIRECTORY
14+
mkdir -p "$SOURCE_DIRECTORY"
15+
cd "$SOURCE_DIRECTORY"
2316
if [ ! -d "istio-${COMMIT}" ]; then
24-
wget "https://github.com/istio/istio/releases/download/${COMMIT}/istio-${COMMIT}-linux-amd64.tar.gz"
17+
wget "https://github.com/${REPOSITORY_NAME}/releases/download/${COMMIT}/istio-${COMMIT}-linux-amd64.tar.gz"
2518
tar xvfz istio-${COMMIT}-linux-amd64.tar.gz
2619
fi
27-
28-
ISTIOCTL=$SOURCE_DIRECTORY/istio-${COMMIT}/bin/istioctl
29-
cd $ISTIO_DIRECTORY
30-
31-
echo "Generating CNI manifests (default)..."
20+
ISTIOCTL="${SOURCE_DIRECTORY}/istio-${COMMIT}/bin/istioctl"
21+
cd "$ISTIO_DIRECTORY"
3222
$ISTIOCTL manifest generate -f profile.yaml -f profile-overlay.yaml \
3323
--set components.cni.enabled=true \
3424
--set components.cni.namespace=kube-system > dump.yaml
@@ -37,25 +27,15 @@ mv $ISTIO_DIRECTORY/crd.yaml $ISTIO_DIRECTORY/istio-crds/base/
3727
mv $ISTIO_DIRECTORY/install.yaml $ISTIO_DIRECTORY/istio-install/base/
3828
mv $ISTIO_DIRECTORY/cluster-local-gateway.yaml $ISTIO_DIRECTORY/cluster-local-gateway/base/
3929
rm dump.yaml
40-
41-
echo "Generating ztunnel manifests (ambient mode)..."
4230
$ISTIOCTL manifest generate -f profile.yaml -f profile-overlay.yaml \
4331
--set components.cni.enabled=true \
4432
--set components.ztunnel.enabled=true > dump-ztunnel.yaml
4533
./split-istio-packages -f dump-ztunnel.yaml
4634
mv $ISTIO_DIRECTORY/ztunnel.yaml $ISTIO_DIRECTORY/istio-install/components/ambient-mode/
4735
rm dump-ztunnel.yaml crd.yaml install.yaml cluster-local-gateway.yaml
48-
49-
check_uncommitted_changes
50-
51-
echo "Updating tag in istio-sidecar-injector-patch.yaml..."
52-
sed -i "s/\"tag\": \".*\"/\"tag\": \"$COMMIT\"/" $ISTIO_DIRECTORY/istio-install/base/patches/istio-sidecar-injector-patch.yaml
53-
54-
SOURCE_TEXT="\[.*\](https://github.com/istio/istio/releases/tag/.*)"
55-
DESTINATION_TEXT="\[$COMMIT\](https://github.com/istio/istio/releases/tag/$COMMIT)"
56-
36+
sed -i "s/\"tag\": \".*\"/\"tag\": \"$COMMIT\"/" "$ISTIO_DIRECTORY/istio-install/base/patches/istio-sidecar-injector-patch.yaml"
37+
SOURCE_TEXT="\[.*\](https://github.com/${REPOSITORY_NAME}/releases/tag/.*)"
38+
DESTINATION_TEXT="\[$COMMIT\](https://github.com/${REPOSITORY_NAME}/releases/tag/$COMMIT)"
5739
update_readme "$MANIFESTS_DIRECTORY" "$SOURCE_TEXT" "$DESTINATION_TEXT"
58-
59-
commit_changes "$MANIFESTS_DIRECTORY" "Upgrade istio to v.${COMMIT}" "."
60-
40+
commit_changes "$MANIFESTS_DIRECTORY" "Update ${REPOSITORY_NAME} manifests from ${COMMIT}" "$MANIFESTS_DIRECTORY"
6141
echo "Synchronization completed successfully."

‎scripts/synchronize-katib-manifests.sh‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,23 @@
11
#!/usr/bin/env bash
22
# This script helps to create a PR to update the Katib manifests
3-
43
SCRIPT_DIRECTORY=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
54
source "${SCRIPT_DIRECTORY}/library.sh"
6-
75
setup_error_handling
8-
96
COMPONENT_NAME="katib"
107
REPOSITORY_NAME="kubeflow/katib"
118
REPOSITORY_URL="https://github.com/kubeflow/katib.git"
129
COMMIT="v0.19.0"
1310
REPOSITORY_DIRECTORY="katib"
1411
SOURCE_DIRECTORY=${SOURCE_DIRECTORY:=/tmp/kubeflow-${COMPONENT_NAME}}
1512
BRANCH_NAME=${BRANCH_NAME:=synchronize-${COMPONENT_NAME}-manifests-${COMMIT?}}
16-
17-
# Path configurations
1813
MANIFESTS_DIRECTORY=$(dirname $SCRIPT_DIRECTORY)
1914
SOURCE_MANIFESTS_PATH="manifests/v1beta1"
2015
DESTINATION_MANIFESTS_PATH="applications/${COMPONENT_NAME}/upstream"
21-
22-
# README update patterns
2316
SOURCE_TEXT="\[.*\](https://github.com/${REPOSITORY_NAME}/tree/.*/manifests/v1beta1)"
2417
DESTINATION_TEXT="\[${COMMIT}\](https://github.com/${REPOSITORY_NAME}/tree/${COMMIT}/manifests/v1beta1)"
25-
2618
create_branch "$BRANCH_NAME"
27-
2819
clone_and_checkout "$SOURCE_DIRECTORY" "$REPOSITORY_URL" "$REPOSITORY_DIRECTORY" "$COMMIT"
29-
3020
copy_manifests "${SOURCE_DIRECTORY}/${REPOSITORY_DIRECTORY}/${SOURCE_MANIFESTS_PATH}" "${MANIFESTS_DIRECTORY}/${DESTINATION_MANIFESTS_PATH}"
31-
3221
update_readme "$MANIFESTS_DIRECTORY" "$SOURCE_TEXT" "$DESTINATION_TEXT"
33-
34-
commit_changes "$MANIFESTS_DIRECTORY" "Update ${REPOSITORY_NAME} manifests from ${COMMIT}" \
35-
"applications" \
36-
"README.md"
37-
22+
commit_changes "$MANIFESTS_DIRECTORY" "Update ${REPOSITORY_NAME} manifests from ${COMMIT}" "$MANIFESTS_DIRECTORY"
3823
echo "Synchronization completed successfully."

0 commit comments

Comments
 (0)