release: finish the release of v0.3.2

Signed-off-by: spacewander <[email protected]>
mosn · Aug 14, 2024 · 5127327 · 5127327
1 parent b139974
commit 5127327
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 40 deletions.
diff --git a/MAINTAIN.md b/MAINTAIN.md
@@ -11,9 +11,9 @@ To release a new version, please follow the steps below:
 4. Create tag `image/v${version}` to trigger image building.
 5. Submit a new commit with the changes below (ensure the CI passes):
     * Once the image is ready, update the version in the `manifests/charts/*/Chart.yaml`.
-    * Run `make fmt-go`.
     * Update the `./examples/dev_your_plugin` to use the released version.
-6. The CI will create a new chart package.
+    * Run `make fmt-go`.
+6. Create a release branch `release/v${version}` from the main branch, like `release/v0.3.2`. The CI will create a new chart package.
 
 ## Upgrade components
 

diff --git a/Makefile b/Makefile
@@ -73,8 +73,6 @@ build-dev-tools:
 build-dev-tools-local:
 	docker build --network=host --build-arg GOPROXY=${GOPROXY} -t ${DEV_TOOLS_IMAGE} -f tools/Dockerfile.dev ./tools
 
-# For lint-go/fmt-go: we don't cover examples/dev_your_plugin which is just an example
-
 GOLANGCI_LINT_VERSION = 1.56.1
 .PHONY: lint-go
 lint-go:

diff --git a/common.mk b/common.mk
@@ -39,7 +39,7 @@ GATEWAY_API_VERSION = 1.0.0
 MIN_K8S_VERSION = 1.26.0
 
 GO_PROD_MODULES = api types controller plugins # To make life simper, we only run linter on 'prod modules'
-GO_MODULES = $(GO_PROD_MODULES) e2e site tools
+GO_MODULES = $(GO_PROD_MODULES) e2e site tools ./examples/dev_your_plugin
 # Don't run `go mod tidy` with `site` module, as this module is managed by docsy build image
 GO_MODULES_EXCLUDE_SITE = $(filter-out site,$(GO_MODULES))
 

diff --git a/controller/go.sum b/controller/go.sum
@@ -569,10 +569,10 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-mosn.io/htnn/api v0.3.1 h1:vQMJI1XCgrWb3PdK7/T9ygdytl1Fps43Ekj36OY1vRk=
-mosn.io/htnn/api v0.3.1/go.mod h1:DumqbmMou8J1/DzEDaRIZWpan82bOqxGceWxTju7WkU=
-mosn.io/htnn/types v0.3.1 h1:WTxSVe8yUQhIjnYs6Y5RkPBUfknM2FBzgMdCzDfqjbQ=
-mosn.io/htnn/types v0.3.1/go.mod h1:SEEwBojLXw7tEgmEro3cqxgUFWuJRsBosTU86U5S92A=
+mosn.io/htnn/api v0.3.2 h1:3j63WhEkurhqCcly5PxDQkrP59AbIt2Qn0DwpsukQnU=
+mosn.io/htnn/api v0.3.2/go.mod h1:DumqbmMou8J1/DzEDaRIZWpan82bOqxGceWxTju7WkU=
+mosn.io/htnn/types v0.3.2 h1:pGm1kuXn0xb0ki6QapMdg0tgTtjHFmUGD/N6ZCe+dLc=
+mosn.io/htnn/types v0.3.2/go.mod h1:Jg4JZG+OK34J0gqXrEYzq4ZLoJ8mOyMz3+yR0o2G5P0=
 sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=
 sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
 sigs.k8s.io/gateway-api v1.0.0 h1:iPTStSv41+d9p0xFydll6d7f7MOBGuqXM6p2/zVYMAs=

diff --git a/e2e/go.mod b/e2e/go.mod
@@ -71,7 +71,7 @@ require (
 	k8s.io/klog/v2 v2.110.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
-	mosn.io/htnn/api v0.3.1 // indirect
+	mosn.io/htnn/api v0.3.2 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect

diff --git a/e2e/go.sum b/e2e/go.sum
@@ -258,12 +258,12 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-mosn.io/htnn/api v0.3.1 h1:vQMJI1XCgrWb3PdK7/T9ygdytl1Fps43Ekj36OY1vRk=
-mosn.io/htnn/api v0.3.1/go.mod h1:DumqbmMou8J1/DzEDaRIZWpan82bOqxGceWxTju7WkU=
-mosn.io/htnn/controller v0.3.1 h1:hLT7+SWdRpeQ+0yyiTuzDaPDp6ZXy4WE3TfqGxbkB2A=
-mosn.io/htnn/controller v0.3.1/go.mod h1:U54nzBvGbU+Pu/vwb7hvha5JNSj1NF8wWgx1aVzvUpg=
-mosn.io/htnn/types v0.3.1 h1:WTxSVe8yUQhIjnYs6Y5RkPBUfknM2FBzgMdCzDfqjbQ=
-mosn.io/htnn/types v0.3.1/go.mod h1:SEEwBojLXw7tEgmEro3cqxgUFWuJRsBosTU86U5S92A=
+mosn.io/htnn/api v0.3.2 h1:3j63WhEkurhqCcly5PxDQkrP59AbIt2Qn0DwpsukQnU=
+mosn.io/htnn/api v0.3.2/go.mod h1:DumqbmMou8J1/DzEDaRIZWpan82bOqxGceWxTju7WkU=
+mosn.io/htnn/controller v0.3.2 h1:Vp8cT3VAn4F4N078nGQ/yDKEdrbVNS6pFZY+RCDZVqE=
+mosn.io/htnn/controller v0.3.2/go.mod h1:VpIG3DLThMrg57eF/+7DvrLMzMBVK0r0sGpyh0s3pxI=
+mosn.io/htnn/types v0.3.2 h1:pGm1kuXn0xb0ki6QapMdg0tgTtjHFmUGD/N6ZCe+dLc=
+mosn.io/htnn/types v0.3.2/go.mod h1:Jg4JZG+OK34J0gqXrEYzq4ZLoJ8mOyMz3+yR0o2G5P0=
 sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=
 sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
 sigs.k8s.io/gateway-api v1.0.0 h1:iPTStSv41+d9p0xFydll6d7f7MOBGuqXM6p2/zVYMAs=

diff --git a/examples/dev_your_plugin/cmd/libgolang/main.go b/examples/dev_your_plugin/cmd/libgolang/main.go
@@ -22,16 +22,7 @@ import (
 	"github.com/envoyproxy/envoy/contrib/golang/filters/http/source/go/pkg/http"
 
 	"mosn.io/htnn/api/pkg/filtermanager"
-	// For utility plugins provided in the test framework.
-	// don't import this if you want to produce the shared library for product environment.
 	_ "mosn.io/htnn/api/plugins/tests/integration/dataplane"
-
-	// If you want to use the built-in plugins, you can import them here:
-	// _ "mosn.io/htnn/plugins/plugins"
-	//
-	// Note that because we only update the module dependency in the release, if you use
-	// a non-release version of mosn.io/htnn/plugins module, you may need to manually update the
-	// dependency yourself, such as using replace in go.mod
 	_ "mosn.io/htnn/dev_your_plugin/plugins"
 )
 

diff --git a/examples/dev_your_plugin/go.mod b/examples/dev_your_plugin/go.mod
@@ -20,7 +20,7 @@ require (
 	github.com/envoyproxy/envoy v1.29.4
 	github.com/stretchr/testify v1.9.0
 	google.golang.org/protobuf v1.33.0
-	mosn.io/htnn/api v0.3.1
+	mosn.io/htnn/api v0.3.2
 )
 
 require (

diff --git a/examples/dev_your_plugin/go.sum b/examples/dev_your_plugin/go.sum
@@ -57,5 +57,5 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-mosn.io/htnn/api v0.3.1 h1:vQMJI1XCgrWb3PdK7/T9ygdytl1Fps43Ekj36OY1vRk=
-mosn.io/htnn/api v0.3.1/go.mod h1:DumqbmMou8J1/DzEDaRIZWpan82bOqxGceWxTju7WkU=
+mosn.io/htnn/api v0.3.2 h1:3j63WhEkurhqCcly5PxDQkrP59AbIt2Qn0DwpsukQnU=
+mosn.io/htnn/api v0.3.2/go.mod h1:DumqbmMou8J1/DzEDaRIZWpan82bOqxGceWxTju7WkU=
diff --git a/manifests/charts/htnn-controller/Chart.yaml b/manifests/charts/htnn-controller/Chart.yaml
@@ -12,13 +12,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.2
+version: 0.2.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.3.1"
+appVersion: "0.3.2"
 
 dependencies:
   - name: base

diff --git a/manifests/charts/htnn-controller/README.md b/manifests/charts/htnn-controller/README.md
@@ -1,6 +1,6 @@
 # htnn-controller
 
-![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square)
+![Version: 0.2.3](https://img.shields.io/badge/Version-0.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.2-informational?style=flat-square)
 
 A Helm chart for HTNN controller
 

diff --git a/manifests/charts/htnn-gateway/Chart.yaml b/manifests/charts/htnn-gateway/Chart.yaml
@@ -12,13 +12,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.1
+version: 0.2.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.3.1"
+appVersion: "0.3.2"
 
 dependencies:
   # istio gateway depends on istiod to inject the image, so we need to install the istiod first.

diff --git a/manifests/charts/htnn-gateway/README.md b/manifests/charts/htnn-gateway/README.md
@@ -1,6 +1,6 @@
 # htnn-gateway
 
-![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square)
+![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.2-informational?style=flat-square)
 
 A Helm chart for HTNN data plane running as gateway
 

diff --git a/plugins/go.sum b/plugins/go.sum
@@ -247,9 +247,9 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-mosn.io/htnn/api v0.3.1 h1:vQMJI1XCgrWb3PdK7/T9ygdytl1Fps43Ekj36OY1vRk=
-mosn.io/htnn/api v0.3.1/go.mod h1:DumqbmMou8J1/DzEDaRIZWpan82bOqxGceWxTju7WkU=
-mosn.io/htnn/types v0.3.1 h1:WTxSVe8yUQhIjnYs6Y5RkPBUfknM2FBzgMdCzDfqjbQ=
-mosn.io/htnn/types v0.3.1/go.mod h1:SEEwBojLXw7tEgmEro3cqxgUFWuJRsBosTU86U5S92A=
+mosn.io/htnn/api v0.3.2 h1:3j63WhEkurhqCcly5PxDQkrP59AbIt2Qn0DwpsukQnU=
+mosn.io/htnn/api v0.3.2/go.mod h1:DumqbmMou8J1/DzEDaRIZWpan82bOqxGceWxTju7WkU=
+mosn.io/htnn/types v0.3.2 h1:pGm1kuXn0xb0ki6QapMdg0tgTtjHFmUGD/N6ZCe+dLc=
+mosn.io/htnn/types v0.3.2/go.mod h1:Jg4JZG+OK34J0gqXrEYzq4ZLoJ8mOyMz3+yR0o2G5P0=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
diff --git a/types/go.sum b/types/go.sum
@@ -311,8 +311,8 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-mosn.io/htnn/api v0.3.1 h1:vQMJI1XCgrWb3PdK7/T9ygdytl1Fps43Ekj36OY1vRk=
-mosn.io/htnn/api v0.3.1/go.mod h1:DumqbmMou8J1/DzEDaRIZWpan82bOqxGceWxTju7WkU=
+mosn.io/htnn/api v0.3.2 h1:3j63WhEkurhqCcly5PxDQkrP59AbIt2Qn0DwpsukQnU=
+mosn.io/htnn/api v0.3.2/go.mod h1:DumqbmMou8J1/DzEDaRIZWpan82bOqxGceWxTju7WkU=
 sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=
 sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
 sigs.k8s.io/gateway-api v1.0.0 h1:iPTStSv41+d9p0xFydll6d7f7MOBGuqXM6p2/zVYMAs=