Skip to content

Commit 47c571b

Browse files
Standardize create_branch usage and commit_changes calls
Co-authored-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com>
1 parent e124b41 commit 47c571b

15 files changed

Lines changed: 16 additions & 66 deletions

scripts/library.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ clone_and_checkout() {
2828
local repository_url="$2"
2929
local repository_directory="$3"
3030
local commit="$4"
31-
echo "Checking out in $source_directory to $commit..."
3231
mkdir -p "$source_directory"
3332
cd "$source_directory"
3433
# Clone repository if it doesn't exist
@@ -48,12 +47,10 @@ clone_and_checkout() {
4847
copy_manifests() {
4948
local source="$1"
5049
local destination="$2"
51-
echo "Copying manifests..."
5250
if [ -d "$destination" ]; then
5351
rm -r "$destination"
5452
fi
5553
cp "$source" "$destination" -r
56-
echo "Successfully copied all manifests."
5754
}
5855
# Update README with new commit reference
5956
update_readme() {

scripts/synchronize-cert-manager-manifests.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,10 @@ MANIFESTS_DIRECTORY=$(dirname $SCRIPT_DIRECTORY)
1111
DESTINATION_DIRECTORY=$MANIFESTS_DIRECTORY/common/${COMPONENT_NAME}
1212
DESTINATION_FILE="$DESTINATION_DIRECTORY/base/upstream/cert-manager.yaml"
1313
create_branch "$BRANCH_NAME"
14-
check_uncommitted_changes
15-
echo "Downloading ${COMPONENT_NAME} manifest ${COMMIT}..."
1614
wget -O "$DESTINATION_FILE" \
1715
"https://github.com/${REPOSITORY_NAME}/releases/download/${COMMIT}/cert-manager.yaml"
1816
SOURCE_TEXT="\[.*\](https://github.com/${REPOSITORY_NAME}/releases/tag/v.*)"
1917
DESTINATION_TEXT="\[${COMMIT#v}\](https://github.com/${REPOSITORY_NAME}/releases/tag/${COMMIT})"
2018
update_readme "$MANIFESTS_DIRECTORY" "$SOURCE_TEXT" "$DESTINATION_TEXT"
21-
commit_changes "$MANIFESTS_DIRECTORY" "Update common/${COMPONENT_NAME} manifests to ${COMMIT}" \
22-
"$DESTINATION_DIRECTORY" \
23-
"README.md"
19+
commit_changes "$MANIFESTS_DIRECTORY" "Update ${REPOSITORY_NAME} manifests from ${COMMIT}" "$MANIFESTS_DIRECTORY"
2420
echo "Synchronization completed successfully."

scripts/synchronize-dex-manifests.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ BRANCH_NAME=${BRANCH_NAME:=synchronize-${COMPONENT_NAME}-manifests-${COMMIT?}}
1010
MANIFESTS_DIRECTORY=$(dirname $SCRIPT_DIRECTORY)
1111
DESTINATION_DIRECTORY=$MANIFESTS_DIRECTORY/common/${COMPONENT_NAME}
1212
create_branch "$BRANCH_NAME"
13-
check_uncommitted_changes
14-
echo "Updating ${COMPONENT_NAME} image tag to ${COMMIT}..."
1513
if [[ "$OSTYPE" == "darwin"* ]]; then
1614
sed -i "" "s|ghcr.io/dexidp/dex:v[0-9.]*|ghcr.io/dexidp/dex:${COMMIT}|g" \
1715
$DESTINATION_DIRECTORY/base/deployment.yaml
@@ -22,7 +20,5 @@ fi
2220
SOURCE_TEXT="\[.*\](https://github.com/${REPOSITORY_NAME}/releases/tag/v.*)"
2321
DESTINATION_TEXT="\[${COMMIT#v}\](https://github.com/${REPOSITORY_NAME}/releases/tag/${COMMIT})"
2422
update_readme "$MANIFESTS_DIRECTORY" "$SOURCE_TEXT" "$DESTINATION_TEXT"
25-
commit_changes "$MANIFESTS_DIRECTORY" "Update common/${COMPONENT_NAME} manifests to ${COMMIT}" \
26-
"$DESTINATION_DIRECTORY" \
27-
"README.md"
23+
commit_changes "$MANIFESTS_DIRECTORY" "Update ${REPOSITORY_NAME} manifests from ${COMMIT}" "$MANIFESTS_DIRECTORY"
2824
echo "Synchronization completed successfully."

scripts/synchronize-istio-manifests.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ BRANCH_NAME=${BRANCH_NAME:=synchronize-${COMPONENT_NAME}-manifests-${COMMIT?}}
1111
MANIFESTS_DIRECTORY=$(dirname $SCRIPT_DIRECTORY)
1212
ISTIO_DIRECTORY=$MANIFESTS_DIRECTORY/common/${COMPONENT_NAME}
1313
create_branch "$BRANCH_NAME"
14-
echo "Checking out in $SOURCE_DIRECTORY to $COMMIT..."
1514
mkdir -p "$SOURCE_DIRECTORY"
1615
cd "$SOURCE_DIRECTORY"
1716
if [ ! -d "istio-${COMMIT}" ]; then
@@ -20,7 +19,6 @@ if [ ! -d "istio-${COMMIT}" ]; then
2019
fi
2120
ISTIOCTL="${SOURCE_DIRECTORY}/istio-${COMMIT}/bin/istioctl"
2221
cd "$ISTIO_DIRECTORY"
23-
echo "Generating CNI manifests (default)..."
2422
$ISTIOCTL manifest generate -f profile.yaml -f profile-overlay.yaml \
2523
--set components.cni.enabled=true \
2624
--set components.cni.namespace=kube-system > dump.yaml
@@ -29,18 +27,15 @@ mv $ISTIO_DIRECTORY/crd.yaml $ISTIO_DIRECTORY/istio-crds/base/
2927
mv $ISTIO_DIRECTORY/install.yaml $ISTIO_DIRECTORY/istio-install/base/
3028
mv $ISTIO_DIRECTORY/cluster-local-gateway.yaml $ISTIO_DIRECTORY/cluster-local-gateway/base/
3129
rm dump.yaml
32-
echo "Generating ztunnel manifests (ambient mode)..."
3330
$ISTIOCTL manifest generate -f profile.yaml -f profile-overlay.yaml \
3431
--set components.cni.enabled=true \
3532
--set components.ztunnel.enabled=true > dump-ztunnel.yaml
3633
./split-istio-packages -f dump-ztunnel.yaml
3734
mv $ISTIO_DIRECTORY/ztunnel.yaml $ISTIO_DIRECTORY/istio-install/components/ambient-mode/
3835
rm dump-ztunnel.yaml crd.yaml install.yaml cluster-local-gateway.yaml
39-
check_uncommitted_changes
40-
echo "Updating tag in istio-sidecar-injector-patch.yaml..."
4136
sed -i "s/\"tag\": \".*\"/\"tag\": \"$COMMIT\"/" "$ISTIO_DIRECTORY/istio-install/base/patches/istio-sidecar-injector-patch.yaml"
4237
SOURCE_TEXT="\[.*\](https://github.com/${REPOSITORY_NAME}/releases/tag/.*)"
4338
DESTINATION_TEXT="\[$COMMIT\](https://github.com/${REPOSITORY_NAME}/releases/tag/$COMMIT)"
4439
update_readme "$MANIFESTS_DIRECTORY" "$SOURCE_TEXT" "$DESTINATION_TEXT"
45-
commit_changes "$MANIFESTS_DIRECTORY" "Upgrade istio to v.${COMMIT}" "."
40+
commit_changes "$MANIFESTS_DIRECTORY" "Update ${REPOSITORY_NAME} manifests from ${COMMIT}" "$MANIFESTS_DIRECTORY"
4641
echo "Synchronization completed successfully."

scripts/synchronize-katib-manifests.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@ DESTINATION_MANIFESTS_PATH="applications/${COMPONENT_NAME}/upstream"
1616
SOURCE_TEXT="\[.*\](https://github.com/${REPOSITORY_NAME}/tree/.*/manifests/v1beta1)"
1717
DESTINATION_TEXT="\[${COMMIT}\](https://github.com/${REPOSITORY_NAME}/tree/${COMMIT}/manifests/v1beta1)"
1818
create_branch "$BRANCH_NAME"
19-
check_uncommitted_changes
2019
clone_and_checkout "$SOURCE_DIRECTORY" "$REPOSITORY_URL" "$REPOSITORY_DIRECTORY" "$COMMIT"
2120
copy_manifests "${SOURCE_DIRECTORY}/${REPOSITORY_DIRECTORY}/${SOURCE_MANIFESTS_PATH}" "${MANIFESTS_DIRECTORY}/${DESTINATION_MANIFESTS_PATH}"
2221
update_readme "$MANIFESTS_DIRECTORY" "$SOURCE_TEXT" "$DESTINATION_TEXT"
23-
commit_changes "$MANIFESTS_DIRECTORY" "Update ${REPOSITORY_NAME} manifests from ${COMMIT}" \
24-
"applications" \
25-
"README.md"
22+
commit_changes "$MANIFESTS_DIRECTORY" "Update ${REPOSITORY_NAME} manifests from ${COMMIT}" "$MANIFESTS_DIRECTORY"
2623
echo "Synchronization completed successfully."

scripts/synchronize-knative-manifests.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ SCRIPT_DIRECTORY=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null &&
44
source "${SCRIPT_DIRECTORY}/library.sh"
55
setup_error_handling
66
COMPONENT_NAME="knative"
7+
REPOSITORY_NAME="knative"
78
KN_SERVING_RELEASE="v1.21.1"
89
KN_EXTENSION_RELEASE="v1.21.1"
910
KN_EVENTING_RELEASE="v1.21.0"
11+
COMMIT="${KN_SERVING_RELEASE}/${KN_EVENTING_RELEASE}"
1012
BRANCH_NAME=${BRANCH_NAME:=synchronize-${COMPONENT_NAME}-manifests-${KN_SERVING_RELEASE?}}
1113
MANIFESTS_DIRECTORY=$(dirname $SCRIPT_DIRECTORY)
1214
DESTINATION_DIRECTORY=$MANIFESTS_DIRECTORY/common/${COMPONENT_NAME}
1315
create_branch "$BRANCH_NAME"
14-
check_uncommitted_changes
1516
if [ -d "$DESTINATION_DIRECTORY" ]; then
1617
rm -r "$DESTINATION_DIRECTORY/knative-serving/base/upstream"
1718
rm "$DESTINATION_DIRECTORY/knative-serving-post-install-jobs/base/serving-post-install-jobs.yaml"
@@ -73,7 +74,5 @@ replace_in_file \
7374
"The manifests for Knative Eventing are based off the \[v.* release\](https://github.com/knative/eventing/releases/tag/knative-v.*)" \
7475
"The manifests for Knative Eventing are based off the \[$KN_EVENTING_RELEASE release\](https://github.com/knative/eventing/releases/tag/knative-$KN_EVENTING_RELEASE)" \
7576
$DESTINATION_DIRECTORY/README.md
76-
commit_changes "$MANIFESTS_DIRECTORY" "Update common/knative manifests from ${KN_SERVING_RELEASE}/${KN_EVENTING_RELEASE}" \
77-
"$DESTINATION_DIRECTORY" \
78-
"README.md"
77+
commit_changes "$MANIFESTS_DIRECTORY" "Update ${REPOSITORY_NAME} manifests from ${COMMIT}" "$MANIFESTS_DIRECTORY"
7978
echo "Synchronization completed successfully."

scripts/synchronize-kserve-kserve-manifests.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,12 @@ DESTINATION_MANIFESTS_PATH="applications/${COMPONENT_NAME}/${COMPONENT_NAME}"
1616
SOURCE_TEXT="\[.*\](https://github.com/${REPOSITORY_NAME}/releases/tag/.*)"
1717
DESTINATION_TEXT="\[${COMMIT}\](https://github.com/${REPOSITORY_NAME}/releases/tag/${COMMIT}/install/${COMMIT})"
1818
create_branch "$BRANCH_NAME"
19-
check_uncommitted_changes
2019
clone_and_checkout "$SOURCE_DIRECTORY" "$REPOSITORY_URL" "$REPOSITORY_DIRECTORY" "$COMMIT"
2120
DESTINATION_DIRECTORY=$MANIFESTS_DIRECTORY/$DESTINATION_MANIFESTS_PATH
2221
if [ -d "$DESTINATION_DIRECTORY" ]; then
2322
rm -rf "$DESTINATION_DIRECTORY"/kserve*
2423
fi
2524
cp $SOURCE_DIRECTORY/$REPOSITORY_DIRECTORY/$SOURCE_MANIFESTS_PATH/* $DESTINATION_DIRECTORY -r
2625
update_readme "$MANIFESTS_DIRECTORY" "$SOURCE_TEXT" "$DESTINATION_TEXT"
27-
commit_changes "$MANIFESTS_DIRECTORY" "Update ${REPOSITORY_NAME} manifests from ${COMMIT}" \
28-
"applications/${COMPONENT_NAME}" \
29-
"README.md" \
30-
"scripts"
26+
commit_changes "$MANIFESTS_DIRECTORY" "Update ${REPOSITORY_NAME} manifests from ${COMMIT}" "$MANIFESTS_DIRECTORY"
3127
echo "Synchronization completed successfully."

scripts/synchronize-kserve-web-application-manifests.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@ DESTINATION_MANIFESTS_PATH="applications/kserve/${COMPONENT_NAME}"
1616
SOURCE_TEXT="\[.*\](https://github.com/${REPOSITORY_NAME}/tree/.*)"
1717
DESTINATION_TEXT="\[${COMMIT}\](https://github.com/${REPOSITORY_NAME}/tree/${COMMIT}/${SOURCE_MANIFESTS_PATH})"
1818
create_branch "$BRANCH_NAME"
19-
check_uncommitted_changes
2019
clone_and_checkout "$SOURCE_DIRECTORY" "$REPOSITORY_URL" "$REPOSITORY_DIRECTORY" "$COMMIT"
2120
copy_manifests "${SOURCE_DIRECTORY}/${REPOSITORY_DIRECTORY}/${SOURCE_MANIFESTS_PATH}" "${MANIFESTS_DIRECTORY}/${DESTINATION_MANIFESTS_PATH}"
2221
update_readme "$MANIFESTS_DIRECTORY" "$SOURCE_TEXT" "$DESTINATION_TEXT"
23-
commit_changes "$MANIFESTS_DIRECTORY" "Update kserve models web application manifests from ${COMMIT}" \
24-
"${DESTINATION_MANIFESTS_PATH}" \
25-
"README.md"
22+
commit_changes "$MANIFESTS_DIRECTORY" "Update ${REPOSITORY_NAME} manifests from ${COMMIT}" "$MANIFESTS_DIRECTORY"
2623
echo "Synchronization completed successfully."

scripts/synchronize-kubeflow-manifests.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ SOURCE_DIRECTORY=${SOURCE_DIRECTORY:=/tmp/${COMPONENT_NAME}-${COMPONENT_NAME}}
1212
BRANCH_NAME=${BRANCH_NAME:=synchronize-${COMPONENT_NAME}-${COMPONENT_NAME}-manifests-${COMMIT?}}
1313
MANIFESTS_DIRECTORY=$(dirname $SCRIPT_DIRECTORY)
1414
create_branch "$BRANCH_NAME"
15-
check_uncommitted_changes
1615
clone_and_checkout "$SOURCE_DIRECTORY" "$REPOSITORY_URL" "$REPOSITORY_DIRECTORY" "$COMMIT"
1716
copy_component_manifests() {
1817
local source_manifests_path=$1
@@ -55,7 +54,5 @@ copy_component_manifests "components/tensorboard-controller/config" \
5554
copy_component_manifests "components/pvcviewer-controller/config" \
5655
"applications/pvcviewer-controller/upstream" \
5756
"pvcviewer-controller/config"
58-
commit_changes "$MANIFESTS_DIRECTORY" "Update ${REPOSITORY_NAME} manifests from ${COMMIT}" \
59-
"applications" \
60-
"README.md"
57+
commit_changes "$MANIFESTS_DIRECTORY" "Update ${REPOSITORY_NAME} manifests from ${COMMIT}" "$MANIFESTS_DIRECTORY"
6158
echo "Synchronization completed successfully."

scripts/synchronize-model-registry-manifests.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@ DESTINATION_MANIFESTS_PATH="applications/${COMPONENT_NAME}/upstream"
1616
SOURCE_TEXT="\[.*\](https://github.com/${REPOSITORY_NAME}/tree/.*/manifests/kustomize)"
1717
DESTINATION_TEXT="\[${COMMIT}\](https://github.com/${REPOSITORY_NAME}/tree/${COMMIT}/manifests/kustomize)"
1818
create_branch "$BRANCH_NAME"
19-
check_uncommitted_changes
2019
clone_and_checkout "$SOURCE_DIRECTORY" "$REPOSITORY_URL" "$REPOSITORY_DIRECTORY" "$COMMIT"
2120
copy_manifests "${SOURCE_DIRECTORY}/${REPOSITORY_DIRECTORY}/${SOURCE_MANIFESTS_PATH}" "${MANIFESTS_DIRECTORY}/${DESTINATION_MANIFESTS_PATH}"
2221
update_readme "$MANIFESTS_DIRECTORY" "$SOURCE_TEXT" "$DESTINATION_TEXT"
23-
commit_changes "$MANIFESTS_DIRECTORY" "Update ${REPOSITORY_NAME} manifests from ${COMMIT}" \
24-
"applications" \
25-
"README.md"
22+
commit_changes "$MANIFESTS_DIRECTORY" "Update ${REPOSITORY_NAME} manifests from ${COMMIT}" "$MANIFESTS_DIRECTORY"
2623
echo "Synchronization completed successfully."

0 commit comments

Comments
 (0)