diff --git a/hack/changelog-template.txt b/hack/changelog-template.txt index 95e3e3add5..25e07513a9 100644 --- a/hack/changelog-template.txt +++ b/hack/changelog-template.txt @@ -9,6 +9,6 @@ HELM CHART: * The version of the Helm chart is now %%HELM_CHART_VERSION%%. UPGRADE: -* For NGINX, use the %%IC_VERSION%% image from our DockerHub: `nginx/nginx-ingress:%%IC_VERSION%%` or `nginx/nginx-ingress:%%IC_VERSION%%-alpine` +* For NGINX, use the %%IC_VERSION%% image from our DockerHub: `nginx/nginx-ingress:%%IC_VERSION%%`, `nginx/nginx-ingress:%%IC_VERSION%%-alpine` or 'nginx/nginx-ingress:%%IC_VERSION%%-ubi * For NGINX Plus, please build your own image using the %%IC_VERSION%% source code. * For Helm, use version %%HELM_CHART_VERSION%% of the chart. diff --git a/hack/prepare-minor-release.sh b/hack/prepare-minor-release.sh index aff46c2a69..d36a0bf92e 100755 --- a/hack/prepare-minor-release.sh +++ b/hack/prepare-minor-release.sh @@ -36,8 +36,8 @@ fi ic_version=$1 helm_chart_version=$2 -prev_ic_version=$(echo $ic_version | awk -F. '{ printf("%s.%s.%d", $1, $2, $3-1) }') -prev_helm_chart_version=$(echo $helm_chart_version | awk -F. '{ printf("%s.%s.%d", $1, $2, $3-1) }') +prev_ic_version=$(echo $ic_version | awk -F. '{ printf("%s\\.%s\\.%d", $1, $2, $3-1) }') +prev_helm_chart_version=$(echo $helm_chart_version | awk -F. '{ printf("%s\\.%s\\.%d", $1, $2, $3-1) }') sed -i "" "s/$prev_ic_version/$ic_version/g" ${FILES_TO_UPDATE_IC_VERSION[*]} sed -i "" "s/$prev_helm_chart_version/$helm_chart_version/g" ${FILE_TO_UPDATE_HELM_CHART_VERSION[*]} @@ -54,5 +54,11 @@ sed -i "" -e "s/%%TITLE%%/## NGINX Ingress Controller $ic_version/g" -e "s/%%IC_ find $DOCS_TO_UPDATE_FOLDER -type f -name "*.md" -exec sed -i "" "s/v$prev_ic_version/v$ic_version/g" {} + find $DOCS_TO_UPDATE_FOLDER -type f -name "*.rst" -exec sed -i "" "s/v$prev_ic_version/v$ic_version/g" {} + +# update IC version in the technical-specification doc +sed -i "" "s/$prev_ic_version/$ic_version/g" $DOCS_TO_UPDATE_FOLDER/technical-specifications.md + +# update IC version in the building ingress controller doc +sed -i "" "s/$prev_ic_version/$ic_version/g" $DOCS_TO_UPDATE_FOLDER/installation/building-ingress-controller-image.md + # update IC version in the helm doc sed -i "" "s/$prev_ic_version/$ic_version/g" $DOCS_TO_UPDATE_FOLDER/installation/installation-with-helm.md