Skip to content

Commit f39f334

Browse files
benjaminhuobenjaminhuo
authored
Merge pull request #30 from wrongerror/main
adjust for openfunction release v0.8.0-rc.0
2 parents 59e9ca8 + 7f4733e commit f39f334

7 files changed

Lines changed: 126 additions & 50 deletions

File tree

‎README.md‎

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# openfunction
22

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

55
A Helm chart for OpenFunction on Kubernetes
66

@@ -33,25 +33,36 @@ Ensure Helm is initialized in your Kubernetes cluster.
3333

3434
For more details on initializing Helm, [read the Helm docs](https://helm.sh/docs/)
3535

36-
1. Add `openfunction.github.io` as a helm repo:
37-
```
38-
helm repo add openfunction https://openfunction.github.io/charts/
39-
helm repo update
40-
```
36+
1. Run the following command to add the OpenFunction chart repository first:
37+
```shell
38+
helm repo add openfunction https://openfunction.github.io/charts/
39+
helm repo update
40+
```
4141

42-
2. Install the `openfunction` chart on your cluster in the `openfunction` namespace:
43-
- If your environment does not contain any openfunction-dependent components, and you want to install all components
44-
directly, You can install openfunction with all dependencies with the following command:
45-
```
42+
2. Then you have several options to setup OpenFunction, you can choose to:
43+
44+
- Install all components:
45+
```shell
4646
kubectl create namespace openfunction
4747
helm install openfunction openfunction/openfunction -n openfunction
4848
```
49-
- If your environment already contains some openfunction-dependent components, or if you want to install some
50-
components separately for more flexibility and customizable capabilities. For example, if you already have `dapr`
51-
installed in your environment, You can install openfunction with the following command:
49+
50+
- Install Serving only (without build):
51+
```shell
52+
kubectl create namespace openfunction
53+
helm install openfunction --set global.ShipwrightBuild.enabled=false --set global.TektonPipelines.enabled=false openfunction/openfunction -n openfunction
5254
```
55+
56+
- Install Knative sync runtime only:
57+
```shell
5358
kubectl create namespace openfunction
54-
helm install openfunction --set global.Dapr.enabled=false openfunction/openfunction -n openfunction
59+
helm install openfunction --set global.Keda.enabled=false openfunction/openfunction -n openfunction
60+
```
61+
62+
- Install OpenFunction async runtime only:
63+
```shell
64+
kubectl create namespace openfunction
65+
helm install openfunction --set global.Contour.enabled=false --set global.KnativeServing.enabled=false openfunction/openfunction -n openfunction
5566
```
5667

5768
## Verify installation
@@ -70,7 +81,7 @@ helm uninstall openfunction -n openfunction
7081
## Upgrading Chart
7182
7283
```shell
73-
helm upgrade [RELEASE_NAME] openfunction/openfunction -n openfunction
84+
helm upgrade [RELEASE_NAME] openfunction/openfunction -n openfunction --no-hooks
7485
```
7586

7687
With Helm v3, CRDs created by this chart are not updated by default and should be manually updated.
@@ -80,6 +91,12 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documen
8091

8192
### Upgrading an existing Release to a new version
8293

94+
### From OpenFunction v0.7.x to OpenFunction v0.8.x
95+
96+
```shell
97+
helm upgrade openfunction openfunction/openfunction -n openfunction --no-hooks
98+
```
99+
83100
### From OpenFunction v0.6.0 to OpenFunction v0.7.x
84101

85102
There is a breaking change when upgrading from v0.6.0 to 0.7.x which requires additional manual operations.
@@ -143,7 +160,7 @@ helm install openfunction openfunction/openfunction -n openfunction
143160
| controllerManager.kubeRbacProxy.image.repository | string | `"openfunction/kube-rbac-proxy"` | |
144161
| controllerManager.kubeRbacProxy.image.tag | string | `"v0.8.0"` | |
145162
| controllerManager.openfunction.image.repository | string | `"openfunction/openfunction"` | |
146-
| controllerManager.openfunction.image.tag | string | `"v0.7.0"` | |
163+
| controllerManager.openfunction.image.tag | string | `"v0.8.0-rc.0"` | |
147164
| controllerManager.openfunction.resources.limits.cpu | string | `"500m"` | |
148165
| controllerManager.openfunction.resources.limits.memory | string | `"500Mi"` | |
149166
| controllerManager.openfunction.resources.requests.cpu | string | `"100m"` | |

‎build/build.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,12 @@ class Build(object):
1818
local_charts = {"knative-serving", "tekton-pipelines", "shipwright-build"}
1919
skipped_charts = {"contour"}
2020

21-
def __init__(self, major: int = 0, minor: int = 2, patch: int = 0, region_cn: bool = False):
21+
def __init__(self, version, region_cn: bool = False):
2222
self.src_dir = os.path.join(self.root_dir, "openfunction")
2323
self.dis_dir = os.path.join(self.root_dir, "dist", "openfunction")
2424
self.charts_dir = os.path.join(self.dis_dir, "charts")
2525
self.region_cn = region_cn
26-
self.major = major
27-
self.minor = minor
28-
self.patch = patch
29-
self.version = f"{self.major}.{self.minor}.{self.patch}"
26+
self.version = version
3027

3128
def prepare(self):
3229
if not os.path.exists(self.src_dir):
@@ -130,5 +127,5 @@ def run(self):
130127

131128

132129
if __name__ == '__main__':
133-
builder = Build(region_cn=True)
130+
builder = Build(version="0.3.0-rc.0", region_cn=True)
134131
builder.run()

‎docs/index.yaml‎

Lines changed: 54 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ entries:
33
knative-serving:
44
- apiVersion: v2
55
appVersion: 1.3.2
6-
created: "2022-08-23T08:59:25.1854969+08:00"
6+
created: "2022-10-17T11:19:26.8585584+08:00"
77
description: A Helm chart for Knative Serving on Kubernetes
88
digest: 75cf6ba89b9c59ab2ec3e9469e6d523f51f6a587c7c181911d2566bfa5764835
99
keywords:
@@ -22,7 +22,7 @@ entries:
2222
version: 1.3.2
2323
- apiVersion: v2
2424
appVersion: 1.0.1
25-
created: "2022-08-23T08:59:25.1732754+08:00"
25+
created: "2022-10-17T11:19:26.8560027+08:00"
2626
description: A Helm chart for Knative Serving on Kubernetes
2727
digest: c3c6dd47616c498ffe87d94812c35a6423ef974fa65daddc22d196986e15284a
2828
keywords:
@@ -39,9 +39,54 @@ entries:
3939
- https://openfunction.github.io/charts/knative-serving-1.0.1.tgz
4040
version: 1.0.1
4141
openfunction:
42+
- apiVersion: v2
43+
appVersion: 0.8.0-rc.0
44+
created: "2022-10-17T11:19:26.9068372+08:00"
45+
dependencies:
46+
- condition: global.Dapr.enabled
47+
name: dapr
48+
repository: file://dapr
49+
version: 1.8.3
50+
- condition: global.KnativeServing.enabled
51+
name: knative-serving
52+
repository: file://knative-serving
53+
version: 1.3.2
54+
- condition: global.TektonPipelines.enabled
55+
name: tekton-pipelines
56+
repository: file://tekton-pipelines
57+
version: 0.37.2
58+
- condition: global.ShipwrightBuild.enabled
59+
name: shipwright-build
60+
repository: file://shipwright-build
61+
version: 0.10.0
62+
- condition: global.Keda.enabled
63+
name: keda
64+
repository: file://keda
65+
version: 2.7.2
66+
- condition: global.Contour.enabled
67+
name: contour
68+
repository: file://contour
69+
version: 8.0.4
70+
description: A Helm chart for OpenFunction on Kubernetes
71+
digest: ea7af9b5de06a6fd48bccca28b369f6c10f6e4e36b010959102f7e25646cc0b1
72+
keywords:
73+
- faas
74+
- Serverless
75+
- Kubernetes
76+
kubeVersion: '>=v1.20.0-0'
77+
maintainers:
78+
- email: wangyifei@kubesphere.io
79+
name: wangyifei
80+
name: openfunction
81+
sources:
82+
- https://github.com/OpenFunction/OpenFunction
83+
type: application
84+
urls:
85+
- https://openfunction.github.io/charts/openfunction-v0.8.0-rc.0-v0.3.0-rc.0.tgz
86+
version: 0.3.0-rc.0
4287
- apiVersion: v2
4388
appVersion: 0.7.0
44-
created: "2022-08-23T08:59:25.3260406+08:00"
89+
created: "2022-10-17T11:19:26.8909168+08:00"
4590
dependencies:
4691
- condition: global.Dapr.enabled
4792
name: dapr
@@ -86,7 +131,7 @@ entries:
86131
version: 0.2.0
87132
- apiVersion: v2
88133
appVersion: 0.6.0
89-
created: "2022-08-23T08:59:25.2159127+08:00"
134+
created: "2022-10-17T11:19:26.8726493+08:00"
90135
dependencies:
91136
- condition: Dapr.enabled
92137
name: dapr
@@ -132,7 +177,7 @@ entries:
132177
shipwright-build:
133178
- apiVersion: v2
134179
appVersion: 0.10.0
135-
created: "2022-08-23T08:59:25.338388+08:00"
180+
created: "2022-10-17T11:19:26.910962+08:00"
136181
description: A Helm chart for Shipwright Build on Kubernetes
137182
digest: e0616611a496afcbdd39b630b5ef76e347e9d53186726829acbfa5c7072af6c6
138183
keywords:
@@ -153,7 +198,7 @@ entries:
153198
version: 0.10.0
154199
- apiVersion: v2
155200
appVersion: 0.6.1
156-
created: "2022-08-23T08:59:25.3406355+08:00"
201+
created: "2022-10-17T11:19:26.911959+08:00"
157202
description: A Helm chart for Shipwright Build on Kubernetes
158203
digest: 366ca24ad2651910695ac50e165be4fa7c8c635ec2aec5f53a6baca17f3efed0
159204
keywords:
@@ -174,7 +219,7 @@ entries:
174219
tekton-pipelines:
175220
- apiVersion: v2
176221
appVersion: 0.37.2
177-
created: "2022-08-23T08:59:25.3466363+08:00"
222+
created: "2022-10-17T11:19:26.9140353+08:00"
178223
description: A Helm chart for Tekton Pipelines on Kubernetes
179224
digest: b179a806641d354e92064715f221ee5e1836a84ddefa11bc11c01f4f4bdf8c52
180225
keywords:
@@ -195,7 +240,7 @@ entries:
195240
version: 0.37.2
196241
- apiVersion: v2
197242
appVersion: 0.30.0
198-
created: "2022-08-23T08:59:25.3426346+08:00"
243+
created: "2022-10-17T11:19:26.9130427+08:00"
199244
description: A Helm chart for Tekton Pipelines on Kubernetes
200245
digest: 4939ec89841370813aa5c00cea5db82733470fb165326d2b75c3f9324d170bac
201246
keywords:
@@ -213,4 +258,4 @@ entries:
213258
urls:
214259
- https://openfunction.github.io/charts/tekton-pipelines-0.30.0.tgz
215260
version: 0.30.0
216-
generated: "2022-08-23T08:59:25.1661155+08:00"
261+
generated: "2022-10-17T11:19:26.8532053+08:00"

‎docs/openfunction-v0.8.0-rc.0-v0.3.0-rc.0.tgz‎

406 KB
Binary file not shown.

‎openfunction/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ type: application
1616
# This is the chart version. This version number should be incremented each time you make changes
1717
# to the chart and its templates, including the app version.
1818
# Versions are expected to follow Semantic Versioning (https://semver.org/)
19-
version: 0.2.0
19+
version: 0.3.0-rc.0
2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
2323
# It is recommended to use it with quotes.
24-
appVersion: "0.7.0"
24+
appVersion: "0.8.0-rc.0"
2525
keywords:
2626
- faas
2727
- Serverless

‎openfunction/README.md‎

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# openfunction
22

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

55
A Helm chart for OpenFunction on Kubernetes
66

@@ -33,25 +33,36 @@ Ensure Helm is initialized in your Kubernetes cluster.
3333

3434
For more details on initializing Helm, [read the Helm docs](https://helm.sh/docs/)
3535

36-
1. Add `openfunction.github.io` as a helm repo:
37-
```
38-
helm repo add openfunction https://openfunction.github.io/charts/
39-
helm repo update
40-
```
36+
1. Run the following command to add the OpenFunction chart repository first:
37+
```shell
38+
helm repo add openfunction https://openfunction.github.io/charts/
39+
helm repo update
40+
```
4141

42-
2. Install the `openfunction` chart on your cluster in the `openfunction` namespace:
43-
- If your environment does not contain any openfunction-dependent components, and you want to install all components
44-
directly, You can install openfunction with all dependencies with the following command:
45-
```
42+
2. Then you have several options to setup OpenFunction, you can choose to:
43+
44+
- Install all components:
45+
```shell
4646
kubectl create namespace openfunction
4747
helm install openfunction openfunction/openfunction -n openfunction
4848
```
49-
- If your environment already contains some openfunction-dependent components, or if you want to install some
50-
components separately for more flexibility and customizable capabilities. For example, if you already have `dapr`
51-
installed in your environment, You can install openfunction with the following command:
49+
50+
- Install Serving only (without build):
51+
```shell
52+
kubectl create namespace openfunction
53+
helm install openfunction --set global.ShipwrightBuild.enabled=false --set global.TektonPipelines.enabled=false openfunction/openfunction -n openfunction
5254
```
55+
56+
- Install Knative sync runtime only:
57+
```shell
5358
kubectl create namespace openfunction
54-
helm install openfunction --set global.Dapr.enabled=false openfunction/openfunction -n openfunction
59+
helm install openfunction --set global.Keda.enabled=false openfunction/openfunction -n openfunction
60+
```
61+
62+
- Install OpenFunction async runtime only:
63+
```shell
64+
kubectl create namespace openfunction
65+
helm install openfunction --set global.Contour.enabled=false --set global.KnativeServing.enabled=false openfunction/openfunction -n openfunction
5566
```
5667

5768
## Verify installation
@@ -70,7 +81,7 @@ helm uninstall openfunction -n openfunction
7081
## Upgrading Chart
7182
7283
```shell
73-
helm upgrade [RELEASE_NAME] openfunction/openfunction -n openfunction
84+
helm upgrade [RELEASE_NAME] openfunction/openfunction -n openfunction --no-hooks
7485
```
7586

7687
With Helm v3, CRDs created by this chart are not updated by default and should be manually updated.
@@ -80,6 +91,12 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documen
8091

8192
### Upgrading an existing Release to a new version
8293

94+
### From OpenFunction v0.7.x to OpenFunction v0.8.x
95+
96+
```shell
97+
helm upgrade openfunction openfunction/openfunction -n openfunction --no-hooks
98+
```
99+
83100
### From OpenFunction v0.6.0 to OpenFunction v0.7.x
84101

85102
There is a breaking change when upgrading from v0.6.0 to 0.7.x which requires additional manual operations.
@@ -143,7 +160,7 @@ helm install openfunction openfunction/openfunction -n openfunction
143160
| controllerManager.kubeRbacProxy.image.repository | string | `"openfunction/kube-rbac-proxy"` | |
144161
| controllerManager.kubeRbacProxy.image.tag | string | `"v0.8.0"` | |
145162
| controllerManager.openfunction.image.repository | string | `"openfunction/openfunction"` | |
146-
| controllerManager.openfunction.image.tag | string | `"v0.7.0"` | |
163+
| controllerManager.openfunction.image.tag | string | `"v0.8.0-rc.0"` | |
147164
| controllerManager.openfunction.resources.limits.cpu | string | `"500m"` | |
148165
| controllerManager.openfunction.resources.limits.memory | string | `"500Mi"` | |
149166
| controllerManager.openfunction.resources.requests.cpu | string | `"100m"` | |

‎openfunction/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ controllerManager:
3636
openfunction:
3737
image:
3838
repository: openfunction/openfunction
39-
tag: v0.7.0
39+
tag: v0.8.0-rc.0
4040
resources:
4141
limits:
4242
cpu: 500m

0 commit comments

Comments
 (0)