Skip to content

Commit ba7a8a9

Browse files
authored
Merge pull request #41 from wrongerror/main
adjust chart for OpenFunction v1.0.0-rc.0
2 parents 0ead43d + 87de436 commit ba7a8a9

File tree

16 files changed

+7090
-13194
lines changed

16 files changed

+7090
-13194
lines changed

README.md

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

3-
![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.1](https://img.shields.io/badge/AppVersion-0.8.1-informational?style=flat-square)
3+
![Version: 0.5.0-rc.0](https://img.shields.io/badge/Version-0.5.0--rc.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0-rc.0](https://img.shields.io/badge/AppVersion-1.0.0--rc.0-informational?style=flat-square)
44

55
A Helm chart for OpenFunction on Kubernetes
66

@@ -41,29 +41,29 @@ For more details on initializing Helm, [read the Helm docs](https://helm.sh/docs
4141

4242
2. Then you have several options to setup OpenFunction, you can choose to:
4343

44-
- Install all components:
45-
```shell
46-
kubectl create namespace openfunction
47-
helm install openfunction openfunction/openfunction -n openfunction
48-
```
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
54-
```
55-
56-
- Install Knative sync runtime only:
57-
```shell
58-
kubectl create namespace 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
66-
```
44+
- Install all components:
45+
```shell
46+
kubectl create namespace openfunction
47+
helm install openfunction openfunction/openfunction -n openfunction
48+
```
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
54+
```
55+
56+
- Install Knative sync runtime only:
57+
```shell
58+
kubectl create namespace 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
66+
```
6767

6868
## Verify installation
6969

@@ -91,6 +91,30 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documen
9191

9292
### Upgrading an existing Release to a new version
9393

94+
95+
### From OpenFunction v0.8.x to OpenFunction v1.0.x
96+
97+
#### Uninstall the Chart
98+
99+
First, you'll need to uninstall the old `openfunction` release:
100+
```shell
101+
helm uninstall openfunction -n openfunction
102+
```
103+
104+
#### Upgrade OpenFunction CRDs
105+
Then you'll need to upgrade the new OpenFunction CRDs
106+
107+
```shell
108+
kubectl apply -f https://openfunction.sh1a.qingstor.com/crds/v1.0.0/openfunction.yaml
109+
```
110+
111+
#### Install new chart
112+
113+
```shell
114+
helm repo update
115+
helm install openfunction openfunction/openfunction -n openfunction
116+
```
117+
94118
### From OpenFunction v0.7.x to OpenFunction v0.8.x
95119

96120
```shell
@@ -163,7 +187,7 @@ helm install openfunction openfunction/openfunction -n openfunction
163187
| controllerManager.kubeRbacProxy.image.repository | string | `"openfunction/kube-rbac-proxy"` | |
164188
| controllerManager.kubeRbacProxy.image.tag | string | `"v0.8.0"` | |
165189
| controllerManager.openfunction.image.repository | string | `"openfunction/openfunction"` | |
166-
| controllerManager.openfunction.image.tag | string | `"v0.8.1"` | |
190+
| controllerManager.openfunction.image.tag | string | `"v1.0.0-rc.0"` | |
167191
| controllerManager.openfunction.resources.limits.cpu | string | `"500m"` | |
168192
| controllerManager.openfunction.resources.limits.memory | string | `"500Mi"` | |
169193
| controllerManager.openfunction.resources.requests.cpu | string | `"100m"` | |
@@ -198,6 +222,10 @@ helm install openfunction openfunction/openfunction -n openfunction
198222
| metricsService.ports[0].port | int | `8443` | |
199223
| metricsService.ports[0].targetPort | string | `"https"` | |
200224
| metricsService.type | string | `"ClusterIP"` | |
225+
| revisionController.enable | bool | `false` | |
226+
| revisionController.image.pullPolicy | string | `"IfNotPresent"` | |
227+
| revisionController.image.repository | string | `"openfunction/revision-controller"` | |
228+
| revisionController.image.tag | string | `"v1.0.0"` | |
201229
| shipwright-build.shipwrightBuildController.shipwrightBuild.BUNDLE_CONTAINER_IMAGE.repository | string | `"openfunction/shipwright-bundle"` | |
202230
| shipwright-build.shipwrightBuildController.shipwrightBuild.GIT_CONTAINER_IMAGE.repository | string | `"openfunction/shipwright-io-build-git"` | |
203231
| shipwright-build.shipwrightBuildController.shipwrightBuild.MUTATE_IMAGE_CONTAINER_IMAGE.repository | string | `"openfunction/shipwright-mutate-image"` | |
@@ -222,10 +250,6 @@ helm install openfunction openfunction/openfunction -n openfunction
222250
| webhookService.ports[0].port | int | `443` | |
223251
| webhookService.ports[0].targetPort | int | `9443` | |
224252
| webhookService.type | string | `"ClusterIP"` | |
225-
| revisionController.enable | bool | `false` | |
226-
| revisionController.image.repository | string | `openfunction/revision-controller` | |
227-
| revisionController.image.tag | string | `v1.0.0` | |
228-
| revisionController.image.pullPolicy | string | `IfNotPresent` | |
229253

230254
----------------------------------------------
231255
Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)

build/build.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,10 @@ def pull(self):
4242
os.chdir(self.charts_dir)
4343
for file in os.listdir(self.charts_dir):
4444
file_path = os.path.join(self.charts_dir, file)
45+
print(f"pull and tar {file_path}")
4546
if os.path.splitext(file)[1] == ".tgz":
4647
subprocess.check_call(["tar", "-xf", file_path])
47-
subprocess.check_call(["rm", file_path])
48+
os.remove(file_path)
4849

4950
def process_charts(self):
5051
for chart_name in os.listdir(self.charts_dir):
@@ -127,5 +128,5 @@ def run(self):
127128

128129

129130
if __name__ == '__main__':
130-
builder = Build(version="0.4.0", region_cn=True)
131+
builder = Build(version="0.5.0-rc.0", region_cn=True)
131132
builder.run()

docs/index.yaml

Lines changed: 59 additions & 14 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-12-05T16:24:42.3683806+08:00"
6+
created: "2023-03-06T16:59:04.645948+08:00"
77
description: A Helm chart for Knative Serving on Kubernetes
88
digest: 134c3b538f96c25862bf85e72e9bbf0fe12dc3497f1e7f47383ccb902a1abd56
99
keywords:
@@ -22,7 +22,7 @@ entries:
2222
version: 1.3.2
2323
- apiVersion: v2
2424
appVersion: 1.0.1
25-
created: "2022-12-05T16:24:42.1460947+08:00"
25+
created: "2023-03-06T16:59:04.6315776+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: 1.0.0-rc.0
44+
created: "2023-03-06T16:59:04.8888907+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.8.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: 2d0e20484e05b722ef379c5360ce7049e154fcd6f01c777ce160ee1b3c0298b3
72+
keywords:
73+
- faas
74+
- Serverless
75+
- Kubernetes
76+
kubeVersion: '>=v1.21.0-0'
77+
maintainers:
78+
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-v1.0.0-rc.0-0.5.0-rc.0.tgz
86+
version: 0.5.0-rc.0
4287
- apiVersion: v2
4388
appVersion: 0.8.1
44-
created: "2022-12-05T16:24:42.5829411+08:00"
89+
created: "2023-03-06T16:59:04.8701826+08:00"
4590
dependencies:
4691
- condition: global.Dapr.enabled
4792
name: dapr
@@ -86,7 +131,7 @@ entries:
86131
version: 0.4.0
87132
- apiVersion: v2
88133
appVersion: 0.8.1-rc.0
89-
created: "2022-12-05T16:24:42.5622196+08:00"
134+
created: "2023-03-06T16:59:04.8433063+08:00"
90135
dependencies:
91136
- condition: global.Dapr.enabled
92137
name: dapr
@@ -131,7 +176,7 @@ entries:
131176
version: 0.4.0-rc.0
132177
- apiVersion: v2
133178
appVersion: 0.8.0
134-
created: "2022-12-05T16:24:42.5337784+08:00"
179+
created: "2023-03-06T16:59:04.8171546+08:00"
135180
dependencies:
136181
- condition: global.Dapr.enabled
137182
name: dapr
@@ -176,7 +221,7 @@ entries:
176221
version: 0.3.1
177222
- apiVersion: v2
178223
appVersion: 0.8.0
179-
created: "2022-12-05T16:24:42.4857507+08:00"
224+
created: "2023-03-06T16:59:04.7608209+08:00"
180225
dependencies:
181226
- condition: global.Dapr.enabled
182227
name: dapr
@@ -221,7 +266,7 @@ entries:
221266
version: 0.3.0
222267
- apiVersion: v2
223268
appVersion: 0.8.0-rc.0
224-
created: "2022-12-05T16:24:42.4579356+08:00"
269+
created: "2023-03-06T16:59:04.7277441+08:00"
225270
dependencies:
226271
- condition: global.Dapr.enabled
227272
name: dapr
@@ -266,7 +311,7 @@ entries:
266311
version: 0.3.0-rc.0
267312
- apiVersion: v2
268313
appVersion: 0.7.0
269-
created: "2022-12-05T16:24:42.4252966+08:00"
314+
created: "2023-03-06T16:59:04.6969625+08:00"
270315
dependencies:
271316
- condition: global.Dapr.enabled
272317
name: dapr
@@ -311,7 +356,7 @@ entries:
311356
version: 0.2.0
312357
- apiVersion: v2
313358
appVersion: 0.6.0
314-
created: "2022-12-05T16:24:42.3933776+08:00"
359+
created: "2023-03-06T16:59:04.6671955+08:00"
315360
dependencies:
316361
- condition: Dapr.enabled
317362
name: dapr
@@ -357,7 +402,7 @@ entries:
357402
shipwright-build:
358403
- apiVersion: v2
359404
appVersion: 0.10.0
360-
created: "2022-12-05T16:24:42.5943979+08:00"
405+
created: "2023-03-06T16:59:04.9041768+08:00"
361406
description: A Helm chart for Shipwright Build on Kubernetes
362407
digest: 06820ce8fe0088b3f95086ce38c5aff3069b691d2d5f1210e5bf77e9632a8611
363408
keywords:
@@ -378,7 +423,7 @@ entries:
378423
version: 0.10.0
379424
- apiVersion: v2
380425
appVersion: 0.6.1
381-
created: "2022-12-05T16:24:42.599895+08:00"
426+
created: "2023-03-06T16:59:04.9098152+08:00"
382427
description: A Helm chart for Shipwright Build on Kubernetes
383428
digest: 366ca24ad2651910695ac50e165be4fa7c8c635ec2aec5f53a6baca17f3efed0
384429
keywords:
@@ -399,7 +444,7 @@ entries:
399444
tekton-pipelines:
400445
- apiVersion: v2
401446
appVersion: 0.37.2
402-
created: "2022-12-05T16:24:42.6083939+08:00"
447+
created: "2023-03-06T16:59:04.9278638+08:00"
403448
description: A Helm chart for Tekton Pipelines on Kubernetes
404449
digest: 90fe5c147a410aa1c26812435704cbcf1891ce2446a8e5f8a3ff62449f736360
405450
keywords:
@@ -420,7 +465,7 @@ entries:
420465
version: 0.37.2
421466
- apiVersion: v2
422467
appVersion: 0.30.0
423-
created: "2022-12-05T16:24:42.6073958+08:00"
468+
created: "2023-03-06T16:59:04.9180886+08:00"
424469
description: A Helm chart for Tekton Pipelines on Kubernetes
425470
digest: 4939ec89841370813aa5c00cea5db82733470fb165326d2b75c3f9324d170bac
426471
keywords:
@@ -438,4 +483,4 @@ entries:
438483
urls:
439484
- https://openfunction.github.io/charts/tekton-pipelines-0.30.0.tgz
440485
version: 0.30.0
441-
generated: "2022-12-05T16:24:41.838065+08:00"
486+
generated: "2023-03-06T16:59:04.6098217+08:00"
408 KB
Binary file not shown.

knative-serving/templates/configmaps/features.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ metadata:
1010
knative.dev/example-checksum: d9e300ba
1111
data:
1212
kubernetes.podspec-fieldref: "enabled"
13+
kubernetes.podspec-runtimeclassname: "enabled"
1314
_example: |-
1415
################################
1516
# #

openfunction/Chart.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: openfunction
33
description: A Helm chart for OpenFunction on Kubernetes
44
# Specify the Kubernetes version range that we support.
55
# We allow pre-release versions for cloud-specific Kubernetes versions such as v1.21.5-gke.1302 or v1.18.9-eks-d1db3c
6-
kubeVersion: ">=v1.20.0-0"
6+
kubeVersion: ">=v1.21.0-0"
77
# A chart can be either an 'application' or a 'library' chart.
88
#
99
# Application charts are a collection of templates that can be packaged into versioned archives
@@ -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.4.0
19+
version: 0.5.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.8.1"
24+
appVersion: "1.0.0-rc.0"
2525
keywords:
2626
- faas
2727
- Serverless
@@ -38,15 +38,15 @@ dependencies:
3838
condition: global.Dapr.enabled
3939
- name: knative-serving
4040
version: 1.3.2
41-
repository: "file://../knative-serving"
41+
repository: "file://charts/knative-serving"
4242
condition: global.KnativeServing.enabled
4343
- name: tekton-pipelines
4444
version: 0.37.2
45-
repository: "file://../tekton-pipelines"
45+
repository: "file://charts/tekton-pipelines"
4646
condition: global.TektonPipelines.enabled
4747
- name: shipwright-build
4848
version: 0.10.0
49-
repository: "file://../shipwright-build"
49+
repository: "file://charts/shipwright-build"
5050
condition: global.ShipwrightBuild.enabled
5151
- name: keda
5252
version: 2.8.2

0 commit comments

Comments
 (0)