Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/maven/fixes/9.1' into maven/rele…
Browse files Browse the repository at this point in the history 
…ase/9.1
  • Loading branch information
@metaventis-build
metaventis-build committed Sep 4, 2024
2 parents 3fcbaef + 9dfacaf commit a509c6a
Show file tree
Hide file tree
Showing 4 changed files with 191 additions and 138 deletions.
310 changes: 186 additions & 124 deletions archetypes/helm/src/main/resources/archetype-resources/deploy.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,45 @@ set -o pipefail

if [[ -z $1 ]] ; then
echo ""
echo "deploy.sh [-s skip checks and deploy directly] <release> <chart> [<version|path>]"
echo "deploy.sh [options] <release> <chart> [<version|path>]"
echo " options:"
echo " -s # skip checks and deploy directly"
echo " -d # run diff"
echo " -t # run try run"
echo " -e # run execute deployment"
echo ""
exit 0
fi

SKIP=false
while getopts s: opt; do
WIZARD=true
DIFF=false
TRY_RUN=false
DEPLOY=false
while getopts sdte opt; do
case $opt in
s) SKIP=true
s)
SKIP=true
;;
d)
WIZARD=false
DIFF=true
;;
t)
WIZARD=false
TRY_RUN=true
;;
e)
WIZARD=false
DEPLOY=true
;;
*)
;;
esac
shift
done

shift $(( "$OPTIND" - 1))

RELEASE=${1?"release required"}
CHART=${2?"chart required"}
VERSION=${3:-"":->=0.0.0-0}
Expand Down Expand Up @@ -92,127 +118,163 @@ fi

popd >/dev/null || exit

if [ "$SKIP" = false ] ; then
echo ""
echo "--------------------------------------------------------------------------------"
echo ""
echo "cluster: ${CONTEXT}"
echo "namespace: ${NAMESPACE}"
echo ""
echo "--------------------------------------------------------------------------------"
echo ""
read -p "---> kubectl context ok [y/N] " answer
echo ""
echo "--------------------------------------------------------------------------------"
echo ""
case ${answer:0:1} in
y | Y)
echo "Request existing releases, please wait ..."
echo ""
helm repo update >/dev/null
helm ls -a
;;
*)
exit 0
;;
esac

echo ""
echo "--------------------------------------------------------------------------------"
echo ""
echo "release: ${RELEASE}"
echo ""
echo "--------------------------------------------------------------------------------"
echo ""
read -p "---> helm release ok [y/N] " answer
echo ""
echo "--------------------------------------------------------------------------------"
echo ""

case ${answer:0:1} in
y | Y)
echo "Request existing revisions, please wait ..."
echo ""
helm history ${RELEASE} 2>/dev/null || echo "skipped ..."
;;
*)
exit 0
;;
esac

echo ""
echo "--------------------------------------------------------------------------------"
echo ""
echo "chart: ${CHART}"
echo "version: ${VERSION}"
echo "options: ${ARGS[@]}"
echo ""
echo "--------------------------------------------------------------------------------"
echo ""
read -p "---> helm parameter ok [y/N] " answer
echo ""
echo "--------------------------------------------------------------------------------"
echo ""

if [[ ! -f ${CHART} ]] ; then

ARGS+=("--version")
ARGS+=("${VERSION}")
diff() {
echo "Request diff from last revision, please wait ..."
echo ""
# temporarily disable the script from exiting on a non-zero status code
set +e
helm diff upgrade --install "${RELEASE}" "${CHART}" "${ARGS[@]}"
set -e
}

fi
tryRun(){
echo "Dry-run, please wait ..."
echo ""
helm upgrade --install "${RELEASE}" "${CHART}" "${ARGS[@]}" --dry-run --debug
}

execute(){
echo "Execute, please wait ..."
echo ""
helm upgrade --install "${RELEASE}" "${CHART}" "${ARGS[@]}" --timeout=30m
}


runAsWizard() {
if [ "$SKIP" = false ] ; then
echo ""
echo "--------------------------------------------------------------------------------"
echo ""
echo "cluster: ${CONTEXT}"
echo "namespace: ${NAMESPACE}"
echo ""
echo "--------------------------------------------------------------------------------"
echo ""
read -p "---> kubectl context ok [y/N] " answer
echo ""
echo "--------------------------------------------------------------------------------"
echo ""
case ${answer:0:1} in
y | Y)
echo "Request existing releases, please wait ..."
echo ""
helm repo update >/dev/null
helm ls -a
;;
*)
exit 0
;;
esac

echo ""
echo "--------------------------------------------------------------------------------"
echo ""
echo "release: ${RELEASE}"
echo ""
echo "--------------------------------------------------------------------------------"
echo ""
read -p "---> helm release ok [y/N] " answer
echo ""
echo "--------------------------------------------------------------------------------"
echo ""

case ${answer:0:1} in
y | Y)
echo "Request existing revisions, please wait ..."
echo ""
helm history ${RELEASE} 2>/dev/null || echo "skipped ..."
;;
*)
exit 0
;;
esac

echo ""
echo "--------------------------------------------------------------------------------"
echo ""
echo "chart: ${CHART}"
echo "version: ${VERSION}"
echo "options: ${ARGS[*]}"
echo ""
echo "--------------------------------------------------------------------------------"
echo ""
read -p "---> helm parameter ok [y/N] " answer
echo ""
echo "--------------------------------------------------------------------------------"
echo ""

if [[ ! -f ${CHART} ]] ; then

ARGS+=("--version")
ARGS+=("${VERSION}")

fi

case ${answer:0:1} in
y | Y)
diff
;;
*)
exit 0
;;
esac

echo ""
echo "--------------------------------------------------------------------------------"
echo ""
read -p "---> perform test [y/N] " answer
echo ""
echo "--------------------------------------------------------------------------------"
echo ""

case ${answer:0:1} in
y | Y)
tryRun
;;
*)
echo "skipped ..."
;;
esac

fi
echo ""
echo "--------------------------------------------------------------------------------"
echo ""
read -p "---> perform deployment [y/N] " answer
echo ""
echo "--------------------------------------------------------------------------------"
echo ""

case ${answer:0:1} in
y | Y)
echo "Request diff from last revision, please wait ..."
echo ""
helm diff upgrade --install "${RELEASE}" "${CHART}" "${ARGS[@]}"
;;
*)
exit 0
;;
esac

echo ""
echo "--------------------------------------------------------------------------------"
echo ""
read -p "---> perform test [y/N] " answer
echo ""
echo "--------------------------------------------------------------------------------"
echo ""

case ${answer:0:1} in
y | Y)
echo "Dry-run, please wait ..."
echo ""
helm upgrade --install "${RELEASE}" "${CHART}" "${ARGS[@]}" --dry-run --debug
;;
*)
echo "skipped ..."
;;
esac
case ${answer:0:1} in
y | Y)
execute
;;
*)
echo "skipped ..."
;;
esac

echo ""
echo "--------------------------------------------------------------------------------"
echo ""
echo "done"
echo ""
}


if [[ $WIZARD == "true" ]] ; then
runAsWizard
else
if [[ $DIFF == "true" ]] ; then
diff
fi

if [[ $TRY_RUN == "true" ]] ; then
tryRun
fi

if [[ $DEPLOY == "true" ]] ; then
execute
fi

fi
echo ""
echo "--------------------------------------------------------------------------------"
echo ""
read -p "---> perform deployment [y/N] " answer
echo ""
echo "--------------------------------------------------------------------------------"
echo ""

case ${answer:0:1} in
y | Y)
echo "Run, please wait ..."
echo ""
helm upgrade --install "${RELEASE}" "${CHART}" "${ARGS[@]}" --timeout=30m
;;
*)
echo "skipped ..."
;;
esac

echo ""
echo "--------------------------------------------------------------------------------"
echo ""
echo "done"
echo ""
4 changes: 4 additions & 0 deletions archetypes/project/src/main/resources/archetype-resources/repository/config/defaults/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
<resource>
<directory>src/generated/resources</directory>
</resource>
<resource>
<directory>src/main/templates</directory>
<filtering>true</filtering>
</resource>
</resources>

<plugins>
Expand Down
15 changes: 1 addition & 14 deletions ...in/templates/WEB-INF/classes/version.json → ...s/src/main/templates/project-version.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"build": {
"timestamp": "${build.timestamp}"
},
"repository": "project",
"git": {
"branch": "${git.branch}",
"closest": {
Expand All @@ -18,17 +16,6 @@
"dirty": "${git.dirty}"
},
"maven": {
"bom": {
"bom": "${bom.bom.version}",
"repository": "${bom.repository.version}",
"repository-antivirus": "${bom.repository-antivirus.version}",
"repository-cluster": "${bom.repository-cluster.version}",
"repository-elastic": "${bom.repository-elastic.version}",
"repository-mongo": "${bom.repository-mongo.version}",
"repository-remote": "${bom.repository-remote.version}",
"repository-transform": "${bom.repository-transform.version}",
"services-rendering": "${bom.services-rendering.version}"
},
"project": {
"artifactId": "${project.artifactId}",
"groupId": "${project.groupId}",
Expand Down
Empty file added ...ject/src/main/resources/archetype-resources/repository/webapp/src/main/templates/.gitkeep
View file
Empty file.

0 comments on commit a509c6a

Please sign in to comment.