Skip to content

Commit

Permalink
fix the tag version
Browse files Browse the repository at this point in the history
Signed-off-by: spacewander <[email protected]>
  • Loading branch information
spacewander committed Jul 29, 2024
1 parent 4ea0858 commit 5b6e30f
Show file tree
Hide file tree
Showing 11 changed files with 53 additions and 11 deletions.
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ jobs:

- name: Example
run: |
rm go.work
pushd ./examples/dev_your_plugin
make unit-test
make integration-test
Expand Down
1 change: 1 addition & 0 deletions MAINTAIN.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ To release a new version, please follow the steps below:
* The CI will create a new chart package. The artifacthub will scrape the new package and update the version later.
* Try the quick start guide with the new version. Note that you may need to delete the installed chart before installing the new one,
as `helm install` will not upgrade the charts.
* Add the `go.work` back, and merge the release branch to the main branch.

## Upgrade components

Expand Down
28 changes: 28 additions & 0 deletions go.work
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Copyright The HTNN Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// We use go.work and commit it to the repository so that we don't need to update the sub go modules'
// version during the development. Remember to remove this file and update the sub go modules' version
// when we draw a release.
go 1.21.5

use (
./api
./controller
./e2e
./plugins
./site
./tools
./types
)
2 changes: 1 addition & 1 deletion manifests/charts/htnn-controller/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ 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.0
version: 0.2.1

# 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
Expand Down
4 changes: 2 additions & 2 deletions manifests/charts/htnn-controller/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# htnn-controller

![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.0](https://img.shields.io/badge/AppVersion-0.3.0-informational?style=flat-square)
![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.0](https://img.shields.io/badge/AppVersion-0.3.0-informational?style=flat-square)

A Helm chart for HTNN controller

Expand Down Expand Up @@ -100,7 +100,7 @@ helm uninstall htnn-controller -n istio-system
| global.remotePilotAddress | string | `""` | |
| global.sds.token.aud | string | `"istio-ca"` | |
| global.sts.servicePort | int | `0` | |
| global.tag | string | `"0.3.0"` | |
| global.tag | string | `"v0.3.0"` | |
| istio_cni.chained | bool | `true` | |
| istio_cni.provider | string | `"default"` | |
| istiodRemote.injectionCABundle | string | `""` | |
Expand Down
2 changes: 1 addition & 1 deletion manifests/charts/htnn-controller/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@
]
},
"tag": {
"default": "0.3.0",
"default": "v0.3.0",
"title": "tag",
"type": "string"
}
Expand Down
2 changes: 1 addition & 1 deletion manifests/charts/htnn-controller/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ global:

# Default hub for HTNN images.
hub: ghcr.io/mosn
tag: 0.3.0
tag: v0.3.0

# Specify image pull policy if default behavior isn't desired.
# Default behavior: latest images will be Always else IfNotPresent.
Expand Down
1 change: 1 addition & 0 deletions manifests/images/cp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ WORKDIR /workspace
# Copy the source

COPY go.* ./
RUN sed -i 's/.\/site/.\/external\/istio/' go.work && sed -i '/.\/e2e/d' go.work && sed -i '/.\/tools/d' go.work
# use single layer to copy only works on files, so we have to list all the directories
COPY api/ api/
COPY types/ types/
Expand Down
1 change: 1 addition & 0 deletions manifests/images/dp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ WORKDIR /workspace
# Copy the source

COPY go.* ./
RUN sed -i 's/.\/site/.\/external\/istio/' go.work && sed -i '/.\/e2e/d' go.work && sed -i '/.\/tools/d' go.work
COPY api/ api/
COPY types/ types/
COPY plugins/ plugins/
Expand Down
11 changes: 8 additions & 3 deletions site/content/en/docs/getting-started/quick_start.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,17 @@ title: Quick Start

```shell
helm repo add htnn https://mosn.github.io/htnn
helm repo update
```

## Installing HTNN

1. Install the control plane component:
1. Update the repository information to get the latest version:

```shell
helm repo update
```

2. Install the control plane component:

```shell
$ helm install htnn-controller htnn/htnn-controller --namespace istio-system --create-namespace --debug --wait
Expand All @@ -28,7 +33,7 @@ REVISION: 1
TEST SUITE: None
```

2. Install the data plane component:
3. Install the data plane component:

```shell
$ helm install htnn-gateway htnn/htnn-gateway --namespace istio-system --create-namespace && \
Expand Down
11 changes: 8 additions & 3 deletions site/content/zh-hans/docs/getting-started/quick_start.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,19 @@ title: 快速上手

```shell
helm repo add htnn https://mosn.github.io/htnn
helm repo update
```

## 安装 HTNN

让我们把 HTNN 安装到 `istio-system` namespace 中。为了简单起见,HTNN 和其他用于 demo 的资源都会安装到该 namespace。

1. 安装控制面组件:
1. 更新仓库信息以获取最新的版本:

```shell
helm repo update
```

2. 安装控制面组件:

```shell
$ helm install htnn-controller htnn/htnn-controller \
Expand All @@ -32,7 +37,7 @@ REVISION: 1
TEST SUITE: None
```

2. 安装数据面组件:
3. 安装数据面组件:

```shell
$ helm install htnn-gateway htnn/htnn-gateway --namespace istio-system --create-namespace && \
Expand Down

0 comments on commit 5b6e30f

Please sign in to comment.